diff --git a/app/containers/Network/containers/AccessPointDetails/index.js b/app/containers/Network/containers/AccessPointDetails/index.js
index 0da24f2..5c78f2a 100644
--- a/app/containers/Network/containers/AccessPointDetails/index.js
+++ b/app/containers/Network/containers/AccessPointDetails/index.js
@@ -3,9 +3,12 @@ import PropTypes from 'prop-types';
 import { useParams } from 'react-router-dom';
 import gql from 'graphql-tag';
 import { useQuery, useMutation } from '@apollo/react-hooks';
-import { Alert, Spin, notification } from 'antd';
+import { Alert, notification } from 'antd';
 import moment from 'moment';
-import { AccessPointDetails as AccessPointDetailsPage } from '@tip-wlan/wlan-cloud-ui-library';
+import {
+  AccessPointDetails as AccessPointDetailsPage,
+  Loading,
+} from '@tip-wlan/wlan-cloud-ui-library';
 
 import { FILTER_SERVICE_METRICS } from 'graphql/queries';
 import { UPDATE_EQUIPMENT_FIRMWARE } from 'graphql/mutations';
@@ -264,7 +267,7 @@ const AccessPointDetails = ({ locations }) => {
       );
 
   if (loading || landingProfiles || landingFirmware) {
-    return <Spin size="large" />;
+    return <Loading />;
   }
 
   if (error) {
diff --git a/app/containers/ProfileDetails/index.js b/app/containers/ProfileDetails/index.js
index c28acb2..561b1dc 100644
--- a/app/containers/ProfileDetails/index.js
+++ b/app/containers/ProfileDetails/index.js
@@ -2,8 +2,8 @@ import React, { useState, useContext } from 'react';
 import { useParams, Redirect } from 'react-router-dom';
 import gql from 'graphql-tag';
 import { useQuery, useMutation } from '@apollo/react-hooks';
-import { Alert, Spin, notification } from 'antd';
-import { ProfileDetails as ProfileDetailsPage } from '@tip-wlan/wlan-cloud-ui-library';
+import { Alert, notification } from 'antd';
+import { ProfileDetails as ProfileDetailsPage, Loading } from '@tip-wlan/wlan-cloud-ui-library';
 
 import UserContext from 'contexts/UserContext';
 import { GET_ALL_PROFILES } from 'graphql/queries';
@@ -146,7 +146,7 @@ const ProfileDetails = () => {
       );
 
   if (loading) {
-    return <Spin size="large" />;
+    return <Loading />;
   }
 
   if (error) {
diff --git a/app/containers/Profiles/index.js b/app/containers/Profiles/index.js
index 8488aec..e57bc9e 100644
--- a/app/containers/Profiles/index.js
+++ b/app/containers/Profiles/index.js
@@ -2,9 +2,9 @@ import React, { useContext } from 'react';
 import gql from 'graphql-tag';
 import { useQuery, useMutation } from '@apollo/react-hooks';
 
-import { Alert, Spin, notification } from 'antd';
+import { Alert, notification } from 'antd';
 
-import { Profile as ProfilePage } from '@tip-wlan/wlan-cloud-ui-library';
+import { Profile as ProfilePage, Loading } from '@tip-wlan/wlan-cloud-ui-library';
 import UserContext from 'contexts/UserContext';
 
 const GET_ALL_PROFILES = gql`
@@ -92,7 +92,7 @@ const Profiles = () => {
   };
 
   if (loading) {
-    return <Spin size="large" />;
+    return <Loading />;
   }
 
   if (error) {