diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java
index a43b9b2c..9cd32a16 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java
@@ -51,9 +51,9 @@ import java.util.List;
 import static org.floens.chan.utils.AndroidUtils.getString;
 
 public class BrowseController extends ThreadController implements ToolbarMenuItem.ToolbarMenuItemCallback, ThreadLayout.ThreadLayoutCallback, FloatingMenu.FloatingMenuCallback {
-    private static final int REFRESH_ID = 1;
+    private static final int SEARCH_ID = 1;
+    private static final int REFRESH_ID = 2;
     private static final int REPLY_ID = 101;
-    private static final int SEARCH_ID = 102;
     private static final int SHARE_ID = 103;
     private static final int VIEW_MODE_ID = 104;
     private static final int ORDER_ID = 105;
@@ -64,8 +64,9 @@ public class BrowseController extends ThreadController implements ToolbarMenuIte
     private List<FloatingMenuItem> boardItems;
 
     private FloatingMenuItem viewModeMenuItem;
-    private ToolbarMenuItem overflow;
+    private ToolbarMenuItem search;
     private ToolbarMenuItem refresh;
+    private ToolbarMenuItem overflow;
 
     public BrowseController(Context context) {
         super(context);
@@ -89,21 +90,21 @@ public class BrowseController extends ThreadController implements ToolbarMenuIte
         navigationItem.menu = menu;
         navigationItem.hasBack = false;
 
+        search = menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp));
         refresh = menu.addItem(new ToolbarMenuItem(context, this, REFRESH_ID, R.drawable.ic_refresh_white_24dp));
 
         overflow = menu.createOverflow(this);
 
         List<FloatingMenuItem> items = new ArrayList<>();
         if (!ChanSettings.enableReplyFab.get()) {
-            items.add(new FloatingMenuItem(REPLY_ID, context.getString(R.string.action_reply)));
+            items.add(new FloatingMenuItem(REPLY_ID, R.string.action_reply));
         }
-        items.add(new FloatingMenuItem(SEARCH_ID, context.getString(R.string.action_search)));
-        items.add(new FloatingMenuItem(SHARE_ID, context.getString(R.string.action_share)));
-        viewModeMenuItem = new FloatingMenuItem(VIEW_MODE_ID, context.getString(
-                postViewMode == PostCellInterface.PostViewMode.LIST ? R.string.action_switch_catalog : R.string.action_switch_board));
+        items.add(new FloatingMenuItem(SHARE_ID, R.string.action_share));
+        viewModeMenuItem = new FloatingMenuItem(VIEW_MODE_ID, postViewMode == PostCellInterface.PostViewMode.LIST ?
+                R.string.action_switch_catalog : R.string.action_switch_board);
         items.add(viewModeMenuItem);
-        items.add(new FloatingMenuItem(ORDER_ID, context.getString(R.string.action_order)));
-        items.add(new FloatingMenuItem(OPEN_BROWSER_ID, context.getString(R.string.action_open_browser)));
+        items.add(new FloatingMenuItem(ORDER_ID, R.string.action_order));
+        items.add(new FloatingMenuItem(OPEN_BROWSER_ID, R.string.action_open_browser));
 
         overflow.setSubMenu(new FloatingMenu(context, overflow.getView(), items));
     }
@@ -111,6 +112,9 @@ public class BrowseController extends ThreadController implements ToolbarMenuIte
     @Override
     public void onMenuItemClicked(ToolbarMenuItem item) {
         switch ((Integer) item.getId()) {
+            case SEARCH_ID:
+                ((ToolbarNavigationController) navigationController).showSearch();
+                break;
             case REFRESH_ID:
                 threadLayout.getPresenter().requestData();
                 refresh.getView().setRotation(0f);
@@ -126,9 +130,6 @@ public class BrowseController extends ThreadController implements ToolbarMenuIte
             case REPLY_ID:
                 threadLayout.openReply(true);
                 break;
-            case SEARCH_ID:
-                ((ToolbarNavigationController) navigationController).showSearch();
-                break;
             case SHARE_ID:
             case OPEN_BROWSER_ID:
                 String link = ChanUrls.getCatalogUrlDesktop(threadLayout.getPresenter().getLoadable().board);
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenu.java b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenu.java
index fb74a947..b72cd0be 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenu.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenu.java
@@ -66,8 +66,8 @@ public class ToolbarMenu extends LinearLayout {
     public ToolbarMenuItem createOverflow(ToolbarMenuItem.ToolbarMenuItemCallback callback) {
         ToolbarMenuItem overflow = addItem(new ToolbarMenuItem(getContext(), callback, 100, 100, R.drawable.ic_more_vert_white_24dp));
         ImageView overflowImage = overflow.getView();
-        overflowImage.setLayoutParams(new LinearLayout.LayoutParams(dp(36), dp(54)));
-        overflowImage.setPadding(0, 0, dp(16), 0);
+        overflowImage.setLayoutParams(new LinearLayout.LayoutParams(dp(44), dp(54)));
+        overflowImage.setPadding(dp(8), 0, dp(16), 0);
 
         return overflow;
     }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuItem.java b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuItem.java
index a85fb303..a9ff615f 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuItem.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuItem.java
@@ -55,12 +55,9 @@ public class ToolbarMenuItem implements View.OnClickListener, FloatingMenu.Float
             imageView.setOnClickListener(this);
             imageView.setFocusable(true);
             imageView.setScaleType(ImageView.ScaleType.CENTER);
-            imageView.setLayoutParams(new LinearLayout.LayoutParams(dp(56), dp(56)));
-            int p = dp(16);
-            imageView.setPadding(p, p, p, p);
+            imageView.setLayoutParams(new LinearLayout.LayoutParams(dp(50), dp(56)));
 
             imageView.setImageDrawable(drawable);
-
             setRoundItemBackground(imageView);
         }
     }