diff --git a/native/atom_window_controller.mm b/native/atom_window_controller.mm
index 45e8b6a35..32a685385 100644
--- a/native/atom_window_controller.mm
+++ b/native/atom_window_controller.mm
@@ -168,7 +168,7 @@
 
 - (void)populateBrowserSettings:(CefBrowserSettings &)settings {
   CefString(&settings.default_encoding) = "UTF-8";
-  settings.remote_fonts_disabled = true;
+  settings.remote_fonts_disabled = false;
   settings.encoding_detector_enabled = false;
   settings.javascript_disabled = false;
   settings.javascript_open_windows_disallowed = false;
diff --git a/src/app/status-bar.coffee b/src/app/status-bar.coffee
index a60138c3a..b77ee5ccd 100644
--- a/src/app/status-bar.coffee
+++ b/src/app/status-bar.coffee
@@ -22,7 +22,11 @@ class StatusBar extends View
       @div class: 'file-info', =>
         @div class: 'current-path', outlet: 'currentPath'
         @div class: 'buffer-modified', outlet: 'bufferModified'
-      @div class: 'cursor-position', outlet: 'cursorPosition'
+      @div class: 'cursor-position', =>
+        @span outlet: 'branchArea', =>
+          @span '\uf020', class: 'octicons'
+          @span class: 'branch-label', outlet: 'branchLabel'
+        @span outlet: 'cursorPosition'
 
   initialize: (@rootView, @editor) ->
     @updatePathText()
@@ -58,6 +62,9 @@ class StatusBar extends View
 
   updateCursorPositionText: ->
     { row, column } = @editor.getCursorBufferPosition()
-    cursorText = "#{row + 1},#{column + 1}"
-    cursorText = "(#{@head}) #{cursorText}" if @head
-    @cursorPosition.text(cursorText)
+    if @head
+      @branchArea.show()
+      @branchLabel.text(@head)
+    else
+      @branchArea.hide()
+    @cursorPosition.text("#{row + 1},#{column + 1}")
diff --git a/static/atom.css b/static/atom.css
index d084ebc7e..ed58eb7ac 100644
--- a/static/atom.css
+++ b/static/atom.css
@@ -72,3 +72,10 @@ html, body {
 .clear-float {
   clear: both;
 }
+
+@font-face {
+  font-family: 'Octicons Regular';
+  src: url(octicons-regular-webfont.ttf) format(truetype);
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/static/octicons-regular-webfont.ttf b/static/octicons-regular-webfont.ttf
new file mode 100644
index 000000000..0c956f793
Binary files /dev/null and b/static/octicons-regular-webfont.ttf differ
diff --git a/static/status-bar.css b/static/status-bar.css
index 0c20bee03..66edb9f8a 100644
--- a/static/status-bar.css
+++ b/static/status-bar.css
@@ -25,3 +25,15 @@
   right: 5px;
   top: 5px;
 }
+
+.status-bar .octicons {
+  font-family: 'Octicons Regular';
+  font-size: 14px;
+  width: 14px;
+  height: 14px;
+}
+
+.status-bar .branch-label {
+  padding-left: 2px;
+  padding-right: 10px;
+}