diff --git a/internal_packages/category-picker/lib/category-picker-popover.jsx b/internal_packages/category-picker/lib/category-picker-popover.jsx
index 4ccec5418..1e26d0975 100644
--- a/internal_packages/category-picker/lib/category-picker-popover.jsx
+++ b/internal_packages/category-picker/lib/category-picker-popover.jsx
@@ -173,7 +173,6 @@ export default class CategoryPickerPopover extends Component {
     const {account, threads} = this.props
 
     if (threads.length === 0) return;
-    this.refs.menu.setSelectedItem(null)
 
     if (item.newCategoryItem) {
       const category = new Category({
diff --git a/internal_packages/composer-signature/styles/composer-signature.less b/internal_packages/composer-signature/styles/composer-signature.less
index 172b4b4b1..9d079c45c 100644
--- a/internal_packages/composer-signature/styles/composer-signature.less
+++ b/internal_packages/composer-signature/styles/composer-signature.less
@@ -113,9 +113,11 @@
               .item.checked {
                 background-image: url(images/menu/osx-checkmark@2x.svg);
                 background-position: left;
-                background-position-x: 5%;
+                background-position-x: 6%;
                 background-size: 10px;
-                padding-right: 0;
+                margin: 0;
+                padding: 5px 10px 5px 25px;
+                background-repeat: no-repeat;
               }
             }
           }
@@ -178,6 +180,7 @@
                 background-position: left;
                 background-position-x: 5%;
                 background-size: 10px;
+                background-repeat: no-repeat;
               }
 
             }
diff --git a/internal_packages/ui-taiga/styles/controls.less b/internal_packages/ui-taiga/styles/controls.less
index 38ba640b3..123fc4eb0 100644
--- a/internal_packages/ui-taiga/styles/controls.less
+++ b/internal_packages/ui-taiga/styles/controls.less
@@ -67,8 +67,9 @@ body.platform-win32 {
   .secondary-items {
     .item  {
       color: @taiga-light !important;
-      background: @white !important;
-
+      .search-match {
+        background: @white !important;
+      }
       .button-dropdown {
         img {
           background: @taiga-light  !important;
@@ -92,22 +93,12 @@ body.platform-win32 {
   border: none !important;
 }
 
-/**
- * Search bar
- */
-.content-container {
-  .item.selected {
-    background: @taiga-light !important;
-    color: @white !important;
-  }
-}
 
 /**
  * Dropdown
  */
 .menu {
   .item.selected {
-    background: @taiga-light !important;
     .primary {
       color: @white !important;
     }
@@ -115,6 +106,15 @@ body.platform-win32 {
       color: @taiga-lighter !important;
     }
   }
+  &.search-container {
+    .item {
+      background: @white !important;
+    }
+    .item.selected {
+      background: @taiga-light !important;
+      color: @white !important;
+    }
+  }
 }
 
 /**
diff --git a/src/components/menu.cjsx b/src/components/menu.cjsx
index ba70caf1f..52063e459 100644
--- a/src/components/menu.cjsx
+++ b/src/components/menu.cjsx
@@ -166,11 +166,6 @@ class Menu extends React.Component
   getSelectedItem: =>
     @props.items[@state.selectedIndex]
 
-  # Public: Set the currently selected item. Pass
-  # null to remove the selection
-  #
-  setSelectedItem: (item) =>
-    @setState selectedIndex: @props.items.indexOf(item)
 
   componentWillReceiveProps: (newProps) =>
     # Attempt to preserve selection across props.items changes by
@@ -242,7 +237,6 @@ class Menu extends React.Component
 
   _itemComponentForItem: (item, i) =>
     content = @props.itemContent(item)
-
     if React.isValidElement(content) and content.type is MenuItem
       return content