Rebase to hopefully fix Travis errors.

h/static/scripts/annotator/plugin/toolbar.coffee

@@ -29,7 +29,7 @@ class Annotator.Plugin.Toolbar extends Annotator.Plugin
 
     items = [
       "title": "Toggle Sidebar"
-      "class": "annotator-toolbar-toggle h-icon-forum"
+      "class": "annotator-toolbar-toggle h-icon-arrow-back"
       "on":
         "click": (event) =>
           event.preventDefault()
@@ -59,7 +59,7 @@ class Annotator.Plugin.Toolbar extends Annotator.Plugin
     #       @annotator.onHighlighterClick()
     # ,
       "title": "New Comment"
-      "class": "h-icon-add"
+      "class": "h-icon-mode-comment"
       "on":
         "click": (event) =>
           event.preventDefault()

h/static/scripts/guest.coffee

@@ -36,7 +36,7 @@ module.exports = class Annotator.Guest extends Annotator
   visibleHighlights: false
 
   html: jQuery.extend {}, Annotator::html,
-    adder: '<div class="adder-group"><span class="annotator-adder"><button class="h-icon-plus"></button></span><span class="annotator-highlighter"><button class="h-icon-highlighter"></button></span>'
+    adder: '<div class="adder-group"><span class="annotator-adder"><button class="h-icon-mode-comment"></button></span><span class="annotator-highlighter"><button class="h-icon-border-color"></button></span>'
 
   constructor: (element, options, config = {}) ->
     options.noScan = true

h/static/styles/inject.scss

@@ -17,7 +17,7 @@ $base-font-size: 14px;
   margin-top: -50px;
   padding: 0;
   position: absolute;
-  border: 4px solid $border;
+  border: 3px solid $border;
   border-radius: 4px;
   z-index: 999;
 
@@ -113,8 +113,17 @@ $base-font-size: 14px;
   z-index: 2147483638;
   -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
 
+  .h-icon-arrow-back {
+    transform: rotate(180deg);
+    font-weight: 600;
+  }
+
   &.annotator-collapsed {
     margin-left: 0;
+
+    .h-icon-arrow-back {
+      transform: rotate(0deg);
+    }
   }
 
   * {
@@ -233,7 +242,7 @@ $base-font-size: 14px;
 
   a:active {
     @include single-transition(background-color, .25s);
-    background-color: $gray-lighter;
+    background-color: $gray-light;
   }
 
   a:focus, a:hover {