diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl
index 2359cb54..a3f0ffae 100644
--- a/browser/main/SideNav/SideNav.styl
+++ b/browser/main/SideNav/SideNav.styl
@@ -26,27 +26,22 @@
 
 .switch-buttons
   background-color transparent
-  border 1px solid $ui-borderColor
-  width 110px
+  border 0
   height 25px
-  margin 20px auto 0px auto
-  border-radius 1px
+  margin 20px auto 0px 8px
 
 .non-active-button
-  navButtonColor()
-  font-weight 600
-  width 54px
-  height 23px
+  color $ui-inactive-text-color
+  font-size 16px
+  border 0
+  background-color transparent
+  transition 0.2s
+  &:hover
+    color alpha(#0B99F1, 60%)
 
 .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
+  color #0B99F1
 
 .top-menu-label
   margin-left 5px
@@ -118,25 +113,10 @@ body[data-theme="dark"]
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
 
-  .switch-buttons
-    border-color $ui-dark-borderColor
-
   .non-active-button
-    navDarkButtonColor()
-
-  .active-button
-    @extend .non-active-button
-    background-color $ui-dark-button--active-backgroundColor
-    color $ui-dark-text-color
+    color alpha($ui-dark-text-color, 60%)
     &:hover
-      background-color alpha($ui-dark-button--active-backgroundColor, 70%)
-      color alpha($ui-dark-text-color, 70%)
-    &:active
-      color $ui-dark-text-color
-      background-color alpha($ui-dark-button--active-backgroundColor, 60%)
-    &:active, &:active:hover
-      color $ui-dark-text-color
-      background-color $ui-dark-button--active-backgroundColor
+      color alpha(#0B99F1, 60%)
 
   .tag-title
     p
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index 6ac7718f..1e78c058 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -148,8 +148,8 @@ class SideNav extends React.Component {
       >
         <div styleName='top'>
           <div styleName='switch-buttons'>
-            <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>
+            <button styleName={isTagActive ? 'non-active-button' : 'active-button'} onClick={this.handleSwitchFoldersButtonClick.bind(this)}><i className='fa fa-folder fa-fw' /></button>
+            <button styleName={isTagActive ? 'active-button' : 'non-active-button'} onClick={this.handleSwitchTagsButtonClick.bind(this)}><i className='fa fa-tags fa-fw' /></button>
           </div>
           <div>
             <button styleName='top-menu'