diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 996e1b413..564db5b3e 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -400,7 +400,7 @@ const routes: Routes = [
         loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule)
       },
     ],
-    // canActivate: [InactivityGuard]
+    canActivate: [InactivityGuard]
 
   },
 ];
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 366af4b43..c99117ce5 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -40,7 +40,6 @@ export class LoginPage implements OnInit {
     private changeProfileService: ChangeProfileService,
     public ThemeService: ThemeService,
     private storageservice: StorageService,
-    
   ) {}
 
   ngOnInit() {
@@ -132,7 +131,6 @@ export class LoginPage implements OnInit {
     }
   }
 
-
   goback() {
     const pathName = SessionStore.user.UrlBeforeInactivity
     if(pathName) {
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 0539f5085..60fbde25a 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -196,16 +196,30 @@ export class ToastService {
 
 
   loading() : HTMLDivElement {
+
     let loader: HTMLDivElement = document.createElement('div')
+
+    let theme;
+
+    if(document.querySelector('body').className.includes('gov')) {
+      theme = 'gov'
+    } else if(document.querySelector('body').className.includes('default')) {
+      theme = 'blue'
+    } else if(document.querySelector('body').className.includes('tribunal')) {
+      theme = 'tribunal'
+    } else {
+      theme = 'gov'
+    }
+
     loader.innerHTML = `
-
-    <div class="loading-blocker">
-      <div class="loading-blocker-container">
-      <img src="/assets/images/Blocks-loader.gif" />
+      <div class="loading-blocker">
+        <div class="loading-blocker-container">
+        <img src="/assets/gif/theme/${theme}/Blocks-loader.svg" />
+        </div>
       </div>
-    </div>
-    `
-
+    `;
+    
+    console.log(document.querySelector('body').classList)
     document.body.append(loader)
 
     loader.addEventListener('click', ()=>{
diff --git a/src/assets/gif/theme/blue/Blocks-loader.svg b/src/assets/gif/theme/blue/Blocks-loader.svg
new file mode 100644
index 000000000..498b9787d
--- /dev/null
+++ b/src/assets/gif/theme/blue/Blocks-loader.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto;  display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<rect x="19" y="19" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0s" calcMode="discrete"></animate>
+</rect><rect x="40" y="19" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.125s" calcMode="discrete"></animate>
+</rect><rect x="61" y="19" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.25s" calcMode="discrete"></animate>
+</rect><rect x="19" y="40" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.875s" calcMode="discrete"></animate>
+</rect><rect x="61" y="40" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.375s" calcMode="discrete"></animate>
+</rect><rect x="19" y="61" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.75s" calcMode="discrete"></animate>
+</rect><rect x="40" y="61" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.625s" calcMode="discrete"></animate>
+</rect><rect x="61" y="61" width="20" height="20" fill="#42b9fe">
+  <animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.5s" calcMode="discrete"></animate>
+</rect>
+<!-- [ldio] generated by https://loading.io/ --></svg>
\ No newline at end of file
diff --git a/src/assets/gif/theme/gov/Blocks-loader.svg b/src/assets/gif/theme/gov/Blocks-loader.svg
new file mode 100644
index 000000000..eef24b374
--- /dev/null
+++ b/src/assets/gif/theme/gov/Blocks-loader.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<rect x="19" y="19" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0s" calcMode="discrete"></animate>
+</rect><rect x="40" y="19" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.125s" calcMode="discrete"></animate>
+</rect><rect x="61" y="19" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.25s" calcMode="discrete"></animate>
+</rect><rect x="19" y="40" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.875s" calcMode="discrete"></animate>
+</rect><rect x="61" y="40" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.375s" calcMode="discrete"></animate>
+</rect><rect x="19" y="61" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.75s" calcMode="discrete"></animate>
+</rect><rect x="40" y="61" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.625s" calcMode="discrete"></animate>
+</rect><rect x="61" y="61" width="20" height="20" fill="#c63527">
+  <animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.5s" calcMode="discrete"></animate>
+</rect>
+<!-- [ldio] generated by https://loading.io/ --></svg>
\ No newline at end of file
diff --git a/src/assets/gif/theme/tribunal/Blocks-loader.svg b/src/assets/gif/theme/tribunal/Blocks-loader.svg
new file mode 100644
index 000000000..6f4006567
--- /dev/null
+++ b/src/assets/gif/theme/tribunal/Blocks-loader.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto;  display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<rect x="19" y="19" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0s" calcMode="discrete"></animate>
+</rect><rect x="40" y="19" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.125s" calcMode="discrete"></animate>
+</rect><rect x="61" y="19" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.25s" calcMode="discrete"></animate>
+</rect><rect x="19" y="40" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.875s" calcMode="discrete"></animate>
+</rect><rect x="61" y="40" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.375s" calcMode="discrete"></animate>
+</rect><rect x="19" y="61" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.75s" calcMode="discrete"></animate>
+</rect><rect x="40" y="61" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.625s" calcMode="discrete"></animate>
+</rect><rect x="61" y="61" width="20" height="20" fill="#ff1c1c">
+  <animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.5s" calcMode="discrete"></animate>
+</rect>
+<!-- [ldio] generated by https://loading.io/ --></svg>
\ No newline at end of file
diff --git a/src/global.scss b/src/global.scss
index 0dcae205f..55bce7560 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1300,3 +1300,36 @@ ngx-mat-datetime-content{
 }
 
 
+
+
+@keyframes ldio-rpinwye8j0b {
+    0% { transform: rotate(0deg) }
+    50% { transform: rotate(180deg) }
+    100% { transform: rotate(360deg) }
+  }
+  .ldio-rpinwye8j0b div {
+    position: absolute;
+    animation: ldio-rpinwye8j0b 1s linear infinite;
+    width: 160px;
+    height: 160px;
+    top: 20px;
+    left: 20px;
+    border-radius: 50%;
+    box-shadow: 0 4px 0 0 #e15b64;
+    transform-origin: 80px 82px;
+  }
+  .loadingio-eclipse {
+    width: 200px;
+    height: 200px;
+    display: inline-block;
+    overflow: hidden;
+  }
+  .ldio-rpinwye8j0b {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    transform: translateZ(0) scale(1);
+    backface-visibility: hidden;
+    transform-origin: 0 0; /* see note above */
+  }
+  .ldio-rpinwye8j0b div { box-sizing: content-box; }
\ No newline at end of file