diff --git a/css/apprentice/apprentice-all-sites.css b/css/apprentice/apprentice-all-sites.css
index b202058..4602b4a 100644
--- a/css/apprentice/apprentice-all-sites.css
+++ b/css/apprentice/apprentice-all-sites.css
@@ -685,20 +685,16 @@ a.label {
 .notifications-list li {
   background-color: #262626 !important;
 }
-.octicon,
 .octicon-repo {
   color: base1 !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,0,0,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #ee82ee !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(0,176,0,0.65) !important;
 }
 .octicon-alert {
@@ -716,7 +712,6 @@ a.label {
 .octicon-clippy {
   color: #ff8700 !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/apprentice/apprentice-bigblow.css b/css/apprentice/apprentice-bigblow.css
index 806c405..7710717 100644
--- a/css/apprentice/apprentice-bigblow.css
+++ b/css/apprentice/apprentice-bigblow.css
@@ -206,8 +206,8 @@ a:hover {
   display: block;
 }
 #toTop {
-  top: -100px /* together with this to put the div at the top */;
-  position: fixed /* this is the magic */;
+  top: -100px;
+  position: fixed;
   text-align: center;
   z-index: 999;
   display: none;
diff --git a/css/apprentice/apprentice-github.css b/css/apprentice/apprentice-github.css
index 79cafcf..cc517c9 100644
--- a/css/apprentice/apprentice-github.css
+++ b/css/apprentice/apprentice-github.css
@@ -617,20 +617,16 @@ a.label {
 .notifications-list li {
   background-color: #262626 !important;
 }
-.octicon,
 .octicon-repo {
   color: base1 !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,0,0,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #ee82ee !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(0,176,0,0.65) !important;
 }
 .octicon-alert {
@@ -648,7 +644,6 @@ a.label {
 .octicon-clippy {
   color: #ff8700 !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/darculized/darculized-all-sites.css b/css/darculized/darculized-all-sites.css
index 0ed9d31..e86d722 100644
--- a/css/darculized/darculized-all-sites.css
+++ b/css/darculized/darculized-all-sites.css
@@ -685,20 +685,16 @@ a.label {
 .notifications-list li {
   background-color: #262626 !important;
 }
-.octicon,
 .octicon-repo {
   color: #a6aaab !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,66,56,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #797fd4 !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(116,180,92,0.65) !important;
 }
 .octicon-alert {
@@ -716,7 +712,6 @@ a.label {
 .octicon-clippy {
   color: #a6aaab !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/darculized/darculized-bigblow.css b/css/darculized/darculized-bigblow.css
index 16cad2a..6fc0bed 100644
--- a/css/darculized/darculized-bigblow.css
+++ b/css/darculized/darculized-bigblow.css
@@ -206,8 +206,8 @@ a:hover {
   display: block;
 }
 #toTop {
-  top: -100px /* together with this to put the div at the top */;
-  position: fixed /* this is the magic */;
+  top: -100px;
+  position: fixed;
   text-align: center;
   z-index: 999;
   display: none;
diff --git a/css/darculized/darculized-github.css b/css/darculized/darculized-github.css
index e28fa9c..479ebb5 100644
--- a/css/darculized/darculized-github.css
+++ b/css/darculized/darculized-github.css
@@ -617,20 +617,16 @@ a.label {
 .notifications-list li {
   background-color: #262626 !important;
 }
-.octicon,
 .octicon-repo {
   color: #a6aaab !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,66,56,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #797fd4 !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(116,180,92,0.65) !important;
 }
 .octicon-alert {
@@ -648,7 +644,6 @@ a.label {
 .octicon-clippy {
   color: #a6aaab !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/gruvbox/gruvbox-all-sites.css b/css/gruvbox/gruvbox-all-sites.css
index 6aa9b7d..bdfe569 100644
--- a/css/gruvbox/gruvbox-all-sites.css
+++ b/css/gruvbox/gruvbox-all-sites.css
@@ -685,20 +685,16 @@ a.label {
 .notifications-list li {
   background-color: #282828 !important;
 }
-.octicon,
 .octicon-repo {
   color: #8ec07c !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,34,23,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #d3869b !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(212,211,18,0.65) !important;
 }
 .octicon-alert {
@@ -716,7 +712,6 @@ a.label {
 .octicon-clippy {
   color: #8ec07c !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/gruvbox/gruvbox-bigblow.css b/css/gruvbox/gruvbox-bigblow.css
index 5ed306e..f8e5122 100644
--- a/css/gruvbox/gruvbox-bigblow.css
+++ b/css/gruvbox/gruvbox-bigblow.css
@@ -206,8 +206,8 @@ a:hover {
   display: block;
 }
 #toTop {
-  top: -100px /* together with this to put the div at the top */;
-  position: fixed /* this is the magic */;
+  top: -100px;
+  position: fixed;
   text-align: center;
   z-index: 999;
   display: none;
diff --git a/css/gruvbox/gruvbox-github.css b/css/gruvbox/gruvbox-github.css
index 52d255a..caa9f0c 100644
--- a/css/gruvbox/gruvbox-github.css
+++ b/css/gruvbox/gruvbox-github.css
@@ -617,20 +617,16 @@ a.label {
 .notifications-list li {
   background-color: #282828 !important;
 }
-.octicon,
 .octicon-repo {
   color: #8ec07c !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,34,23,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #d3869b !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(212,211,18,0.65) !important;
 }
 .octicon-alert {
@@ -648,7 +644,6 @@ a.label {
 .octicon-clippy {
   color: #8ec07c !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/solarized-dark/solarized-dark-all-sites.css b/css/solarized-dark/solarized-dark-all-sites.css
index 371c58d..5f3a8a3 100644
--- a/css/solarized-dark/solarized-dark-all-sites.css
+++ b/css/solarized-dark/solarized-dark-all-sites.css
@@ -685,20 +685,16 @@ a.label {
 .notifications-list li {
   background-color: #002b36 !important;
 }
-.octicon,
 .octicon-repo {
   color: #93a1a1 !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,54,43,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #6c71c4 !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(205,212,0,0.65) !important;
 }
 .octicon-alert {
@@ -716,7 +712,6 @@ a.label {
 .octicon-clippy {
   color: #93a1a1 !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/solarized-dark/solarized-dark-bigblow.css b/css/solarized-dark/solarized-dark-bigblow.css
index 94f04e7..04b6bd6 100644
--- a/css/solarized-dark/solarized-dark-bigblow.css
+++ b/css/solarized-dark/solarized-dark-bigblow.css
@@ -206,8 +206,8 @@ a:hover {
   display: block;
 }
 #toTop {
-  top: -100px /* together with this to put the div at the top */;
-  position: fixed /* this is the magic */;
+  top: -100px;
+  position: fixed;
   text-align: center;
   z-index: 999;
   display: none;
diff --git a/css/solarized-dark/solarized-dark-github.css b/css/solarized-dark/solarized-dark-github.css
index 3d13f92..6bbe260 100644
--- a/css/solarized-dark/solarized-dark-github.css
+++ b/css/solarized-dark/solarized-dark-github.css
@@ -617,20 +617,16 @@ a.label {
 .notifications-list li {
   background-color: #002b36 !important;
 }
-.octicon,
 .octicon-repo {
   color: #93a1a1 !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(255,54,43,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #6c71c4 !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(205,212,0,0.65) !important;
 }
 .octicon-alert {
@@ -648,7 +644,6 @@ a.label {
 .octicon-clippy {
   color: #93a1a1 !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/solarized-light/solarized-light-all-sites.css b/css/solarized-light/solarized-light-all-sites.css
index 7aabc47..f55e42f 100644
--- a/css/solarized-light/solarized-light-all-sites.css
+++ b/css/solarized-light/solarized-light-all-sites.css
@@ -685,20 +685,16 @@ a.label {
 .notifications-list li {
   background-color: #fdf6e3 !important;
 }
-.octicon,
 .octicon-repo {
   color: #93a1a1 !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(202,0,0,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #6c71c4 !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(68,103,0,0.65) !important;
 }
 .octicon-alert {
@@ -716,7 +712,6 @@ a.label {
 .octicon-clippy {
   color: #586e75 !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/css/solarized-light/solarized-light-bigblow.css b/css/solarized-light/solarized-light-bigblow.css
index 3f1d36b..9dd0c85 100644
--- a/css/solarized-light/solarized-light-bigblow.css
+++ b/css/solarized-light/solarized-light-bigblow.css
@@ -206,8 +206,8 @@ a:hover {
   display: block;
 }
 #toTop {
-  top: -100px /* together with this to put the div at the top */;
-  position: fixed /* this is the magic */;
+  top: -100px;
+  position: fixed;
   text-align: center;
   z-index: 999;
   display: none;
diff --git a/css/solarized-light/solarized-light-github.css b/css/solarized-light/solarized-light-github.css
index ee871f2..48cfcc5 100644
--- a/css/solarized-light/solarized-light-github.css
+++ b/css/solarized-light/solarized-light-github.css
@@ -617,20 +617,16 @@ a.label {
 .notifications-list li {
   background-color: #fdf6e3 !important;
 }
-.octicon,
 .octicon-repo {
   color: #93a1a1 !important;
 }
-.octicon.type-icon-state-closed,
-.octicon-repo.type-icon-state-closed {
+.type-icon-state-closed {
   color: rgba(202,0,0,0.65) !important;
 }
-.octicon.type-icon-state-merged,
-.octicon-repo.type-icon-state-merged {
+.type-icon-state-merged {
   color: #6c71c4 !important;
 }
-.octicon.type-icon-state-open,
-.octicon-repo.type-icon-state-open {
+.type-icon-state-open {
   color: rgba(68,103,0,0.65) !important;
 }
 .octicon-alert {
@@ -648,7 +644,6 @@ a.label {
 .octicon-clippy {
   color: #586e75 !important;
 }
-.octicon-git-pull-request,
 .octicon-diff {
   color: #fff !important;
 }
diff --git a/sites/github.styl b/sites/github.styl
index da5f849..a165de4 100644
--- a/sites/github.styl
+++ b/sites/github.styl
@@ -632,18 +632,17 @@ a.label
 
 // ** octicon
 
-.octicon
 .octicon-repo
     color base1
 
-    &.type-icon-state-closed
-        color transparentify(red, color-background, 0.65)
+.type-icon-state-closed
+    color transparentify(red, color-background, 0.65)
 
-    &.type-icon-state-merged
-        color violet
+.type-icon-state-merged
+    color violet
 
-    &.type-icon-state-open
-        color transparentify(green, color-background, 0.65)
+.type-icon-state-open
+    color transparentify(green, color-background, 0.65)
 
 .octicon-alert
     color white
@@ -657,7 +656,7 @@ a.label
 .octicon-clippy
     color emphasized
 
-.octicon-git-pull-request, .octicon-diff
+.octicon-diff
     color white i
 
 .octicon-markdown