diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
index dc3b946a84..abd414dbdc 100644
--- a/app/assets/javascripts/admin/templates/email_preview_digest.hbs
+++ b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
@@ -19,7 +19,7 @@
 </div>
 
 {{#if loading}}
-  <div class='admin-loading'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{else}}
   {{#if showHtml}}
     {{{html_content}}}
diff --git a/app/assets/javascripts/admin/templates/flags.hbs b/app/assets/javascripts/admin/templates/flags.hbs
index 87a1af655a..2b34210b59 100644
--- a/app/assets/javascripts/admin/templates/flags.hbs
+++ b/app/assets/javascripts/admin/templates/flags.hbs
@@ -9,7 +9,7 @@
 
 <div class="admin-container">
   {{#if loading}}
-    <div class='admin-loading'>{{i18n loading}}</div>
+    <div class='spinner'></div>
   {{else}}
     {{#if length}}
       <table class='admin-flags'>
@@ -160,7 +160,7 @@
         </tbody>
       </table>
       {{#if view.loading}}
-        <div class='admin-loading'>{{i18n loading}}</div>
+        <div class='spinner'></div>
       {{/if}}
 
     {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
index d4e78bce6a..68704f8ee0 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
@@ -1,7 +1,7 @@
 <p>{{i18n admin.logs.screened_emails.description}}</p>
 
 {{#if loading}}
-  <div class='admin-loading'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{else}}
   {{#if model.length}}
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
index 052bb46ada..042116be1f 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
@@ -4,7 +4,7 @@
 <br/>
 
 {{#if loading}}
-  <div class='admin-loading'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{else}}
   {{#if model.length}}
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
index 4753fb6c6b..e20c57ed26 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
@@ -1,7 +1,7 @@
 <p>{{i18n admin.logs.screened_urls.description}}</p>
 
 {{#if loading}}
-  <div class='admin-loading'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{else}}
   {{#if model.length}}
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
index 8788b2000a..9216c394af 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
@@ -45,7 +45,7 @@
 
   {{#if loading}}
     <br/>
-    <div class='admin-loading'>{{i18n loading}}</div>
+    <div class='spinner'></div>
   {{else}}
     {{#if model.length}}
       {{view "staff-action-logs-list" content=controller}}
diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users_list.hbs
index aca1ba0f2e..dfdbe3c7f5 100644
--- a/app/assets/javascripts/admin/templates/users_list.hbs
+++ b/app/assets/javascripts/admin/templates/users_list.hbs
@@ -32,7 +32,7 @@
   <br/>
 
   {{#if loading}}
-    <div class='admin-loading'>{{i18n loading}}</div>
+    <div class='spinner'></div>
   {{else}}
     {{#if model.length}}
       <table class='table'>
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 55a0fc524f..a94cbb0e00 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -66,24 +66,6 @@ td.flaggers td {
   }
 }
 
-.admin-loading {
-  width: 100px;
-  margin: 0 auto 30px auto;
-  background-color: #000;
-  @include border-radius-all(10px);
-  padding: 10px 10px 10px 30px;
-  font-size: 15px;
-  line-height: 23px;
-  text-align: center;
-  color: $secondary;
-  background: {
-    image: image-url("spinner_96_w.gif");
-    repeat: no-repeat;
-    position: 10px 8px;
-    size: 25px;
-  };
-}
-
 .ip-lookup {
   position: relative;
   display: inline-block;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index d0e00e0a60..381e96113a 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -134,3 +134,5 @@ div.ac-wrap {
     }
   }
 }
+
+
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 464b0d1db3..152c91dd8e 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -181,7 +181,6 @@
   .spinner {
     position: absolute;
     @include fades-in(0.25s);
-    @include border-radius-all(10px);
     left: 250px;
     top: 95px;
     height: 100px;
@@ -189,8 +188,7 @@
     height: 70px;
     text-indent: -9999em;
     background: {
-      color: #000;
-      image: image-url("spinner_96_w.gif");
+      image: image-url("spinner_96.gif");
       repeat: no-repeat;
       size: 35px;
       position: 17px 17px;