diff --git a/LICENSE b/LICENSE
index 3056ec7d2..6743356de 100644
--- a/LICENSE
+++ b/LICENSE
@@ -31,5 +31,8 @@ audio/beep.wav from http://freesound.org/people/pierrecartoons1979/sounds/90112/
 4chan/4chan-JS (https://github.com/4chan/4chan-JS)
   license: https://github.com/4chan/4chan-JS/blob/master/LICENSE
 
+Font Awesome by Dave Gandy (http://fontawesome.io)
+  license: http://fontawesome.io/license/
+
 seaweedchan/4chan-x (https://github.com/seaweedchan/4chan-x)
   license: https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
diff --git a/css/style.css b/css/style.css
index fdc052d7f..7536f8ec9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -200,9 +200,6 @@ a[href="javascript:;"] {
 .brackets-wrap::after {
   content: "]\\00a0";
 }
-.expand-all-shortcut {
-  opacity: .35;
-}
 
 /* Notifications */
 #notifications {
diff --git a/package.json b/package.json
index c801dadec..90846d7e4 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     ]
   },
   "devDependencies": {
+    "font-awesome": "git://github.com/tagliala/Font-Awesome.git#1f882574ab9067c69789e4be39bf8d86eee53815",
     "grunt": "~0.4.1",
     "grunt-bump": "~0.0.11",
     "grunt-concurrent": "~0.3.0",
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 675ec96ea..ff94152fc 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -318,6 +318,13 @@ Main =
     Main.thisPageIsLegit
 
   css: """
+  @font-face {
+    font-family: 'FontAwesome';
+    src: url('data:application/font-woff;base64,<%= grunt.file.read('node_modules/font-awesome/font/fontawesome-webfont.woff', {encoding: 'base64'}) %>') format('woff');
+    font-weight: normal;
+    font-style: normal;
+  }
+  <%= grunt.file.read('node_modules/font-awesome/css/font-awesome.min.css').replace(/@font-face\{[^}]+\}/, '').replace(/\\/g, '\\\\') %>
   <%= grunt.file.read('css/style.css') %>
   <%= grunt.file.read('css/yotsuba.css') %>
   <%= grunt.file.read('css/yotsuba-b.css') %>
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index cf28bef59..94c566482 100644
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -3,8 +3,7 @@ ImageExpand =
     return if g.VIEW is 'catalog' or !Conf['Image Expansion']
 
     @EAI = $.el 'a',
-      className: 'expand-all-shortcut'
-      textContent: 'EAI'
+      className: 'expand-all-shortcut icon-resize-full'
       title: 'Expand All Images'
       href: 'javascript:;'
     $.on @EAI, 'click', ImageExpand.cb.toggleAll
@@ -33,11 +32,11 @@ ImageExpand =
     toggleAll: ->
       $.event 'CloseMenu'
       if ImageExpand.on = $.hasClass ImageExpand.EAI, 'expand-all-shortcut'
-        ImageExpand.EAI.className = 'contract-all-shortcut'
+        ImageExpand.EAI.className = 'contract-all-shortcut icon-resize-small'
         ImageExpand.EAI.title     = 'Contract All Images'
         func = ImageExpand.expand
       else
-        ImageExpand.EAI.className = 'expand-all-shortcut'
+        ImageExpand.EAI.className = 'expand-all-shortcut icon-resize-full'
         ImageExpand.EAI.title     = 'Expand All Images'
         func = ImageExpand.contract
       for ID, post of g.posts
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 7f6e431b4..f00c74cfc 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -19,8 +19,7 @@ QR =
     return unless QR.postingIsEnabled
 
     sc = $.el 'a',
-      className: 'qr-shortcut'
-      textContent: 'QR'
+      className: 'qr-shortcut icon-comment-alt'
       title: 'Quick Reply'
       href: 'javascript:;'
     $.on sc, 'click', ->