diff --git a/app/ui/xml/dialogs.py b/app/ui/xml/dialogs.py
index ddb46260..eb4129e6 100644
--- a/app/ui/xml/dialogs.py
+++ b/app/ui/xml/dialogs.py
@@ -401,8 +401,6 @@ class UpdateDialog:
                     "on_satellite_changed": self.on_satellite_changed,
                     "on_transponder_toggled": self.on_transponder_toggled,
                     "on_info_bar_close": self.on_info_bar_close,
-                    "on_filter_toggled": self.on_filter_toggled,
-                    "on_find_toggled": self.on_find_toggled,
                     "on_popup_menu": on_popup_menu,
                     "on_select_all": self.on_select_all,
                     "on_unselect_all": self.on_unselect_all,
@@ -441,7 +439,7 @@ class UpdateDialog:
         self._left_action_box = builder.get_object("sat_update_left_action_box")
         self._right_action_box = builder.get_object("sat_update_right_action_box")
         # Filter
-        self._filter_bar = builder.get_object("sat_update_filter_bar")
+        self._filter_bar_box = builder.get_object("filter_bar_box")
         self._from_pos_button = builder.get_object("from_pos_button")
         self._to_pos_button = builder.get_object("to_pos_button")
         self._filter_from_combo_box = builder.get_object("filter_from_combo_box")
@@ -449,18 +447,16 @@ class UpdateDialog:
         self._filter_model = builder.get_object("update_sat_list_model_filter")
         self._filter_model.set_visible_func(self.filter_function)
         self._filter_positions = (0, 0)
-        self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
         # Log.
         self._log_frame = builder.get_object("log_frame")
         builder.get_object("log_info_bar").connect("response", lambda b, r: self._log_frame.set_visible(False))
         # Search.
-        self._search_bar = builder.get_object("sat_update_search_bar")
-        self._search_bar.bind_property("search-mode-enabled", self._search_bar, "visible")
+        self._search_bar_box = builder.get_object("search_bar_box")
         search_provider = SearchProvider(self._sat_view,
                                          builder.get_object("sat_update_search_entry"),
                                          builder.get_object("sat_update_search_down_button"),
                                          builder.get_object("sat_update_search_up_button"))
-        builder.get_object("sat_update_find_button").connect("toggled", search_provider.on_search_toggled)
+        builder.get_object("search_button").connect("toggled", search_provider.on_search_toggled)
         # Satellite lists init on dialog start.
         self._sat_view.connect("realize", self.on_update_satellites_list)
         # Options.
@@ -599,10 +595,10 @@ class UpdateDialog:
         self._sat_update_info_bar.set_visible(False)
 
     def on_find_toggled(self, button: Gtk.ToggleToolButton):
-        self._search_bar.set_search_mode(button.get_active())
+        self._search_bar_box.set_visible(button.get_active())
 
     def on_filter_toggled(self, button: Gtk.ToggleToolButton):
-        self._filter_bar.set_search_mode(button.get_active())
+        self._filter_bar_box.set_visible(button.get_active())
 
     @run_idle
     def on_filter(self, item):
diff --git a/app/ui/xml/update.glade b/app/ui/xml/update.glade
index 5b9e5e8c..9b7281f9 100644
--- a/app/ui/xml/update.glade
+++ b/app/ui/xml/update.glade
@@ -41,8 +41,8 @@ Author: Dmitriy Yefremov
         <property name="can-focus">False</property>
         <property name="margin-start">10</property>
         <property name="margin-end">10</property>
-        <property name="margin-top">5</property>
-        <property name="margin-bottom">5</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
@@ -176,24 +176,6 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="sat_receive_image">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">network-receive-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="sat_update_cancel_image">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">window-close-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="sat_update_image">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">emblem-synchronizing-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkListStore" id="side_store">
     <columns>
       <!-- column-name side -->
@@ -306,14 +288,20 @@ Author: Dmitriy Yefremov
                     <property name="layout-style">expand</property>
                     <child>
                       <object class="GtkButton" id="sat_update_button">
-                        <property name="label" translatable="yes">Update</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                         <property name="tooltip-text" translatable="yes">Update</property>
-                        <property name="image">sat_update_image</property>
                         <property name="always-show-image">True</property>
                         <signal name="clicked" handler="on_update_satellites_list" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="update_image">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="icon-name">emblem-synchronizing-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -323,13 +311,19 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkButton" id="cancel_data_button">
-                        <property name="label" translatable="yes">Cancel</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                         <property name="tooltip-text" translatable="yes">Cancel</property>
-                        <property name="image">sat_update_cancel_image</property>
                         <property name="always-show-image">True</property>
                         <signal name="clicked" handler="on_cancel_receive" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="cancel_image">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="icon-name">window-close-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
                         <accelerator key="z" signal="clicked" modifiers="Primary"/>
                       </object>
                       <packing>
@@ -340,15 +334,21 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkButton" id="receive_data_button">
-                        <property name="label" translatable="yes">Receive</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                         <property name="tooltip-text" translatable="yes">Receive</property>
-                        <property name="image">sat_receive_image</property>
                         <property name="always-show-image">True</property>
                         <signal name="clicked" handler="on_receive_data" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="sat_receive_image">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="icon-name">network-receive-symbolic</property>
+                            <property name="icon_size">1</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -368,66 +368,6 @@ Author: Dmitriy Yefremov
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="spacing">5</property>
-                    <child>
-                      <object class="GtkButtonBox" id="sat_update_fs_box">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="layout-style">expand</property>
-                        <child>
-                          <object class="GtkToggleButton" id="sat_update_filter_button">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="receives-default">True</property>
-                            <property name="tooltip-text" translatable="yes">Filter</property>
-                            <property name="always-show-image">True</property>
-                            <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
-                            <child>
-                              <object class="GtkImage" id="sat_update_filter_image">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="icon-name">edit-find-replace-symbolic</property>
-                                <property name="icon_size">1</property>
-                              </object>
-                            </child>
-                            <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | Primary"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="sat_update_find_button">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="receives-default">True</property>
-                            <property name="tooltip-text" translatable="yes">Find</property>
-                            <property name="always-show-image">True</property>
-                            <signal name="toggled" handler="on_find_toggled" swapped="no"/>
-                            <child>
-                              <object class="GtkImage" id="sat_update_search_image">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="icon-name">edit-find-symbolic</property>
-                                <property name="icon_size">1</property>
-                              </object>
-                            </child>
-                            <accelerator key="f" signal="clicked" modifiers="Primary"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</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>
                       <object class="GtkMenuButton" id="options_menu_button">
                         <property name="visible">True</property>
@@ -436,36 +376,12 @@ Author: Dmitriy Yefremov
                         <property name="direction">none</property>
                         <property name="popover">options_popover</property>
                         <child>
-                          <object class="GtkBox" id="options_button_box">
+                          <object class="GtkImage" id="options_button_image">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="spacing">2</property>
-                            <child>
-                              <object class="GtkImage" id="options_button_image">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="tooltip-text" translatable="yes">Options</property>
-                                <property name="icon-name">applications-system-symbolic</property>
-                                <property name="icon_size">1</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="options_label">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="label" translatable="yes">Options</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="tooltip-text" translatable="yes">Options</property>
+                            <property name="icon-name">applications-system-symbolic</property>
+                            <property name="icon_size">1</property>
                           </object>
                         </child>
                       </object>
@@ -500,206 +416,6 @@ Author: Dmitriy Yefremov
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkSearchBar" id="sat_update_search_bar">
-            <property name="can-focus">False</property>
-            <child>
-              <object class="GtkBox" id="search_bar_box">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="margin-top">2</property>
-                <property name="margin-bottom">2</property>
-                <child>
-                  <object class="GtkSearchEntry" id="sat_update_search_entry">
-                    <property name="width-request">200</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="primary-icon-name">edit-find-symbolic</property>
-                    <property name="primary-icon-activatable">False</property>
-                    <property name="primary-icon-sensitive">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="sat_update_search_down_button">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">True</property>
-                    <child>
-                      <object class="GtkArrow" id="arrow1">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="arrow-type">down</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="sat_update_search_up_button">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">True</property>
-                    <child>
-                      <object class="GtkArrow" id="arrow2">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="arrow-type">up</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <style>
-                  <class name="group"/>
-                </style>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSearchBar" id="sat_update_filter_bar">
-            <property name="can-focus">False</property>
-            <child>
-              <!-- n-columns=7 n-rows=1 -->
-              <object class="GtkGrid" id="source_header_grid">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="margin-top">2</property>
-                <property name="margin-bottom">2</property>
-                <property name="column-spacing">2</property>
-                <child>
-                  <object class="GtkLabel" id="from_label">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">From:</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="from_pos_button">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="input-purpose">number</property>
-                    <property name="adjustment">pos_adjustment</property>
-                    <property name="digits">1</property>
-                    <property name="numeric">True</property>
-                    <signal name="changed" handler="on_filter" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="filter_from_combo_box">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="model">side_store</property>
-                    <property name="active">0</property>
-                    <signal name="changed" handler="on_filter" swapped="no"/>
-                    <child>
-                      <object class="GtkCellRendererText" id="from_filter_cellrenderertext"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="to_label">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">To:</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">3</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="to_pos_button">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="input-purpose">number</property>
-                    <property name="adjustment">pos_adjustment2</property>
-                    <property name="digits">1</property>
-                    <property name="numeric">True</property>
-                    <signal name="changed" handler="on_filter" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left-attach">4</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="filter_to_combo_box">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="model">side_store</property>
-                    <property name="active">0</property>
-                    <signal name="changed" handler="on_filter" swapped="no"/>
-                    <child>
-                      <object class="GtkCellRendererText" id="filter_to_cellrenderertext"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">5</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="filter_apply_button">
-                    <property name="label">gtk-apply</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">True</property>
-                    <property name="use-stock">True</property>
-                    <signal name="clicked" handler="on_filter" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left-attach">6</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkPaned" id="sat_update_main_paned">
             <property name="visible">True</property>
@@ -727,10 +443,281 @@ Author: Dmitriy Yefremov
                         <property name="margin-end">10</property>
                         <property name="margin-top">10</property>
                         <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkBox" id="sat_header_box">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkToggleButton" id="filter_button">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Filter</property>
+                                <property name="always-show-image">True</property>
+                                <child>
+                                  <object class="GtkImage" id="sat_update_filter_image">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">edit-find-replace-symbolic</property>
+                                    <property name="icon_size">1</property>
+                                  </object>
+                                </child>
+                                <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToggleButton" id="search_button">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="tooltip-text" translatable="yes">Find</property>
+                                <property name="always-show-image">True</property>
+                                <child>
+                                  <object class="GtkImage" id="sat_update_search_image">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="icon-name">edit-find-symbolic</property>
+                                    <property name="icon_size">1</property>
+                                  </object>
+                                </child>
+                                <accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="search_bar_box">
+                            <property name="visible" bind-source="search_button" bind-property="active">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">center</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="margin-bottom">5</property>
+                            <child>
+                              <object class="GtkSearchEntry" id="sat_update_search_entry">
+                                <property name="width-request">200</property>
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="primary-icon-name">edit-find-symbolic</property>
+                                <property name="primary-icon-activatable">False</property>
+                                <property name="primary-icon-sensitive">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="sat_update_search_down_button">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <child>
+                                  <object class="GtkArrow" id="arrow1">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="arrow-type">down</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="sat_update_search_up_button">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <child>
+                                  <object class="GtkArrow" id="arrow2">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="arrow-type">up</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <style>
+                              <class name="group"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="filter_bar_box">
+                            <property name="visible" bind-source="filter_button" bind-property="active">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-bottom">5</property>
+                            <child type="center">
+                              <!-- n-columns=7 n-rows=1 -->
+                              <object class="GtkGrid" id="filter_bar_grid">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="column-spacing">2</property>
+                                <child>
+                                  <object class="GtkLabel" id="from_label">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">From:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="from_pos_button">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="text" translatable="yes">0,0</property>
+                                    <property name="input-purpose">number</property>
+                                    <property name="adjustment">pos_adjustment</property>
+                                    <property name="digits">1</property>
+                                    <property name="numeric">True</property>
+                                    <signal name="changed" handler="on_filter" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="filter_from_combo_box">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="model">side_store</property>
+                                    <property name="active">0</property>
+                                    <signal name="changed" handler="on_filter" swapped="no"/>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="from_filter_cellrenderertext"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="to_label">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">To:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">3</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="to_pos_button">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="text" translatable="yes">0,0</property>
+                                    <property name="input-purpose">number</property>
+                                    <property name="adjustment">pos_adjustment2</property>
+                                    <property name="digits">1</property>
+                                    <property name="numeric">True</property>
+                                    <signal name="changed" handler="on_filter" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">4</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="filter_to_combo_box">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="model">side_store</property>
+                                    <property name="active">0</property>
+                                    <signal name="changed" handler="on_filter" swapped="no"/>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="filter_to_cellrenderertext"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">5</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="filter_apply_button">
+                                    <property name="label">gtk-apply</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="use-stock">True</property>
+                                    <signal name="clicked" handler="on_filter" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">6</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkScrolledWindow" id="sat_update_scrolled_window">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
+                            <property name="margin-top">5</property>
                             <property name="shadow-type">in</property>
                             <child>
                               <object class="GtkTreeView" id="sat_update_tree_view">
@@ -831,7 +818,7 @@ Author: Dmitriy Yefremov
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                         <child>
@@ -870,7 +857,7 @@ Author: Dmitriy Yefremov
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
                       </object>
@@ -894,7 +881,7 @@ Author: Dmitriy Yefremov
               </object>
               <packing>
                 <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
             <child>
@@ -1044,7 +1031,7 @@ Author: Dmitriy Yefremov
                   </object>
                   <packing>
                     <property name="resize">True</property>
-                    <property name="shrink">True</property>
+                    <property name="shrink">False</property>
                   </packing>
                 </child>
                 <child>
@@ -1235,7 +1222,7 @@ Author: Dmitriy Yefremov
               </object>
               <packing>
                 <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
           </object>