diff --git a/css/glowingbear.css b/css/glowingbear.css
index 4bd1bf0..68b134f 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -81,10 +81,6 @@ input[type=text], input[type=password], #sendMessage, .badge {
 .glyphicon {
     top: 0; /* Fixes alignment issue in top bar */
 }
-.glyphicon-off {
-    top: 1px; /* Fixes for relative glyphicon size */
-    font-size: 28px;
-}
 #topbar {
     position: fixed;
     width: 100%;
@@ -97,7 +93,10 @@ input[type=text], input[type=password], #sendMessage, .badge {
 #topbar .brand {
     float: left;
     height: 35px;
-    padding-left: 5px;
+}
+#topbar .brand a {
+    display: block;
+    padding: 0 10px;
 }
 #topbar .brand img {
     height: 32px;
@@ -119,16 +118,19 @@ input[type=text], input[type=password], #sendMessage, .badge {
     padding-left: 5px;
     margin-right: 0;
     padding-right: 5px;
-    padding-top: 2px;
     height: 35px;
     line-height: 35px;
-    font-size: 30px;
+    font-size: 16px;
     position: fixed;
     right: 0;
 }
-
 #topbar .actions > * {
-    padding-left: 5px;
+    padding: 0 5px;
+    display: inline-block;
+}
+#topbar .actions .glyphicon {
+    line-height: 35px;
+    top: 0;
 }
 #topbar .dropdown-menu form {
     padding-left: 6px;
@@ -632,11 +634,12 @@ img.emojione {
         left: 40px;
     }
 
+    #topbar .brand img {
+        height: 20px;
+    }
+
     #topbar .actions {
-        line-height: 35px;
-        height: 35px;
-        font-size: 31px;
-        margin-right: 0;
+        font-size: 16px;
     }
 
     #bufferlines, #nicklist {
diff --git a/index.html b/index.html
index 996975e..e91401f 100644
--- a/index.html
+++ b/index.html
@@ -226,11 +226,9 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
           <span ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_blank' | DOMfilter:'irclinky')"></span>
         </div>
         <div class="actions pull-right vertical-line-left">
-          <div class="pull-left">
-            <a class="settings-toggle" ng-click="showModal('settingsModal')" title="Options menu">
-              <i class="glyphicon glyphicon-cog"></i>
-            </a>
-          </div>
+          <a class="settings-toggle" ng-click="showModal('settingsModal')" title="Options menu">
+            <i class="glyphicon glyphicon-cog"></i>
+          </a>
           <a ng-click="disconnect()" title="Disconnect from WeeChat">
             <i class="glyphicon glyphicon-off"></i>
           </a>