diff --git a/src/app.jsx b/src/app.jsx
index cea7815..c69d99d 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -6,12 +6,17 @@
 
 import React, { Suspense, lazy, useEffect } from 'react';
 
-import { Spinner, addSettingsView, t } from '@zextras/carbonio-shell-ui';
+import { addSettingsView, t } from '@zextras/carbonio-shell-ui';
+import { Container, Spinner } from "@zextras/carbonio-design-system";
 
 const LazyAuth = lazy(() => import(/* webpackChunkName: "settings-view" */ './settings/auth-view'));
 
 const Auth = (props) => (
-	<Suspense fallback={<Spinner />}>
+	<Suspense fallback={
+		<Container>
+			<Spinner color={'primary'} />
+		</Container>
+	}>
 		<LazyAuth {...props} />
 	</Suspense>
 );