diff --git a/skins/elastic/styles/colors.less b/skins/elastic/styles/colors.less
index 8219f6d39..8b1d62dd0 100644
--- a/skins/elastic/styles/colors.less
+++ b/skins/elastic/styles/colors.less
@@ -60,7 +60,7 @@
 
 // Toolbar
 @color-toolbar-button:                  @color-font;
-@color-toolbar-button-background-hover: tint(@color-main, 96%);
+@color-toolbar-button-background-hover: darken(@color-layout-header-background, 3%);
 
 @color-searchbar-icon-active:           green;
 @color-searchbar-background:            #fbfbfb;
@@ -87,11 +87,10 @@
 @color-list-recent-badge:           #fff;
 @color-list-recent-badge-background: @color-list-recent;
 
-//@color-list-pagenav:                @color-black-shade-text;
+@color-list-pagenav:                @color-black-shade-text;
 @color-list-icon:                   fadeout(@color-list-secondary, 25%);
 
 
-
 // Drag-n-drop layer
 @color-drag-layer:                  #fff;
 @color-drag-layer-background:       @color-taskmenu-background;
diff --git a/skins/elastic/styles/widgets/common.less b/skins/elastic/styles/widgets/common.less
index 043ec9d1a..8e20d69a5 100644
--- a/skins/elastic/styles/widgets/common.less
+++ b/skins/elastic/styles/widgets/common.less
@@ -276,6 +276,7 @@ fieldset.image-attachment {
     padding: .5rem 1rem;
     display: flex;
     align-items: center;
+    color: @color-quota-text;
 
     &:before {
         &:extend(.font-icon-class);
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index e8b5924bf..73a02b582 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -248,6 +248,7 @@
 
         .pagenav-text {
             .overflow-ellipsis;
+            color: @color-list-pagenav;
             flex-grow: 4;
             font-size: 80%;
             white-space: nowrap;
@@ -768,9 +769,9 @@ a.button.icon.toolbar-button {
     display: flex;
     align-items: center;
     white-space: nowrap;
-    padding: 0 .5rem;
     overflow: hidden;
     position: relative;
+    padding-right: .5rem;
 
     form {
         flex: 1;
@@ -780,7 +781,8 @@ a.button.icon.toolbar-button {
             &:extend(.font-icon-class);
             content: @fa-var-search;
             height: @layout-searchbar-height;
-            color: @color-toolbar-button;
+            color: @color-list-pagenav;
+            margin: 0 0 0 .75rem;
         }
     }
 
@@ -802,8 +804,9 @@ a.button.icon.toolbar-button {
 
         &.options {
             &:before {
-                content: @fa-var-filter;
-                font-size: 1em;
+                content: @fa-var-angle-down;
+                line-height: 1.25;
+                width: 1em;
             }
         }
 
@@ -833,8 +836,6 @@ a.button.icon.toolbar-button {
 
     &.open a.button.options:before {
         content: @fa-var-angle-up;
-        font-size: 1.25em;
-        line-height: 1.25;
     }
 }