diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade
index 15f0d3a1..365ef2ac 100644
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -27,7 +27,7 @@ Author: Dmitriy Yefremov
 
 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.16"/>
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
   <!-- interface-copyright 2018 Dmitriy Yefremov -->
@@ -76,16 +76,65 @@ Author: Dmitriy Yefremov
   <object class="GtkDialog" id="download_dialog">
     <property name="width_request">320</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">FTP-transfer</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="default_width">320</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">mail-send-receive</property>
     <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkButton">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Receive</property>
+            <signal name="clicked" handler="on_receive" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="receive_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-goto-bottom</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="title">
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">FTP-transfer</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Send</property>
+            <signal name="clicked" handler="on_send" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="send_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-goto-top</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
     </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_download_dialog_button</action-widget>
+    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox" id="download_dialog_vbox">
         <property name="width_request">320</property>
@@ -122,7 +171,7 @@ Author: Dmitriy Yefremov
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">1</property>
+            <property name="spacing">2</property>
             <child>
               <object class="GtkGrid" id="download_dialog_grid">
                 <property name="visible">True</property>
@@ -179,6 +228,7 @@ Author: Dmitriy Yefremov
                     <property name="editable">False</property>
                     <property name="text">data/</property>
                     <property name="caps_lock_warning">False</property>
+                    <property name="primary_icon_name">folder-open-symbolic</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -281,51 +331,6 @@ Author: Dmitriy Yefremov
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkToolbar" id="toolbar1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkToolButton" id="receive_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Receive files from receiver</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Receive</property>
-                    <property name="stock_id">gtk-goto-bottom</property>
-                    <signal name="clicked" handler="on_receive" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="send_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Send files to receiver</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Send</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-goto-top</property>
-                    <signal name="clicked" handler="on_send" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <style>
-                  <class name="primary-toolbar"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
@@ -478,7 +483,7 @@ Author: Dmitriy Yefremov
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">gtk-edit</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -666,6 +671,7 @@ Author: Dmitriy Yefremov
     <property name="width_request">320</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes"> </property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
@@ -741,7 +747,6 @@ Author: Dmitriy Yefremov
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
-            <property name="margin_top">10</property>
             <property name="spacing">2</property>
             <child>
               <object class="GtkLabel">
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index f0dc0dbf..369167af 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -171,7 +171,7 @@ Author: Dmitriy Yefremov
   <object class="GtkPopoverMenu" id="left_header_popover_menu">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkFrame">
+      <object class="GtkFrame" id="left_popover_munu_frame">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">5</property>
@@ -206,7 +206,7 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkButton">
+              <object class="GtkButton" id="save_left_popover_munu_button">
                 <property name="label">gtk-save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -222,16 +222,7 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">2</property>
-                <property name="position">2</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
               <placeholder/>
@@ -504,7 +495,7 @@ Author: Dmitriy Yefremov
   <object class="GtkPopoverMenu" id="right_header_popover_menu">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkFrame">
+      <object class="GtkFrame" id="right_popover_munu_frame">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">5</property>
@@ -895,7 +886,6 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Profile:</property>
                     <attributes>
-                      <attribute name="foreground" value="#88888a8a8585"/>
                       <attribute name="size" value="8000"/>
                     </attributes>
                   </object>
@@ -911,7 +901,6 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">False</property>
                     <property name="label">Enigma 2 v.4</property>
                     <attributes>
-                      <attribute name="foreground" value="#88888a8a8585"/>
                       <attribute name="size" value="8000"/>
                     </attributes>
                   </object>
@@ -978,12 +967,6 @@ Author: Dmitriy Yefremov
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
@@ -1515,6 +1498,7 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkSearchEntry" id="filter_entry">
+                        <property name="height_request">32</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="primary_icon_name">tools-check-spelling</property>
@@ -2109,7 +2093,6 @@ Author: Dmitriy Yefremov
                     <property name="halign">center</property>
                     <property name="label" translatable="yes">Current IP:</property>
                     <attributes>
-                      <attribute name="foreground" value="#88888a8a8585"/>
                       <attribute name="size" value="8000"/>
                     </attributes>
                   </object>
@@ -2125,7 +2108,6 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">127.0.0.1</property>
                     <attributes>
-                      <attribute name="foreground" value="#88888a8a8585"/>
                       <attribute name="size" value="8000"/>
                     </attributes>
                   </object>