diff --git a/package.json b/package.json
index 436956eb30f..a5156cec54f 100644
--- a/package.json
+++ b/package.json
@@ -38,13 +38,11 @@
       "jade",
       "keytar",
       "menu",
-      "octicons",
       "mongodb-scope-server"
     ]
   },
   "fonts": [
     "node_modules/font-awesome/fonts/fontawesome-webfont*",
-    "node_modules/octicons/octicons/octicons.{eot,svg,ttf,woff}",
     "fonts/*"
   ],
   "browserify": {
@@ -56,8 +54,7 @@
   "less": {
     "paths": [
       "node_modules/font-awesome/less",
-      "node_modules/bootstrap/less",
-      "node_modules/octicons/octicons"
+      "node_modules/bootstrap/less"
     ]
   },
   "scripts": {
@@ -124,18 +121,17 @@
     "mongodb-language-model": "^0.3.3",
     "mongodb-ns": "^1.0.1",
     "mongodb-schema": "^3.3.1",
+    "mongodb-scope-client": "http://bin.mongodb.org/js/mongodb-scope-client/v0.6.0/mongodb-scope-client-0.6.0.tar.gz",
+    "mongodb-scope-server": "http://bin.mongodb.org/js/mongodb-scope-server/v0.10.0/mongodb-scope-server-0.10.0.tar.gz",
     "mousetrap": "^1.5.3",
     "ms": "^0.7.1",
     "node-notifier": "^4.3.1",
     "numeral": "^1.5.3",
-    "octicons": "https://github.com/github/octicons/archive/v3.1.0.tar.gz",
     "pluralize": "^1.2.1",
     "qs": "^5.2.0",
     "raf": "^3.1.0",
     "run-sequence": "^1.1.4",
     "run-series": "^1.1.4",
-    "mongodb-scope-client": "http://bin.mongodb.org/js/mongodb-scope-client/v0.6.0/mongodb-scope-client-0.6.0.tar.gz",
-    "mongodb-scope-server": "http://bin.mongodb.org/js/mongodb-scope-server/v0.10.0/mongodb-scope-server-0.10.0.tar.gz",
     "storage-mixin": "^0.5.0",
     "stream-combiner2": "^1.1.1",
     "uuid": "^2.0.1",
diff --git a/src/sidebar/filter.jade b/src/sidebar/filter.jade
index 35f3671479f..4e34f4d1be1 100644
--- a/src/sidebar/filter.jade
+++ b/src/sidebar/filter.jade
@@ -1,3 +1,3 @@
 .list-filter(data-hook='filter')
-  i.search.octicon-search
+  i.search.fa-search
   input(type='search', data-hook='search')
diff --git a/src/sidebar/index.less b/src/sidebar/index.less
index d526ad80ca0..08db10c72be 100644
--- a/src/sidebar/index.less
+++ b/src/sidebar/index.less
@@ -28,7 +28,7 @@
     box-shadow: 0 2px 0 rgba(0,0,0,0.2);
 
     i.search {
-      .octicon;
+      .fa-icon;
       position: absolute;
       margin-top: 9px;
       margin-left: 10px;
diff --git a/styles/index.less b/styles/index.less
index 56166e09906..9c44505e7d8 100644
--- a/styles/index.less
+++ b/styles/index.less
@@ -1,12 +1,10 @@
 // Dependencies
 @import "font-awesome";
-@import "octicons";
 @import "bootstrap";
 @import (css) "node_modules/highlight.js/styles/github.css";
 
 // Configuration
 // @import "./variables.less";
-@octicons-font-path: "fonts";
 @fa-font-path: "fonts";
 
 @sidebar-width: 220px;
diff --git a/styles/variables.less b/styles/variables.less
index 4f0539f6108..eaca0ac1d8c 100644
--- a/styles/variables.less
+++ b/styles/variables.less
@@ -5,7 +5,6 @@
 // @sidebar-border: @gray6; // @worldhack: was @gray7
 // @sidebar-width: 220px;
 
-@octicons-font-path: "fonts";
 //== Colors
 //
 //## Gray and brand colors for use across Bootstrap.