diff --git a/app/ui/app_menu.ui b/app/ui/app_menu.ui
index 1d1e44e0..357b29d7 100644
--- a/app/ui/app_menu.ui
+++ b/app/ui/app_menu.ui
@@ -134,7 +134,7 @@
         </item>
       </section>
     </submenu>
-    <submenu>
+    <submenu id="tools_menu">
       <attribute name="label" translatable="yes">Tools</attribute>
       <attribute name="action">app.hide_menu_bar</attribute>
       <attribute name="hidden-when">action-disabled</attribute>
diff --git a/app/ui/main.py b/app/ui/main.py
index a4f3e417..48c58257 100644
--- a/app/ui/main.py
+++ b/app/ui/main.py
@@ -437,10 +437,19 @@ class Application(Gtk.Application):
             else:
                 self.set_menubar(builder.get_object("menu_bar"))
         else:
+            tools_menu = builder.get_object("tools_menu")
+            tools_button = Gtk.MenuButton(visible=True, menu_model=tools_menu, direction=Gtk.ArrowType.NONE)
+            tools_button.set_tooltip_text(get_message("Tools"))
+            tools_button.set_image(Gtk.Image.new_from_icon_name("applications-utilities-symbolic", Gtk.IconSize.BUTTON))
+
             view_menu = builder.get_object("view_menu")
             view_button = Gtk.MenuButton(visible=True, menu_model=view_menu, direction=Gtk.ArrowType.NONE)
             view_button.set_tooltip_text(get_message("View"))
-            self._main_window.get_titlebar().pack_end(view_button)
+
+            box = Gtk.ButtonBox(visible=True, layout_style="expand")
+            box.add(tools_button)
+            box.add(view_button)
+            self._main_window.get_titlebar().pack_end(box)
         # IPTV menu.
         self._iptv_menu_button.set_menu_model(builder.get_object("iptv_menu"))
         iptv_elem = self._tool_elements.get("fav_iptv_popup_item")
diff --git a/app/ui/style.css b/app/ui/style.css
index 4b7f0ca7..e4e8d779 100644
--- a/app/ui/style.css
+++ b/app/ui/style.css
@@ -61,12 +61,13 @@ paned > separator {
 }
 
 .stack-switcher > button > label {
-  padding-left: 2px;
-  padding-right: 2px;
-  min-width: 75px;
+  padding-left: 5px;
+  padding-right: 5px;
+  min-width: 50px;
 }
 
 .stack-switcher > button.text-button {
-  padding-left: 2px;
-  padding-right: 2px;
+  padding-left: 5px;
+  padding-right: 5px;
+  min-width: 50px;
 }