diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl
index 9422b2e7..9ff74070 100644
--- a/browser/main/SideNav/SideNav.styl
+++ b/browser/main/SideNav/SideNav.styl
@@ -21,11 +21,27 @@
     color $ui-text-color
     background-color alpha($ui-button--active-backgroundColor, 20%)
 
-.active-button
-  background-color $ui-button--active-color
+.switch-buttons
+  background-color transparent
+  border 1px solid $ui-borderColor
+  width 100px
+  margin 20px auto 0px auto
+  border-radius 1px
 
 .non-active-button
-  background-color $ui-button-color
+  navButtonColor()
+  font-weight 600
+  width 49px
+
+.active-button
+  @extend .non-active-button
+  background-color $ui-button--active-backgroundColor
+  color $ui-text-color
+  &:hover
+    background-color alpha($ui-button--active-backgroundColor, 70%)
+    color alpha($ui-text-color, 70%)
+  &:active, &:active:hover
+    background-color $ui-button--active-backgroundColor
 
 .top-menu-label
   margin-left 5px
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index f9253ec3..359e402a 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -145,11 +145,13 @@ class SideNav extends React.Component {
             <button styleName={isTagActive ? 'non-active-button' : 'active-button'} onClick={this.handleSwitchFoldersButtonClick.bind(this)}>Folders</button>
             <button styleName={isTagActive ? 'active-button' : 'non-active-button'} onClick={this.handleSwitchTagsButtonClick.bind(this)}>Tags</button>
           </div>
-          <button styleName='top-menu'
-            onClick={(e) => this.handleMenuButtonClick(e)}
-          >
-            <i className='fa fa-wrench fa-fw' />
-          </button>
+          <div>
+            <button styleName='top-menu'
+              onClick={(e) => this.handleMenuButtonClick(e)}
+            >
+              <i className='fa fa-wrench fa-fw' />
+            </button>
+          </div>
         </div>
         {this.SideNavComponent(isFolded, storageList)}
       </div>