diff --git a/resources/manager_window.ui b/resources/manager_window.ui
index 968b433..edb4c52 100644
--- a/resources/manager_window.ui
+++ b/resources/manager_window.ui
@@ -5,6 +5,15 @@
   <object class="GtkMenu" id="main_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="refresh_item">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Refresh databases</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_refresh_item_activate" swapped="no"/>
+      </object>
+    </child>
     <child>
       <object class="GtkMenuItem" id="history_item">
         <property name="visible">True</property>
@@ -64,26 +73,14 @@
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkButton" id="refresh_button">
+                  <object class="GtkStackSwitcher" id="filters_stackswitcher">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Refresh databases</property>
-                    <signal name="clicked" handler="on_refresh_button_clicked" swapped="no"/>
-                    <child>
-                      <object class="GtkImage" id="refresh_icon">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">view-refresh-symbolic</property>
-                        <property name="icon_size">1</property>
-                      </object>
-                    </child>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="stack">filters_stack</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
@@ -120,18 +117,6 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkStackSwitcher" id="filters_stackswitcher">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="stack">filters_stack</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
@@ -155,6 +140,7 @@
                             <property name="receives_default">True</property>
                             <property name="caps_lock_warning">False</property>
                             <property name="primary_icon_name">edit-find-symbolic</property>
+                            <property name="placeholder_text" translatable="yes">Search</property>
                             <signal name="activate" handler="on_search_entry_activate" swapped="no"/>
                             <signal name="changed" handler="on_search_entry_changed" swapped="no"/>
                           </object>
@@ -242,9 +228,6 @@
                             <property name="position">2</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                       <packing>
                         <property name="name">search</property>
diff --git a/src/manager_window.vala b/src/manager_window.vala
index a1382c6..00cac22 100644
--- a/src/manager_window.vala
+++ b/src/manager_window.vala
@@ -1496,7 +1496,7 @@ namespace Pamac {
 		}
 
 		[GtkCallback]
-		void on_refresh_button_clicked () {
+		void on_refresh_item_activate () {
 			this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
 			refreshing = true;
 			transaction.start_refresh (false);