diff --git a/src/sass/all.scss b/src/sass/all.scss
index f32dd07..eb7660a 100755
--- a/src/sass/all.scss
+++ b/src/sass/all.scss
@@ -17,13 +17,13 @@
 // Utilities classes
 
 @import "utilities/responsive";
+@import "utilities/others";
 
 // Components (TODO: refactor to BEM)
 @import "components/lightbox";
 @import "components/dialog";
 
 // Views (TODO: refactor to BEM)
-@import "views/shared";
 @import "views/add-account";
 @import "views/account";
 @import "views/privatekey-upload";
diff --git a/src/sass/utilities/_others.scss b/src/sass/utilities/_others.scss
new file mode 100644
index 0000000..a052a4b
--- /dev/null
+++ b/src/sass/utilities/_others.scss
@@ -0,0 +1,3 @@
+.u-waiting-cursor {
+    cursor: wait !important;
+}
\ No newline at end of file
diff --git a/src/sass/views/_shared.scss b/src/sass/views/_shared.scss
deleted file mode 100644
index 33463be..0000000
--- a/src/sass/views/_shared.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.waiting-cursor {    
-    cursor: wait;
-}
\ No newline at end of file
diff --git a/src/tpl/login-initial.html b/src/tpl/login-initial.html
index 2734727..c91d2ba 100644
--- a/src/tpl/login-initial.html
+++ b/src/tpl/login-initial.html
@@ -1,4 +1,4 @@
-<div class="view-login view-login-initial" ng-class="{'waiting-cursor': state.ui === 3}">
+<div class="view-login view-login-initial" ng-class="{'u-waiting-cursor': state.ui === 3}">
   <div class="logo">
     <img src="img/whiteout_logo.svg" alt="whiteout.io">
   </div><!--/logo-->
diff --git a/src/tpl/login.html b/src/tpl/login.html
index f416439..cf0cc11 100644
--- a/src/tpl/login.html
+++ b/src/tpl/login.html
@@ -1,4 +1,4 @@
-<div class="view-login waiting-cursor">
+<div class="view-login u-waiting-cursor">
 
   <div class="logo">
     <img src="img/whiteout_logo.svg" alt="whiteout.io">