diff --git a/browser/components/NoteItem.styl b/browser/components/NoteItem.styl
index e465d2b4..b4bbed23 100644
--- a/browser/components/NoteItem.styl
+++ b/browser/components/NoteItem.styl
@@ -135,18 +135,14 @@ body[data-theme="dark"]
     .item-wrapper
       border-color transparent
     .item-title
-      color white
+      color $ui-dark-text-color
     .item-title-icon
-      color white
+      color $ui-dark-text-color
     .item-bottom-time
-      color white
+      color $ui-dark-text-color
     .item-bottom-tagList-item
       background-color transparent
-      color white
-    .item-bottom-tagList-empty
-      color white
-    &:hover
-      background-color $ui-dark-button--active-backgroundColor
+      color $ui-dark-text-color
 
   .item-title
     color $ui-inactive-text-color
diff --git a/browser/components/SideNavFilter.styl b/browser/components/SideNavFilter.styl
index 28a37c8d..50417002 100644
--- a/browser/components/SideNavFilter.styl
+++ b/browser/components/SideNavFilter.styl
@@ -55,14 +55,15 @@
 
 body[data-theme="dark"]
   .menu-button
-    navDarkButtonColor()
     &:active
       background-color $ui-dark-button--active-backgroundColor
+      color $ui-dark-text-color
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
-      color $ui-button--active-color
+      color $ui-dark-text-color
   .menu-button--active
-    color $ui-dark-button--active-color
+    color $ui-dark-text-color
     background-color $ui-dark-button--active-backgroundColor
     &:active
       background-color $ui-dark-button--active-backgroundColor
+      color $ui-dark-text-color
\ No newline at end of file
diff --git a/browser/components/SnippetTab.styl b/browser/components/SnippetTab.styl
index 2bec7ead..8d4d1b04 100644
--- a/browser/components/SnippetTab.styl
+++ b/browser/components/SnippetTab.styl
@@ -60,7 +60,7 @@ body[data-theme="dark"]
         &:hover
           background-color darken($ui-dark-button--hover-backgroundColor, 15%)
         &:active
-          color white
+          color $ui-dark-text-color
           background-color $ui-dark-button--active-backgroundColor
 
   .root--active
@@ -73,7 +73,7 @@ body[data-theme="dark"]
         &:hover
           background-color darken($ui-dark-button--hover-backgroundColor, 15%)
         &:active
-          color white
+          color $ui-dark-text-color
           background-color $ui-dark-button--active-backgroundColor
 
   .button
@@ -83,9 +83,9 @@ body[data-theme="dark"]
     transition color background-color 0.15s
     border-left 4px solid transparent
     &:hover
-      color white
+      color $ui-dark-text-color
       background-color $ui-dark-button--hover-backgroundColor
 
   .input
     background-color $ui-dark-button--hover-backgroundColor
-    color white
+    color $ui-dark-text-color
diff --git a/browser/components/StorageItem.styl b/browser/components/StorageItem.styl
index 1da4e7de..24b58d64 100644
--- a/browser/components/StorageItem.styl
+++ b/browser/components/StorageItem.styl
@@ -75,17 +75,17 @@ body[data-theme="dark"]
   .folderList-item
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
-      color $ui-button--active-color
+      color $ui-dark-text-color
     &:active
-      color $ui-button--active-color
+      color $ui-dark-text-color
       background-color $ui-dark-button--active-backgroundColor
 
   .folderList-item--active
     @extend .folderList-item
-    color $ui-button--active-color
+    color $ui-dark-text-color
     background-color $ui-dark-button--active-backgroundColor
     &:active
       background-color $ui-dark-button--active-backgroundColor
     &:hover
-      color $ui-button--active-color
+      color $ui-dark-text-color
       background-color $ui-dark-button--active-backgroundColor
diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl
index 25ef0834..ccc72821 100644
--- a/browser/main/Detail/SnippetNoteDetail.styl
+++ b/browser/main/Detail/SnippetNoteDetail.styl
@@ -84,7 +84,7 @@ body[data-theme="dark"]
 
   .body .description textarea
     background-color $ui-dark-noteDetail-backgroundColor
-    color white
+    color $ui-dark-text-color
 
   .tabList
     background-color $ui-button--active-backgroundColor
diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl
index 6b0bfbd3..27706c4b 100644
--- a/browser/main/SideNav/SideNav.styl
+++ b/browser/main/SideNav/SideNav.styl
@@ -117,10 +117,9 @@ body[data-theme="dark"]
   .top-menu
     navDarkButtonColor()
     &:active
-      background-color $ui-dark-button--active-backgroundColor
+      background-color alpha($ui-dark-button--active-backgroundColor, 20%)
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
-      color $ui-button--active-color
 
   .storageList-empty
     color $ui-dark-inactive-text-color
diff --git a/browser/main/SideNav/StorageItem.styl b/browser/main/SideNav/StorageItem.styl
index 12c71d1b..1ccae8ed 100644
--- a/browser/main/SideNav/StorageItem.styl
+++ b/browser/main/SideNav/StorageItem.styl
@@ -53,7 +53,7 @@
   padding-right 10px
   line-height 26px
   cursor pointer
-  font-size 14px
+  font-size 13px
   border none
   overflow ellipsis
   text-align left
@@ -109,21 +109,36 @@
     margin 0 5px
 
 body[data-theme="dark"]
-  .header
+.header
+  &:hover
+    color $ui-dark-text-color
+    background-color alpha($ui-dark-button--active-backgroundColor, 20%)
+  &:active
+    .header-toggleButton
+    .header-addFolderButton
+      &:active
+        color $ui-dark-text-color
+
+.header-info
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
-      color $ui-button--active-color
+      color $ui-dark-text-color
     &:active
-      color $ui-button--active-color
-      background-color $ui-dark-button--active-backgroundColor
+      .header-toggleButton
+      .header-addFolderButton
+        &:active
+          color $ui-dark-text-color
 
-  .header--active
-    @extend .header
-    .header-info
-      color $ui-button--active-color
-      background-color $ui-dark-button--active-backgroundColor
+.header--active
+  @extend .header
+  .header-info
+    color $ui-dark-text-color
+    background-color $ui-dark-button--active-backgroundColor
+  .header-toggleButton
+  .header-addFolderButton
+    color $ui-dark-text-color
     &:active
-      background-color $ui-dark-button--active-backgroundColor
-    &:hover
-      color $ui-button--active-color
-      background-color $ui-dark-button--active-backgroundColor
+      .header-toggleButton
+      .header-addFolderButton
+        &:active
+          color $ui-dark-text-color
diff --git a/browser/styles/index.styl b/browser/styles/index.styl
index 57b398ee..da62c942 100644
--- a/browser/styles/index.styl
+++ b/browser/styles/index.styl
@@ -217,12 +217,11 @@ navDarkButtonColor()
   background-color transparent
   transition color background-color 0.15s
   &:hover
-    color white
+    color $ui-dark-text-color
     background-color $ui-dark-button--hover-backgroundColor
   &:active
   &:active:hover
-    background-color $ui-dark-button--active-backgroundColor
-    color $ui-dark-button--active-color
+    color $ui-dark-text-color
 
 topBarButtonDark()
   border-color $ui-dark-borderColor