diff --git a/src/app/status-bar.coffee b/src/app/status-bar.coffee
index 77555afee..6f35a0581 100644
--- a/src/app/status-bar.coffee
+++ b/src/app/status-bar.coffee
@@ -20,10 +20,10 @@ class StatusBar extends View
   @content: ->
     @div class: 'status-bar', =>
       @div class: 'file-info', =>
-        @span class: 'octicons git-status', outlet: 'gitStatusIcon'
         @span class: 'current-path', outlet: 'currentPath'
         @span class: 'buffer-modified', outlet: 'bufferModified'
       @div class: 'cursor-position', =>
+        @span class: 'octicons', outlet: 'gitStatusIcon'
         @span outlet: 'branchArea', =>
           @span '\uf020', class: 'octicons'
           @span class: 'branch-label', outlet: 'branchLabel'
@@ -71,17 +71,16 @@ class StatusBar extends View
       @branchArea.hide()
 
   updateStatusText: ->
-    @gitStatusIcon.empty().hide()
     path = @editor.getPath()
+    @gitStatusIcon.empty()
     return unless path
 
     git = new Git(path)
     if git.isPathModified(path)
       @gitStatusIcon.append $$ -> @span '\uf26d', class: 'modified-status-icon'
-      @gitStatusIcon.show()
     else if git.isPathNew(path)
       @gitStatusIcon.append $$ -> @span '\uf26b', class: 'new-status-icon'
-      @gitStatusIcon.show()
+
 
   updatePathText: ->
     if path = @editor.getPath()
diff --git a/static/status-bar.css b/static/status-bar.css
index 307138d90..ffe93854f 100644
--- a/static/status-bar.css
+++ b/static/status-bar.css
@@ -16,12 +16,14 @@
   top: 5px;
 }
 
-.status-bar .file-info .modified-status-icon {
+.status-bar .modified-status-icon {
   color: #6C6912;
+  padding-right: 5px;
 }
 
-.status-bar .file-info .new-status-icon {
+.status-bar .new-status-icon {
   color: #269F81;
+  padding-right: 5px;
 }
 
 .status-bar .octicons {
@@ -29,9 +31,9 @@
   font-size: 14px;
   width: 14px;
   height: 14px;
-  padding-right: 5px;
 }
 
 .status-bar .branch-label {
+  padding-left: 5px;
   padding-right: 10px;
 }