diff --git a/lib/gollum/public/gollum/javascript/gollum.js.erb b/lib/gollum/public/gollum/javascript/gollum.js.erb
index 04dc34dd..4d49a5c3 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js.erb
+++ b/lib/gollum/public/gollum/javascript/gollum.js.erb
@@ -459,10 +459,13 @@ $(document).ready(function() {
         url: routePath('last_commit_info'),
         data: {path: $("#page-info-toggle").data('pagepath')},
         success: function ( data ) {
+          $("#last-edit").next(".dotted-spinner").toggleClass('hidden');
+          $("#last-edit-in-progress").remove();
           $("#last-edit").html('Last edited by <b>' + data.author + '</b>, ' + data.date);
         }
       });
-      $("#last-edit").html('<i class="fa fa-spinner fa-spin"></i> Getting commit info...');
+      $("#last-edit").next(".dotted-spinner").toggleClass('hidden').after('<span id="last-edit-in-progress"> Getting commit info...</span>');
+      $("#page-info-toggle").toggle();
     })
   }
 
diff --git a/lib/gollum/public/gollum/stylesheets/_spinners.scss b/lib/gollum/public/gollum/stylesheets/_spinners.scss
new file mode 100755
index 00000000..9b1f8c31
--- /dev/null
+++ b/lib/gollum/public/gollum/stylesheets/_spinners.scss
@@ -0,0 +1,245 @@
+/*
+================================================================================
+SPINNERS
+================================================================================
+A Sass mixin to generate a pure CSS3 loading/busy indicator.
+https://github.com/franzheidl/spinners
+Franz Heidl 2014
+MIT License
+--------------------------------------------------------------------------------
+USAGE
+
+Default:
+
+.my-spinner {
+ @include spinner();
+}
+
+
+Custom:
+
+.my-spinner {
+ @include spinner(1.25em, 3px solid #555, .7s, background rgba(0, 0, 0, .2);
+}
+
+All arguments are optional.
+
+Acceppts any valid CSS dimensional declaration, e.g px, em, rem as an argument for size.
+
+Use either shorthand border declarations or individual 'border-[property] [value]' (no colon!) pairs for the style.
+
+Pass any number of seconds referring to the duration of one full rotation for animation speed.
+
+--------------------------------------------------------------------------------
+*/
+
+
+@mixin spinner-keyframes {
+  @-webkit-keyframes spinner-animation {
+    0% {
+      -webkit-transform: rotate(0deg);
+    }
+    100% {
+      -webkit-transform: rotate(360deg);
+    }
+  }
+  @-moz-keyframes spinner-animation {
+    0% {
+      -moz-transform: rotate(0deg);
+    }
+    100% {
+      -moz-transform: rotate(360deg);
+    }
+  }
+  @-ms-keyframes spinner-animation {
+    0% {
+      -ms-transform: rotate(0deg);
+    }
+    100% {
+      -ms-transform: rotate(360deg);
+    }
+  }
+  @-o-keyframes spinner-animation {
+    0% {
+      -o-transform: rotate(0deg);
+    }
+    100% {
+      -o-transform: rotate(100deg);
+    }
+  }
+  @keyframes spinner-animation {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+}
+
+
+
+@include spinner-keyframes();
+
+
+
+@mixin spinner($args...) {
+  $prefixes: -webkit- -moz- -o- -ms- "";
+  $dimensional-units: ('px', 'em', 'rem', '%', 'ex');
+  $border-props: 'border-width' 'border-style' 'border-color';
+  $border-styles: solid dotted dashed double;
+  $size: 1em;
+  $border-width: 3px;
+  $border-style: solid;
+  $border-color: #1277c2;
+  $border: $border-width $border-style $border-color;
+  $duration: .65s;
+  $background: transparent; //
+  
+  // Parse arguments:
+  @if $args {
+    @each $arg in $args {
+      @if length($arg) == 1 {
+        @if type-of($arg) == number {
+          @if unit($arg) != "" {
+            @if unit($arg) == 's' {
+              $duration: $arg;
+            }
+            @else if isIn($dimensional-units, unit($arg)) {
+              $size: $arg;
+            }
+            @else {
+              @warn "Spinner: \"#{$arg}\" is not a valid size or duration declaration!";
+            }
+          }
+          @else {
+            @warn "Spinner: \"#{$arg}\" is not a valid size or duration declaration!";
+          }
+        }
+      }
+      @else if length($arg) == 2 {
+        $prop: nth($arg, 1);
+        $val: nth($arg, 2);
+        @if isIn($border-props, $prop) {
+          @if $prop == 'border-width' {
+            @if unit($val) == 'px' {
+              $border-width: $val;
+            }
+            @else {
+              @warn "Spinner: \"#{unit($val)}\" is not a valid border-width! Using default border-width.";
+            }
+          }
+          @else if $prop == 'border-style' {
+            @if isIn($border-styles, $val) {
+              $border-style: $val;
+            }
+            @else {
+              @warn "Spinner: \"#{$val}\" is not a valid border-style! Using default border-style.";
+            }
+          }
+          @else if $prop == 'border-color' {
+            @if type-of($val) == color {
+              $border-color: $val;
+            }
+            @else {
+              @warn "Spinner: \"#{$val}\" is not a valid border-color! Using default border-color.";
+            }
+          }
+        }
+        @else if $prop == 'background' {
+          @if type-of($val) == color {
+            $background: $val;
+          }
+          @else {
+            @warn "Spinner: \"#{nth($val)}\" is not a valid color for background! Using default \"transparent\".";
+          }
+        }
+        @else {
+          @warn "Spinner: \"#{nth($arg, 1)}\" is not a valid border property! Using default border.";
+        }
+        $border: $border-width $border-style $border-color;
+      }
+      @else if length($arg) == 3 {
+        @if isValidBorder($arg) {
+          $border: $arg;
+        }
+        @else {
+          @warn "Spinner: \"#{$arg}\" is not a valid shorthand border declaration! Using default border.";
+        }
+      }
+    }
+  }
+  
+  
+  
+  background-color: transparent;
+  border: $border;
+  border-radius: 50%;
+  border-top-color: $background;
+  border-right-color: $background;
+  width: $size;
+  height: $size;
+  display: inline-block;
+  vertical-align: middle;
+  @each $prefix in $prefixes {
+    #{$prefix}box-sizing: border-box;
+  }
+  @each $prefix in $prefixes {
+    #{$prefix}animation: spinner-animation $duration infinite linear;
+  }
+}
+
+
+
+@function isValidBorder($border) {
+  $validBorderTypes: color string number;
+  $borderStyles: solid dotted dashed double;
+  $validBorder: false;
+  $types: ();
+  
+  @if length($border) == length($validBorderTypes) {
+    @each $val in $border {
+      @if type-of($val) == number {
+        @if unit($val) == "" {
+          @return false;
+        }
+      }
+      @else if type-of($val) == string {
+        @if not isIn($borderStyles, $val) {
+          @return false;
+        }
+      }
+      $types: append($types, type-of($val));
+    }
+    $validBorder: hasIdenticalValues($validBorderTypes, $types);
+  }
+  
+  @return $validBorder;
+}
+
+
+
+@function hasIdenticalValues($arr1, $arr2) {
+  $id: false;
+  @each $val in $arr1 {
+    @if isIn($arr2, $val) {
+      $id: true;
+    }
+    @else {
+      @return false;
+    }
+  }
+  @return $id;
+}
+
+
+
+@function isIn($arr1, $val) {
+  $hasVal: false;
+  @each $item in $arr1 {
+    @if $item == $val {
+      $hasVal: true;
+    }
+  }
+  @return $hasVal;
+}
diff --git a/lib/gollum/public/gollum/stylesheets/app.scss b/lib/gollum/public/gollum/stylesheets/app.scss
index 8942c8d9..6a128f05 100644
--- a/lib/gollum/public/gollum/stylesheets/app.scss
+++ b/lib/gollum/public/gollum/stylesheets/app.scss
@@ -4,4 +4,5 @@
 //= require criticmarkup
 //= require tables
 //= require emoji
-//= require template
\ No newline at end of file
+//= require template
+//= require spinner
\ No newline at end of file
diff --git a/lib/gollum/public/gollum/stylesheets/editor.scss b/lib/gollum/public/gollum/stylesheets/editor.scss
index a3591ece..42a8ed59 100644
--- a/lib/gollum/public/gollum/stylesheets/editor.scss
+++ b/lib/gollum/public/gollum/stylesheets/editor.scss
@@ -264,11 +264,6 @@ a#function-search { @include editor-button(16); }
 #gollum-editor-body-ace {
   & + div {
     display: none;
-    font-size: 1.5em;
-
-    > i {
-      font-size: 1em;
-    }
   }
 
   &.dragging {
@@ -276,7 +271,7 @@ a#function-search { @include editor-button(16); }
   }
 
   &.uploading {
-    opacity: 0.5;
+    opacity: 1;
     
     & + div {
       display: block;
diff --git a/lib/gollum/public/gollum/stylesheets/spinner.scss b/lib/gollum/public/gollum/stylesheets/spinner.scss
new file mode 100644
index 00000000..ed486416
--- /dev/null
+++ b/lib/gollum/public/gollum/stylesheets/spinner.scss
@@ -0,0 +1,9 @@
+@import "_spinners";
+
+.dotted-spinner {
+ @include spinner(1.4em, border-style dotted);
+ vertical-align: top;
+ &.hidden {
+   display: none;
+ }
+}
\ No newline at end of file
diff --git a/lib/gollum/templates/editor.mustache b/lib/gollum/templates/editor.mustache
index cd784114..57e021a9 100644
--- a/lib/gollum/templates/editor.mustache
+++ b/lib/gollum/templates/editor.mustache
@@ -99,9 +99,8 @@
   </div>
     <textarea id="gollum-editor-body" class="form-control"
      data-markup-lang="{{format}}" name="content" class="mousetrap">{{content}}</textarea>
-    <div>
-      <i class="fa fa-spinner fa-spin"></i>
-      Uploading file ...
+    <div id="uploading">
+      <p><div class="dotted-spinner"></div> Uploading file...</p>
     </div>
 
     {{#header}}
diff --git a/lib/gollum/templates/wiki_content.mustache b/lib/gollum/templates/wiki_content.mustache
index d091d13b..31e42d14 100644
--- a/lib/gollum/templates/wiki_content.mustache
+++ b/lib/gollum/templates/wiki_content.mustache
@@ -44,7 +44,7 @@
 	<div id="footer" class="pt-4">
 	  {{^historical}}
 		{{^preview}}
-		  <p id="last-edit"><a id="page-info-toggle" data-pagepath="{{escaped_url_path}}">When was this page last modified?</a></p>
+		  <p id="last-edit"><div class="dotted-spinner hidden"></div> <a id="page-info-toggle" data-pagepath="{{escaped_url_path}}">When was this page last modified?</a></p>
 		  {{#allow_editing}}
 		    <p>
 		      <a id="delete-link" href="{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
diff --git a/licenses/licenses.txt b/licenses/licenses.txt
index c60bdafc..51131bcf 100644
--- a/licenses/licenses.txt
+++ b/licenses/licenses.txt
@@ -50,3 +50,10 @@ https://github.com/donpark/identicon/blob/master/README
 
   lib/gollum/public/gollum/javascript/identicon_canvas.js
 
+---
+
+CSS Spinner by Franz Heidl is used under the MIT license
+
+https://github.com/franzheidl/spinners
+
+  lib/gollum/public/gollum/stylesheets/_spinners.scss