diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
index 2858aec5066..8e71f22d03d 100644
--- a/js/components/navigationBar.js
+++ b/js/components/navigationBar.js
@@ -167,7 +167,7 @@ class NavigationBar extends ImmutableComponent {
               })}
               onClick={this.onNoScript} />
           }
-          <Button iconClass={this.titleMode ? 'fa-star' : 'fa-star-o'}
+          <Button iconClass={this.bookmarked ? 'fa-star' : 'fa-star-o'}
             className={cx({
               navbutton: true,
               bookmarkButton: true,
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 5da68b4d373..954e66a4029 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -225,7 +225,6 @@
       animation: fadeIn .6s;
       opacity: 0;
       animation-fill-mode: forwards;
-      width: 20px;
     }
   }
 
@@ -248,15 +247,7 @@
     }
 
     .endButtons {
-      position: absolute;
-      top: -2px;
-      right: 0;
-
-      .browserButton {
-        font-size: 10px;
-        width: 20px;
-        opacity: 0.6;
-      }
+      display: none;
     }
 
     .urlbarIcon {