diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs
index fa4d1bd8d6f..8ee7f0f99d9 100644
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@@ -7,7 +7,7 @@
 </div>
 
 {{#if loading}}
-  <div class='spinner'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{else}}
   <div class='admin-container user-badges'>
     <h2>{{i18n admin.badges.grant_badge}}</h2>
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 571e9bf6518..d163fff5a7a 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -486,7 +486,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
   }.property('isPrivateMessage'),
 
   loadingHTML: function() {
-    return "<div class='spinner'>" + I18n.t('loading') + "</div>";
+    return "<div class='spinner'></div>";
   }.property(),
 
   recoverTopic: function() {
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index fd2216cb107..5f68cf2ddf6 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -36,11 +36,11 @@
       {{/each}}
     </div>
     {{#if canLoadMore}}
-      <div class='spinner'>{{i18n loading}}</div>
+      <div class='spinner'></div>
     {{/if}}
   {{else}}
     {{#unless userBadgesLoaded}}
-      <div class='spinner'>{{i18n loading}}</div>
+      <div class='spinner'></div>
     {{/unless}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index 02803f54409..706b2ce3b1c 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -60,7 +60,5 @@
     </div>
   {{/if}}
 {{else}}
-  <div class='spinner'>
-    {{i18n loading}}
-  </div>
+  <div class='spinner'></div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 30dec03a34b..b2058dea6fb 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -33,13 +33,13 @@
           <dd>{{location.phone}}</dd>
         {{/if}}
       {{else}}
-        <div class="spinner">{{i18n loading}}</div>
+        <div class="spinner"></div>
       {{/if}}
 
       <dt>{{i18n ip_lookup.other_accounts}}</dt>
       <dd>
         {{#if other_accounts_loading}}
-          <div class="spinner">{{i18n loading}}</div>
+          <div class="spinner"></div>
         {{else}}
           {{#each other_accounts}}
             {{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}}{{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index cf2d8c7583e..8af6284dbe2 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -1,4 +1,4 @@
-<div class='spinner'>{{i18n composer.uploading}}</div>
+<div class='spinner'></div>
 
 <div class='contents'>
 
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 897128b0b25..3c143c9780b 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -11,7 +11,7 @@
 </div>
 
 <div {{bind-attr class="loadingSpinner::hidden"}}>
-  <div class='spinner'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 </div>
 
 
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 81f0530f0c8..726b1d3a759 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -53,5 +53,5 @@
     </div>
   {{/if}}
 {{else}}
-  <div class='spinner'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index c73c52d57a6..634ed2829f6 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -75,7 +75,7 @@
           {{render 'topic-progress'}}
 
           {{#if postStream.loadingAbove}}
-            <div class='spinner'>{{i18n loading}}</div>
+            <div class='spinner'></div>
           {{/if}}
 
           {{#unless postStream.loadingFilter}}
@@ -92,13 +92,13 @@
           {{/unless}}
 
           {{#if postStream.loadingBelow}}
-            <div class='spinner'>{{i18n loading}}</div>
+            <div class='spinner'></div>
           {{/if}}
         </div>
         <div id='topic-bottom'></div>
 
         {{#if postStream.loadingFilter}}
-          <div class='spinner small'>{{i18n loading}}</div>
+          <div class='spinner small'></div>
         {{else}}
           {{#if postStream.loadedAllPosts}}
 
@@ -140,13 +140,13 @@
         {{/if}}
       </div>
       {{#if retrying}}
-        <div class='spinner'>{{i18n loading}}</div>
+        <div class='spinner'></div>
       {{/if}}
     {{/if}}
     </div>
   {{else}}
     <div class='container'>
-      <div class='spinner'>{{i18n loading}}</div>
+      <div class='spinner'></div>
     </div>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/invited.hbs b/app/assets/javascripts/discourse/templates/user/invited.hbs
index 86f2f8ea272..3a0a4a4a634 100644
--- a/app/assets/javascripts/discourse/templates/user/invited.hbs
+++ b/app/assets/javascripts/discourse/templates/user/invited.hbs
@@ -63,7 +63,7 @@
         {{/each}}
       </table>
       {{#if invitesLoading}}
-        <div class='spinner'>{{i18n loading}}</div>
+        <div class='spinner'></div>
       {{/if}}
 
     {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index ec8a993c641..d0c6a2bfde6 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -17,7 +17,7 @@
   </div>
 {{/each}}
 {{#if loading}}
-  <div class='spinner'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{/if}}
 {{#unless canLoadMore}}
   <div class='end-of-stream'></div>
diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/templates/user/posts.hbs
index 5e968ec9300..46c4313e7fc 100644
--- a/app/assets/javascripts/discourse/templates/user/posts.hbs
+++ b/app/assets/javascripts/discourse/templates/user/posts.hbs
@@ -27,5 +27,5 @@
   </div>
 {{/each}}
 {{#if loading}}
-  <div class='spinner'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index bef320db186..862817baa64 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -27,5 +27,5 @@
   </div>
 {{/grouped-each}}
 {{#if loading}}
-  <div class='spinner'>{{i18n loading}}</div>
+  <div class='spinner'></div>
 {{/if}}
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 0d4ad381658..1343cd332c6 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -140,20 +140,13 @@ body {
 }
 
 .spinner {
-  width: 100px;
-  margin: 10px 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;
+  width: 30px;
+  margin: 0 auto;
+  padding: 15px 15px;
   background: {
-    image: image-url("spinner_96_w.gif");
+    image: image-url("spinner_96.gif");
     repeat: no-repeat;
-    position: 10px 8px;
-    size: 25px;
+    size: 30px;
   };
   -webkit-animation: spinner .25s;
   animation: spinner .25s;