diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 0ff98461..759d6a5c 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -238,15 +238,18 @@ class Application(Gtk.Application):
         self._main_data_box.bind_property("visible", builder.get_object("top_toolbar"), "visible")
         self._telnet_tool_button = builder.get_object("telnet_tool_button")
         self._top_box = builder.get_object("top_box")
+        self._toolbar_extra_tools_box = builder.get_object("toolbar_extra_tools_box")
+        self._add_bouquet_button = builder.get_object("add_bouquet_tool_button")
         # Setting custom sort function for position column.
         self._services_view.get_model().set_sort_func(Column.SRV_POS, self.position_sort_func, Column.SRV_POS)
         # App info
         self._app_info_box = builder.get_object("app_info_box")
         self._app_info_box.bind_property("visible", builder.get_object("main_paned"), "visible", 4)
-        self._app_info_box.bind_property("visible", builder.get_object("toolbar_extra_box"), "visible", 4)
+        self._app_info_box.bind_property("visible", builder.get_object("toolbar_search_box"), "visible", 4)
+        self._app_info_box.bind_property("visible", self._toolbar_extra_tools_box, "visible", 4)
         self._app_info_box.bind_property("visible", builder.get_object("toolbar_tools_box"), "visible", 4)
         self._app_info_box.bind_property("visible", builder.get_object("save_tool_button"), "visible", 4)
-        self._app_info_box.bind_property("visible", builder.get_object("add_bouquet_tool_button"), "visible", 4)
+        self._app_info_box.bind_property("visible", self._add_bouquet_button, "visible", 4)
         # Status bar
         self._profile_combo_box = builder.get_object("profile_combo_box")
         self._receiver_info_box = builder.get_object("receiver_info_box")
@@ -343,20 +346,17 @@ class Application(Gtk.Application):
 
     def init_layout(self, builder):
         """ Initializes an alternate layout, if enabled. """
-        top_toolbar = builder.get_object("top_toolbar")
-        top_toolbar.set_margin_left(0)
-        top_toolbar.set_margin_right(10)
+        control_box = builder.get_object("control_button_box")
+        control_box.set_child_packing(self._control_button, False, True, 0, Gtk.PackType.END)
 
-        extra_box = builder.get_object("toolbar_extra_tools_box")
-        extra_box.set_margin_left(10)
-        extra_box.set_margin_right(0)
-        extra_box.reorder_child(self._ftp_button, 0)
-        extra_box.reorder_child(builder.get_object("add_bouquet_tool_button"), 2)
+        extra_box = builder.get_object("toolbar_extra_box")
+        extra_box.set_child_packing(self._toolbar_extra_tools_box, False, True, 0, Gtk.PackType.END)
+        search_box = builder.get_object("toolbar_search_box")
+        search_box.reorder_child(builder.get_object("search_tool_button"), 0)
 
         self._top_box.set_child_packing(extra_box, False, True, 0, Gtk.PackType.START)
-        self._top_box.set_child_packing(top_toolbar, False, True, 0, Gtk.PackType.END)
+        self._top_box.set_child_packing(search_box, False, True, 0, Gtk.PackType.END)
         self._top_box.reorder_child(extra_box, 0)
-        self._top_box.reorder_child(top_toolbar, 1)
 
         center_box = builder.get_object("center_box")
         center_box.reorder_child(self._ftp_revealer, 0)
@@ -365,7 +365,7 @@ class Application(Gtk.Application):
 
         builder.get_object("fs_box").set_child_packing(self._filter_box, False, True, 0, Gtk.PackType.END)
         top_toolbar = builder.get_object("top_toolbar")
-        top_toolbar.set_child_packing(builder.get_object("toolbar_extra_box"), False, True, 0, Gtk.PackType.END)
+        top_toolbar.set_child_packing(builder.get_object("toolbar_search_box"), False, True, 0, Gtk.PackType.END)
 
         services_box = self._main_paned.get_child1()
         self._main_paned.remove(services_box)
@@ -387,6 +387,9 @@ class Application(Gtk.Application):
             self._fav_paned.pack1(self._bouquets_box, False, False)
             self._fav_paned.pack2(self._fav_box, False, False)
 
+        pack = Gtk.PackType.END if self._settings.bq_details_first else Gtk.PackType.START
+        self._toolbar_extra_tools_box.set_child_packing(self._add_bouquet_button, False, True, 0, pack)
+
     def do_startup(self):
         Gtk.Application.do_startup(self)
 
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 54dacee1..bf21cc78 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -1112,6 +1112,56 @@ Author: Dmitriy Yefremov
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">10</property>
+            <child>
+              <object class="GtkButtonBox" id="toolbar_search_box">
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin_left">20</property>
+                <property name="margin_right">20</property>
+                <property name="homogeneous">True</property>
+                <property name="layout_style">expand</property>
+                <child>
+                  <object class="GtkToggleButton" id="filter_tool_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Filter</property>
+                    <property name="valign">center</property>
+                    <property name="action_name">win.filter</property>
+                    <property name="image">filter_image</property>
+                    <property name="always_show_image">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleButton" id="search_tool_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Search</property>
+                    <property name="valign">center</property>
+                    <property name="action_name">win.search</property>
+                    <property name="image">find_image</property>
+                    <property name="always_show_image">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
             <child type="center">
               <object class="GtkBox" id="top_toolbar">
                 <property name="visible">True</property>
@@ -1119,6 +1169,7 @@ Author: Dmitriy Yefremov
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="margin_left">10</property>
+                <property name="margin_right">10</property>
                 <property name="margin_top">10</property>
                 <property name="margin_bottom">10</property>
                 <property name="spacing">10</property>
@@ -1239,91 +1290,6 @@ Author: Dmitriy Yefremov
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButtonBox" id="toolbar_extra_box">
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="layout_style">expand</property>
-                    <child>
-                      <object class="GtkToggleButton" id="filter_tool_button">
-                        <property name="label" translatable="yes">Filter</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Filter</property>
-                        <property name="valign">center</property>
-                        <property name="action_name">win.filter</property>
-                        <property name="image">filter_image</property>
-                        <property name="always_show_image">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToggleButton" id="search_tool_button">
-                        <property name="label" translatable="yes">Search</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Search</property>
-                        <property name="valign">center</property>
-                        <property name="action_name">win.search</property>
-                        <property name="image">find_image</property>
-                        <property name="always_show_image">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="lock_tool_button">
-                        <property name="label" translatable="yes">Lock</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Parent lock</property>
-                        <property name="valign">center</property>
-                        <property name="action_name">app.on_locked</property>
-                        <property name="image">lock_image</property>
-                        <property name="always_show_image">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="hide_tool_button">
-                        <property name="label" translatable="yes">Hide</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Hide/Skip</property>
-                        <property name="valign">center</property>
-                        <property name="action_name">app.on_hide</property>
-                        <property name="image">hide_image</property>
-                        <property name="always_show_image">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkButtonBox" id="toolbar_tools_box">
                     <property name="can_focus">False</property>
@@ -1413,7 +1379,7 @@ Author: Dmitriy Yefremov
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -1431,29 +1397,80 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkButtonBox" id="toolbar_extra_tools_box">
+              <object class="GtkBox" id="toolbar_extra_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="margin_right">10</property>
-                <property name="homogeneous">True</property>
-                <property name="layout_style">expand</property>
+                <property name="margin_left">20</property>
+                <property name="margin_right">20</property>
                 <child>
-                  <object class="GtkButton" id="add_bouquet_tool_button">
-                    <property name="width_request">32</property>
-                    <property name="sensitive">False</property>
+                  <object class="GtkButtonBox" id="toolbar_extra_tools_box">
                     <property name="can_focus">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Create bouquet</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
+                    <property name="valign">center</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_right">10</property>
+                    <property name="homogeneous">True</property>
+                    <property name="layout_style">expand</property>
                     <child>
-                      <object class="GtkImage" id="add_bouquet_image">
+                      <object class="GtkButton" id="lock_tool_button">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="icon_name">bookmark-new-symbolic</property>
-                        <property name="icon_size">1</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Parent lock</property>
+                        <property name="valign">center</property>
+                        <property name="action_name">app.on_locked</property>
+                        <property name="image">lock_image</property>
+                        <property name="always_show_image">True</property>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="hide_tool_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Hide/Skip</property>
+                        <property name="valign">center</property>
+                        <property name="action_name">app.on_hide</property>
+                        <property name="image">hide_image</property>
+                        <property name="always_show_image">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="add_bouquet_tool_button">
+                        <property name="width_request">32</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Create bouquet</property>
+                        <property name="always_show_image">True</property>
+                        <signal name="clicked" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="add_bouquet_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">bookmark-new-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">2</property>
+                        <property name="secondary">True</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -1463,20 +1480,57 @@ Author: Dmitriy Yefremov
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToggleButton" id="control_button">
-                    <property name="width_request">32</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Control</property>
-                    <property name="action_name">app.on_remote</property>
+                  <object class="GtkButtonBox" id="control_button_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="homogeneous">True</property>
+                    <property name="layout_style">expand</property>
                     <child>
-                      <object class="GtkImage" id="control_button_image">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">input-gaming-symbolic</property>
+                      <object class="GtkToggleButton" id="control_button">
+                        <property name="width_request">32</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Control</property>
+                        <property name="action_name">app.on_remote</property>
+                        <child>
+                          <object class="GtkImage" id="control_button_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">input-gaming-symbolic</property>
+                          </object>
+                        </child>
+                        <accelerator key="t" signal="clicked"/>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToggleButton" id="ftp_button">
+                        <property name="width_request">32</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="always_show_image">True</property>
+                        <child>
+                          <object class="GtkImage" id="ftp_tool_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">FTP client</property>
+                            <property name="icon_name">network-server-symbolic</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
-                    <accelerator key="t" signal="clicked" modifiers="Primary"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1484,28 +1538,6 @@ Author: Dmitriy Yefremov
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkToggleButton" id="ftp_button">
-                    <property name="width_request">32</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="always_show_image">True</property>
-                    <child>
-                      <object class="GtkImage" id="ftp_tool_image">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">FTP client</property>
-                        <property name="icon_name">network-server-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>