diff --git a/public/css/skeleton.css b/public/css/skeleton.css
index a8335e891..f55fd9084 100644
--- a/public/css/skeleton.css
+++ b/public/css/skeleton.css
@@ -1 +1 @@
-.sk-grid{box-sizing:border-box;display:flex;margin-left:auto;margin-right:auto;flex-wrap:wrap;max-width:1400px;width:88.5714285714%}@media screen and (max-width:1020px){.sk-grid{width:88.2352941176%}}@media screen and (max-width:600px){.sk-grid{width:97.4193548387%}}.sk-grid-0{box-sizing:border-box;display:flex;margin-left:auto;margin-right:auto;flex-wrap:wrap;max-width:1400px;width:100%}.sk-grid__col-desk-0{margin-bottom:4px;box-sizing:border-box;width:0%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-0{margin-left:0}.sk-grid__col-desk-1{margin-bottom:4px;box-sizing:border-box;width:8.3333333333%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-1{margin-left:8.3333333333%}.sk-grid__col-desk-2{margin-bottom:4px;box-sizing:border-box;width:16.6666666667%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-2{margin-left:16.6666666667%}.sk-grid__col-desk-3{margin-bottom:4px;box-sizing:border-box;width:25%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-3{margin-left:25%}.sk-grid__col-desk-4{margin-bottom:4px;box-sizing:border-box;width:33.3333333333%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-4{margin-left:33.3333333333%}.sk-grid__col-desk-5{margin-bottom:4px;box-sizing:border-box;width:41.6666666667%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-5{margin-left:41.6666666667%}.sk-grid__col-desk-6{margin-bottom:4px;box-sizing:border-box;width:50%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-6{margin-left:50%}.sk-grid__col-desk-7{margin-bottom:4px;box-sizing:border-box;width:58.3333333333%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-7{margin-left:58.3333333333%}.sk-grid__col-desk-8{margin-bottom:4px;box-sizing:border-box;width:66.6666666667%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-8{margin-left:66.6666666667%}.sk-grid__col-desk-9{margin-bottom:4px;box-sizing:border-box;width:75%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-9{margin-left:75%}.sk-grid__col-desk-10{margin-bottom:4px;box-sizing:border-box;width:83.3333333333%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-10{margin-left:83.3333333333%}.sk-grid__col-desk-11{margin-bottom:4px;box-sizing:border-box;width:91.6666666667%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-11{margin-left:91.6666666667%}.sk-grid__col-desk-12{margin-bottom:4px;box-sizing:border-box;width:100%;padding-left:1.6129032258%;padding-right:1.6129032258%}.sk-grid__col-desk-shift-12{margin-left:100%}@media screen and (max-width:1020px){.sk-grid__col-tab-0{margin-bottom:4px;box-sizing:border-box;width:0%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-0{margin-left:0}.sk-grid__col-tab-1{margin-bottom:4px;box-sizing:border-box;width:8.3333333333%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-1{margin-left:8.3333333333%}.sk-grid__col-tab-2{margin-bottom:4px;box-sizing:border-box;width:16.6666666667%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-2{margin-left:16.6666666667%}.sk-grid__col-tab-3{margin-bottom:4px;box-sizing:border-box;width:25%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-3{margin-left:25%}.sk-grid__col-tab-4{margin-bottom:4px;box-sizing:border-box;width:33.3333333333%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-4{margin-left:33.3333333333%}.sk-grid__col-tab-5{margin-bottom:4px;box-sizing:border-box;width:41.6666666667%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-5{margin-left:41.6666666667%}.sk-grid__col-tab-6{margin-bottom:4px;box-sizing:border-box;width:50%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-6{margin-left:50%}.sk-grid__col-tab-7{margin-bottom:4px;box-sizing:border-box;width:58.3333333333%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-7{margin-left:58.3333333333%}.sk-grid__col-tab-8{margin-bottom:4px;box-sizing:border-box;width:66.6666666667%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-8{margin-left:66.6666666667%}.sk-grid__col-tab-9{margin-bottom:4px;box-sizing:border-box;width:75%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-9{margin-left:75%}.sk-grid__col-tab-10{margin-bottom:4px;box-sizing:border-box;width:83.3333333333%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-10{margin-left:83.3333333333%}.sk-grid__col-tab-11{margin-bottom:4px;box-sizing:border-box;width:91.6666666667%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-11{margin-left:91.6666666667%}.sk-grid__col-tab-12{margin-bottom:4px;box-sizing:border-box;width:100%;padding-left:1.6666666667%;padding-right:1.6666666667%}.sk-grid__col-tab-shift-12{margin-left:100%}}@media screen and (max-width:600px){.sk-grid__col-mob-0{margin-bottom:4px;box-sizing:border-box;width:0%;padding-left:1.6556291391%;padding-right:1.6556291391%}.sk-grid__col-mob-shift-0{margin-left:0}.sk-grid__col-mob-1{margin-bottom:4px;box-sizing:border-box;width:25%;padding-left:1.6556291391%;padding-right:1.6556291391%}.sk-grid__col-mob-shift-1{margin-left:25%}.sk-grid__col-mob-2{margin-bottom:4px;box-sizing:border-box;width:50%;padding-left:1.6556291391%;padding-right:1.6556291391%}.sk-grid__col-mob-shift-2{margin-left:50%}.sk-grid__col-mob-3{margin-bottom:4px;box-sizing:border-box;width:75%;padding-left:1.6556291391%;padding-right:1.6556291391%}.sk-grid__col-mob-shift-3{margin-left:75%}.sk-grid__col-mob-4{margin-bottom:4px;box-sizing:border-box;width:100%;padding-left:1.6556291391%;padding-right:1.6556291391%}.sk-grid__col-mob-shift-4{margin-left:100%}}.sk-loader{background:linear-gradient(270deg,#e2e9f0,#f0f4f8,#e2e9f0,#f0f4f8);background-size:300% 300%;-webkit-animation:sk-animation 3s ease infinite;-moz-animation:sk-animation 3s ease infinite;animation:sk-animation 3s ease infinite;width:100%;height:25px;border-radius:10px}.sk-loader.dark{background:linear-gradient(270deg,#2e3135,#2d2f34,#2e3135,#2d2f34);background-size:300% 300%}.sk-loader--box{border-radius:0}.sk-loader--round{border-radius:50%}@-webkit-keyframes sk-animation{0%{background-position:0 50%}50%{background-position:100% 50%}100%{background-position:0 50%}}@-moz-keyframes sk-animation{0%{background-position:0 50%}50%{background-position:100% 50%}100%{background-position:0 50%}}@keyframes sk-animation{0%{background-position:0 50%}50%{background-position:100% 50%}100%{background-position:0 50%}}.redirect-skeleton-container{width:100%;height:100%;justify-content:center;align-items:center;flex-direction:column}.redirect-skeleton-content{text-align:center;margin-top:-20px}.redirect-skeleton-container h1.title{font-size:14px;color:#0f1222;font-family:Roboto,sans-serif!important;margin:0;text-align:center;background:0 0}@-webkit-keyframes beatStretchDelay{50%{-webkit-transform:scale(.75);transform:scale(.75);-webkit-opacity:.2;opacity:.2}100%{-webkit-transform:scale(1);transform:scale(1);-webkit-opacity:1;opacity:1}}@keyframes beatStretchDelay{50%{-webkit-transform:scale(.75);transform:scale(.75);-webkit-opacity:.2;opacity:.2}100%{-webkit-transform:scale(1);transform:scale(1);-webkit-opacity:1;opacity:1}}@media (min-width:768px){.redirect-skeleton-container h1.title{font-size:14px}.redirect-skeleton-container p.info{font-size:28px}}.redirect-skeleton-container .spinner{display:inline-block;position:relative;background-color:#0364ff;height:60px;width:60px;border-radius:50%;background:conic-gradient(transparent,#0364ff);animation:rotate 1s linear infinite}.redirect-skeleton-container .head,.redirect-skeleton-container .mask{content:'';position:absolute;border-radius:50%}.redirect-skeleton-container .mask{width:50px;height:50px;top:5px;left:5px;background-color:#fcfcfc}.redirect-skeleton-container .head{height:5px;width:5px;background-color:#0364ff;top:0;left:26px}@keyframes rotate{from{transform:rotateZ(0)}to{transform:rotateZ(360deg)}}
\ No newline at end of file
+.redirect-skeleton-container{width:100%;height:100%;justify-content:center;align-items:center;flex-direction:column;display:none}.redirect-skeleton-content{text-align:center;margin-top:-20px}.redirect-skeleton-container .spinner{display:inline-block;position:relative;background-color:#0364ff;height:60px;width:60px;border-radius:50%;background:conic-gradient(transparent,#0364ff);animation:rotate 1s linear infinite}.redirect-skeleton-container .head,.redirect-skeleton-container .mask{content:'';position:absolute;border-radius:50%}.redirect-skeleton-container .mask{width:50px;height:50px;top:5px;left:5px;background-color:#fcfcfc}.redirect-skeleton-container .head{height:5px;width:5px;background-color:#0364ff;top:0;left:26px}@keyframes rotate{from{transform:rotateZ(0)}to{transform:rotateZ(360deg)}}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index e9f55f823..71360a9c3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -68,10 +68,6 @@
         margin: 0;
       }
 
-      .skeleton-holder {
-        display: none;
-      }
-
       @media screen and (max-width: 150px) {
         .crisp-client {
           display: none;
@@ -85,9 +81,8 @@
       <strong>We're sorry but app doesn't work properly without javascript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app">
-      <!-- <div> -->
-      <!-- REDIRECT LOADER -->
-      <div id="skeleton-redirect" class="redirect-skeleton-container skeleton-holder">
+      <!-- LOADER -->
+      <div id="skeleton-redirect" class="redirect-skeleton-container">
         <div class="redirect-skeleton-content">
           <div id="skeleton-redirect-spinner" class="spinner">
             <div class="head"></div>
@@ -95,345 +90,8 @@
           </div>
         </div>
       </div>
-
-      <!-- LOGIN LOADER -->
-      <div id="skeleton-login" class="skeleton-holder sk-grid" style="margin-top: 20px">
-        <div class="sk-grid__col-desk-6 sk-grid">
-          <div class="sk-grid__col-desk-12" style="height: 150px"></div>
-          <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 30px; margin-bottom: 30px"></div></div>
-          <div class="sk-grid__col-desk-9"></div>
-
-          <div class="sk-grid__col-desk-9"><div class="sk-loader" style="height: 40px; margin-bottom: 20px"></div></div>
-          <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 15px; margin-bottom: 30px"></div></div>
-          <div class="sk-grid__col-desk-8"><div class="sk-loader" style="height: 50px; margin-bottom: 15px"></div></div>
-          <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 15px; margin-bottom: 15px"></div></div>
-          <div class="sk-grid__col-desk-6"></div>
-
-          <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-          <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-          <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-          <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-          <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 15px; margin-bottom: 15px"></div></div>
-
-          <div class="sk-grid__col-desk-12" style="height: 150px"></div>
-        </div>
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 100%; margin-bottom: 30px"></div></div>
-      </div>
-
-      <!-- MOBILE LOGIN LOADER -->
-      <div id="skeleton-login-mobile" class="skeleton-holder sk-grid" style="width: 75%">
-        <div class="sk-grid__col-mob-4" style="height: 150px"></div>
-
-        <div class="sk-grid__col-mob-1"><div class="sk-loader" style="height: 30px; margin-bottom: 30px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 35px; margin-bottom: 3px"></div></div>
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 35px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 15px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 15px; margin-bottom: 15px"></div></div>
-
-        <div class="sk-grid__col-mob-1"><div class="sk-loader" style="height: 50px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-1"><div class="sk-loader" style="height: 50px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-1"><div class="sk-loader" style="height: 50px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-1"><div class="sk-loader" style="height: 50px; margin-bottom: 10px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 15px; margin-bottom: 5px"></div></div>
-      </div>
-
-      <!-- HOME LOADER -->
-      <div id="skeleton-wallet-home" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-desk-2"><div class="sk-loader" style="height: 25px"></div></div>
-        <div class="sk-grid__col-desk-4 sk-grid__col-desk-shift-6 sk-grid">
-          <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 15px"></div></div>
-          <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 15px"></div></div>
-        </div>
-
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 140px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 140px; margin-bottom: 15px"></div></div>
-
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 15px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-
-        <div class="sk-grid__col-desk-3">
-          <div class="sk-grid" style="margin-left: 0">
-            <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 2px"></div></div>
-            <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 2px"></div></div>
-          </div>
-        </div>
-        <div class="sk-grid__col-desk-6"></div>
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 140px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 140px; margin-bottom: 15px"></div></div>
-      </div>
-
-      <!-- MOBILE HOME LOADER -->
-      <div id="skeleton-wallet-home-mobile" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 35px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 25px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 130px; margin-bottom: 30px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 130px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 5px"></div></div>
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 5px"></div></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 15px; margin-bottom: 15px"></div></div>
-
-        <div class="sk-grid__col-mob-1"><div class="sk-loader" style="height: 50px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-1"><div class="sk-loader" style="height: 50px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 150px; margin-bottom: 5px"></div></div>
-      </div>
-
-      <!-- HOME COLLECTIBLES LOADER -->
-      <div id="skeleton-wallet-home-collectibles" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 25px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-9"></div>
-
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 35px"></div></div>
-        <div class="sk-grid__col-desk-2" style="align-self: flex-end"><div class="sk-loader" style="height: 15px; margin-bottom: 35px"></div></div>
-        <div class="sk-grid__col-desk-4"></div>
-
-        <div class="sk-grid__col-desk-2"><div class="sk-loader" style="height: 180px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-2"><div class="sk-loader" style="height: 180px; margin-bottom: 15px"></div></div>
-      </div>
-
-      <!-- HOME COLLECTIBLES MOBILE LOADER -->
-      <div id="skeleton-wallet-home-collectibles-mobile" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 35px"></div></div>
-
-        <div class="sk-grid__col-mob-3"><div class="sk-loader" style="height: 15px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-1"></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 5px"></div></div>
-        <div class="sk-grid__col-mob-2 sk-grid__col-mob-shift-2"><div class="sk-loader" style="height: 15px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 130px; margin-bottom: 30px"></div></div>
-      </div>
-
-      <!-- TRANSFER LOADER -->
-      <div id="skeleton-wallet-transfer" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 25px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-9"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-3"></div>
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-3"></div>
-
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-4"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-2"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-9"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-2 sk-grid__col-desk-shift-1"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-2 sk-grid__col-desk-shift-1"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-9"></div>
-
-        <div class="sk-grid__col-desk-6"><div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-
-        <div class="sk-grid__col-desk-6">
-          <div class="sk-grid__col-desk-4 sk-grid__col-desk-shift-8" style="padding-right: 0">
-            <div class="sk-loader" style="height: 50px; margin-bottom: 25px"></div>
-          </div>
-        </div>
-        <div class="sk-grid__col-desk-6"></div>
-      </div>
-
-      <!-- MOBILE TRANSFER LOADER -->
-      <div id="skeleton-wallet-transfer-mobile" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 35px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 25px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-3"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-2 sk-grid__col-mob-shift-2"><div class="sk-loader" style="height: 15px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-mob-2 sk-grid__col-mob-shift-2"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-      </div>
-
-      <!-- TOPUP LOADER -->
-      <div id="skeleton-wallet-topup" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 25px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-9"></div>
-
-        <div class="sk-grid__col-desk-5"><div class="sk-loader" style="height: 90px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-desk-7"></div>
-        <div class="sk-grid__col-desk-5"><div class="sk-loader" style="height: 90px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-desk-7"></div>
-        <div class="sk-grid__col-desk-5"><div class="sk-loader" style="height: 90px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-desk-7"></div>
-        <div class="sk-grid__col-desk-5"><div class="sk-loader" style="height: 90px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-desk-7"></div>
-        <div class="sk-grid__col-desk-5"><div class="sk-loader" style="height: 90px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-desk-7"></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-9"></div>
-        <div class="sk-grid__col-desk-4"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-      </div>
-
-      <!-- MOBILE TOPUP LOADER -->
-      <div id="skeleton-wallet-topup-mobile" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 35px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 25px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 85px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 85px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 85px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 85px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 85px; margin-bottom: 15px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-      </div>
-
-      <!-- HISTORY LOADER -->
-      <div id="skeleton-wallet-history" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 25px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-6"></div>
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 20px; margin-bottom: 25px"></div></div>
-
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 75px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 75px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 75px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 75px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 75px; margin-bottom: 40px"></div></div>
-
-        <div class="sk-grid__col-desk-4"></div>
-        <div class="sk-grid__col-desk-4"><div class="sk-loader" style="height: 15px; margin-bottom: 2px"></div></div>
-        <div class="sk-grid__col-desk-4"></div>
-      </div>
-
-      <!-- MOBILE HISTORY LOADER -->
-      <div id="skeleton-wallet-history-mobile" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 35px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 25px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-3 sk-grid__col-mob-shift-1"><div class="sk-loader" style="height: 20px; margin-bottom: 20px"></div></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 100px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 100px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 100px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 100px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 100px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 100px; margin-bottom: 15px"></div></div>
-      </div>
-
-      <!-- SETTINGS LOADER -->
-      <div id="skeleton-wallet-settings" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-
-        <div class="sk-grid__col-desk-3"><div class="sk-loader" style="height: 25px; margin-bottom: 25px"></div></div>
-        <div class="sk-grid__col-desk-9"></div>
-
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 190px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 190px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 250px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-desk-12"><div class="sk-loader" style="height: 190px; margin-bottom: 15px"></div></div>
-      </div>
-
-      <!-- MOBILE SETTINGS LOADER -->
-      <div id="skeleton-wallet-settings-mobile" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 35px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 25px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-3 sk-grid__col-mob-shift-1"><div class="sk-loader" style="height: 20px; margin-bottom: 20px"></div></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 160px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 160px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 250px; margin-bottom: 15px"></div></div>
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 160px; margin-bottom: 15px"></div></div>
-      </div>
-
-      <!-- POPUP / CONFIRM LOADER -->
-      <div id="skeleton-confirm" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-top: 30px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 50px; margin-bottom: 20px"></div></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 80px; margin-bottom: 20px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-      </div>
-
-      <!-- POPUP / USER INFO / CHANGE PROVIDER LOADER -->
-      <div id="skeleton-user-info-and-provider" class="skeleton-holder sk-grid">
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-top: 30px; margin-bottom: 20px"></div></div>
-        <div class="sk-grid__col-mob-2"></div>
-
-        <div class="sk-grid__col-mob-4"><div class="sk-loader" style="height: 100px; margin-bottom: 20px"></div></div>
-
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-        <div class="sk-grid__col-mob-2"><div class="sk-loader" style="height: 50px; margin-bottom: 30px"></div></div>
-      </div>
     </div>
     <script>
-      const MOBILE_BREAKPOINT = 600
       const redirectPath = location.pathname
       let theme = 'light'
       function storageAvailable(type) {
@@ -472,42 +130,16 @@
 
       if (theme === 'dark') document.querySelector('body').style.backgroundColor = '#24252A'
 
-      const mobileTag = window.innerWidth < MOBILE_BREAKPOINT ? '-mobile' : ''
-      let selectedLoader = 'skeleton-login' + mobileTag
-      if (/\/wallet\/transfer/.test(redirectPath)) {
-        selectedLoader = 'skeleton-wallet-transfer' + mobileTag
-      } else if (/\/wallet\/topup/.test(redirectPath)) {
-        selectedLoader = 'skeleton-wallet-topup' + mobileTag
-      } else if (/\/wallet\/history/.test(redirectPath)) {
-        selectedLoader = 'skeleton-wallet-history' + mobileTag
-      } else if (/\/wallet\/settings/.test(redirectPath)) {
-        selectedLoader = 'skeleton-wallet-settings' + mobileTag
-      } else if (/\/wallet\/home\/collectibles/.test(redirectPath)) {
-        selectedLoader = 'skeleton-wallet-home-collectibles' + mobileTag
-      } else if (/\/wallet\/home/.test(redirectPath)) {
-        selectedLoader = 'skeleton-wallet-home' + mobileTag
-      } else if (/\/userinforequest/.test(redirectPath) || /\/providerchange/.test(redirectPath)) {
-        selectedLoader = 'skeleton-user-info-and-provider'
-      } else if (/\/popup/.test(redirectPath) || /\/confirm/.test(redirectPath)) {
-        selectedLoader = 'skeleton-confirm'
-      } else if (/\/redirect/.test(redirectPath)) {
-      document.querySelector('html').style.height = '100%'
-      document.querySelector('body').style.height = '100%'
-      document.querySelector('#app').style.height = '100%'
-      document.querySelector('#app').style.backgroundColor = theme === 'dark' ? '#24252A' : '#FCFCFC'
-      document.querySelector('#skeleton-redirect-spinner .mask').style.backgroundColor = theme === 'dark' ? '#24252A' : '#FCFCFC'
-      selectedLoader = 'skeleton-redirect'
-      } else if (/\/end/i.test(redirectPath) || /\/start/i.test(redirectPath)) {
-        selectedLoader = ''
-      }
-      if (selectedLoader) {
-        const loaderElement = document.querySelector('#' + selectedLoader)
-        if (theme === 'dark') {
-          loaderElement.querySelectorAll('.sk-loader').forEach(function (loader) {
-            loader.classList.add('dark')
-          })
-        }
-        // loaderElement.style.display = /\/redirect/.test(redirectPath) || mobileTag ? 'flex' : 'flex'
+      // Don't show loader on start and end route
+      if (!(/\/end/i.test(redirectPath) || /\/start/i.test(redirectPath))) {
+        document.querySelector('html').style.height = '100%'
+        document.querySelector('body').style.height = '100%'
+        document.querySelector('#app').style.height = '100%'
+        document.querySelector('#app').style.backgroundColor = theme === 'dark' ? '#24252A' : '#FCFCFC'
+        document.querySelector('#skeleton-redirect-spinner .mask').style.backgroundColor = theme === 'dark' ? '#24252A' : '#FCFCFC'
+
+
+        const loaderElement = document.querySelector('#skeleton-redirect')
         loaderElement.style.display = 'flex'
       }
     </script>
diff --git a/src/content-loader/ChangeProviderScreenLoader.vue b/src/content-loader/ChangeProviderScreenLoader.vue
deleted file mode 100644
index a52a69d97..000000000
--- a/src/content-loader/ChangeProviderScreenLoader.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div class="sk-grid">
-    <div class="sk-grid__col-mob-2">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 50px; margin-top: 30px; margin-bottom: 20px"></div>
-    </div>
-    <div class="sk-grid__col-mob-2"></div>
-
-    <div class="sk-grid__col-mob-4">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 100px; margin-bottom: 20px"></div>
-    </div>
-
-    <div class="sk-grid__col-mob-2">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 50px; margin-bottom: 30px"></div>
-    </div>
-    <div class="sk-grid__col-mob-2">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 50px; margin-bottom: 30px"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {}
-</script>
diff --git a/src/content-loader/PopupScreenLoader.vue b/src/content-loader/PopupScreenLoader.vue
deleted file mode 100644
index 4cd26ffb5..000000000
--- a/src/content-loader/PopupScreenLoader.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <div class="sk-grid">
-    <div class="sk-grid__col-mob-2">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 50px; margin-top: 30px; margin-bottom: 20px"></div>
-    </div>
-    <div class="sk-grid__col-mob-2"></div>
-
-    <div class="sk-grid__col-mob-4">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 50px; margin-bottom: 20px"></div>
-    </div>
-
-    <div class="sk-grid__col-mob-4">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 80px; margin-bottom: 20px"></div>
-    </div>
-
-    <div class="sk-grid__col-mob-2">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 50px; margin-bottom: 30px"></div>
-    </div>
-    <div class="sk-grid__col-mob-2">
-      <div :class="$vuetify.theme.dark ? 'dark' : ''" class="sk-loader" style="height: 50px; margin-bottom: 30px"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {}
-</script>
diff --git a/src/content-loader/index.js b/src/content-loader/index.js
deleted file mode 100644
index 9bc1e01a7..000000000
--- a/src/content-loader/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as ChangeProviderScreenLoader } from './ChangeProviderScreenLoader.vue'
-export { default as PopupScreenLoader } from './PopupScreenLoader.vue'
diff --git a/src/views/Confirm/Confirm.scss b/src/views/Confirm/Confirm.scss
index c0d5450b1..ae1fd61f1 100644
--- a/src/views/Confirm/Confirm.scss
+++ b/src/views/Confirm/Confirm.scss
@@ -1,3 +1,6 @@
 .container {
   max-width: 600px;
+  &.spinner {
+    max-width: unset;
+  }
 }
diff --git a/src/views/Confirm/Confirm.vue b/src/views/Confirm/Confirm.vue
index a0d8ba3a6..8d2ff9534 100644
--- a/src/views/Confirm/Confirm.vue
+++ b/src/views/Confirm/Confirm.vue
@@ -1,7 +1,7 @@
 <template>
-  <v-container px-0 py-0 class="confirm-container">
+  <v-container px-0 py-0 :class="{ spinner: type === 'none' }">
     <template v-if="type === 'none'">
-      <PopupScreenLoader />
+      <BoxLoader :force-spinner="true" />
     </template>
     <ConfirmForm v-else :current-confirm-modal="currentConfirmModal" @triggerSign="triggerSign" @triggerDeny="triggerDeny" />
   </v-container>
@@ -11,15 +11,15 @@
 import { BroadcastChannel } from '@toruslabs/broadcast-channel'
 
 import ConfirmForm from '../../components/Confirm/ConfirmForm'
+import BoxLoader from '../../components/helpers/BoxLoader'
 // import DappCreateTkey from '../../components/helpers/DappCreateTkey'
-import { PopupScreenLoader } from '../../content-loader'
 import { POPUP_LOADED, POPUP_RESULT } from '../../utils/enums'
 import { broadcastChannelOptions } from '../../utils/utils'
 
 export default {
   name: 'Confirm',
   components: {
-    PopupScreenLoader,
+    BoxLoader,
     ConfirmForm,
     // DappCreateTkey,
   },
diff --git a/src/views/ProviderChange/ProviderChange.scss b/src/views/ProviderChange/ProviderChange.scss
index 09d39dc5f..72e501c1b 100644
--- a/src/views/ProviderChange/ProviderChange.scss
+++ b/src/views/ProviderChange/ProviderChange.scss
@@ -7,6 +7,9 @@
 
 .container {
   max-width: 600px;
+  &.spinner {
+    max-width: unset;
+  }
 }
 
 .v-card__text {
diff --git a/src/views/ProviderChange/ProviderChange.vue b/src/views/ProviderChange/ProviderChange.vue
index f11e547bb..3363497af 100644
--- a/src/views/ProviderChange/ProviderChange.vue
+++ b/src/views/ProviderChange/ProviderChange.vue
@@ -1,7 +1,7 @@
 <template>
-  <v-container px-0 py-0>
+  <v-container px-0 py-0 :class="{ spinner: type === 'none' }">
     <template v-if="type === 'none'">
-      <ChangeProviderScreenLoader />
+      <BoxLoader :force-spinner="true" />
     </template>
     <template v-else>
       <v-layout pa-6 class="provider-change-header" :class="{ 'theme--dark': $vuetify.theme.dark }">
@@ -79,14 +79,14 @@
 import { BroadcastChannel } from '@toruslabs/broadcast-channel'
 import { mapGetters } from 'vuex'
 
-import { ChangeProviderScreenLoader } from '../../content-loader'
+import BoxLoader from '../../components/helpers/BoxLoader'
 import { POPUP_LOADED, POPUP_RESULT, RPC, SUPPORTED_NETWORK_TYPES } from '../../utils/enums'
 import { broadcastChannelOptions } from '../../utils/utils'
 
 export default {
   name: 'Confirm',
   components: {
-    ChangeProviderScreenLoader,
+    BoxLoader,
   },
   data() {
     return {