diff --git a/app/ui/service_details_dialog.glade b/app/ui/service_details_dialog.glade
index 9fc7595e..954226eb 100644
--- a/app/ui/service_details_dialog.glade
+++ b/app/ui/service_details_dialog.glade
@@ -215,98 +215,69 @@
     </data>
   </object>
   <object class="GtkDialog" id="service_details_dialog">
+    <property name="use-header-bar">1</property>
     <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Service data</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">document-properties-symbolic</property>
     <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <property name="gravity">center</property>
     <child type="titlebar">
-      <object class="GtkHeaderBar">
+      <placeholder/>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="label">gtk-cancel</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="title" translatable="yes">Service data</property>
-        <property name="spacing">2</property>
-        <property name="show_close_button">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Cancel</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="apply_button">
+        <property name="label">gtk-save</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Save current service</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+        <signal name="clicked" handler="on_save" swapped="no"/>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="create_button">
+        <property name="label">gtk-new</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Create and save as new service</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+        <signal name="clicked" handler="on_create_new" swapped="no"/>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-6">cancel_button</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog_vbox">
         <property name="can_focus">False</property>
         <property name="margin_left">2</property>
+        <property name="margin_right">2</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Cancel</property>
-                <property name="use_stock">True</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="apply_button">
-                <property name="label">gtk-save</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Save current service</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_save" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="create_button">
-                <property name="label">gtk-new</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Create and save as new service</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_create_new" swapped="no"/>
-              </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>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkFrame" id="service_data_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">2</property>
             <property name="margin_right">2</property>
+            <property name="margin_bottom">5</property>
             <property name="label_xalign">0.019999999552965164</property>
             <property name="shadow_type">in</property>
             <child>
@@ -924,6 +895,7 @@
             <property name="can_focus">False</property>
             <property name="margin_left">2</property>
             <property name="margin_right">2</property>
+            <property name="margin_bottom">5</property>
             <property name="label_xalign">0.019999999552965164</property>
             <property name="shadow_type">in</property>
             <child>
@@ -1545,9 +1517,11 @@
     </columns>
   </object>
   <object class="GtkDialog" id="tr_services_dialog">
+    <property name="use-header-bar">1</property>
+    <property name="width_request">480</property>
+    <property name="height_request">300</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Transponder details</property>
-    <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
@@ -1558,219 +1532,165 @@
     <child>
       <placeholder/>
     </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_no_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_ok_button">
+        <property name="label">gtk-ok</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="tr_services_dialog_vbox">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="tr_services_dialog_action_area">
+        <child>
+          <object class="GtkLabel" id="srv_list_dialog_hdr_label">
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="tr_services_no_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</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="tr_services_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</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>
+            <property name="margin_left">20</property>
+            <property name="margin_right">20</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="label" translatable="yes">Changes will be applied to all services of this transponder!
+Continue?</property>
+            <property name="justify">center</property>
+            <property name="lines">2</property>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="infor_box">
+          <object class="GtkScrolledWindow" id="tr_srv_scrolled_window">
+            <property name="height_request">120</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <property name="margin_left">1</property>
+            <property name="margin_right">1</property>
+            <property name="margin_bottom">1</property>
             <child>
-              <object class="GtkLabel" id="srv_list_dialog_hdr_label">
+              <object class="GtkTreeView" id="tr_services_list_treeview">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Changes will be applied to all services of this transponder!
-Continue?</property>
-                <property name="use_markup">True</property>
-                <property name="justify">center</property>
-                <property name="lines">2</property>
-                <style>
-                  <class name="primary-toolbar"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator" id="separator1">
-                <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">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="tr_srv_scrolled_window">
-                <property name="height_request">120</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
+                <property name="model">transponder_services_liststore</property>
+                <property name="enable_search">False</property>
+                <property name="enable_grid_lines">vertical</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
                 <child>
-                  <object class="GtkTreeView" id="tr_services_list_treeview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="model">transponder_services_liststore</property>
-                    <property name="enable_search">False</property>
-                    <property name="enable_grid_lines">vertical</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection1"/>
-                    </child>
+                  <object class="GtkTreeViewColumn" id="tr_srv_treeviewcolumn">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Service</property>
+                    <property name="expand">True</property>
+                    <property name="alignment">0.5</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="tr_srv_treeviewcolumn">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">Service</property>
-                        <property name="expand">True</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="srv_cellrenderertext"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
+                      <object class="GtkCellRendererText" id="srv_cellrenderertext"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="package_treeview_column">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Package</property>
+                    <property name="expand">True</property>
+                    <property name="alignment">0.5</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="package_treeview_column">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">Package</property>
-                        <property name="expand">True</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="package_cellrenderertext"/>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                      </object>
+                      <object class="GtkCellRendererText" id="package_cellrenderertext"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="type_treeviewcolumn">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Type</property>
+                    <property name="alignment">0.5</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="type_treeviewcolumn">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">Type</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="type_cellrenderertext">
-                            <property name="xalign">0.50999999046325684</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">2</attribute>
-                          </attributes>
-                        </child>
+                      <object class="GtkCellRendererText" id="type_cellrenderertext">
+                        <property name="xalign">0.50999999046325684</property>
                       </object>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="ssid_treeviewcolumn">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Ssid</property>
+                    <property name="expand">True</property>
+                    <property name="alignment">0.5</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="ssid_treeviewcolumn">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">Ssid</property>
-                        <property name="expand">True</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="ssid_cellrenderertext">
-                            <property name="xalign">0.50999999046325684</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">3</attribute>
-                          </attributes>
-                        </child>
+                      <object class="GtkCellRendererText" id="ssid_cellrenderertext">
+                        <property name="xalign">0.50999999046325684</property>
                       </object>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="freq_treeviewcolumn">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Freq.</property>
+                    <property name="alignment">0.5</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="freq_treeviewcolumn">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">Freq.</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="freq_cellrenderertext">
-                            <property name="xalign">0.50999999046325684</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">4</attribute>
-                          </attributes>
-                        </child>
+                      <object class="GtkCellRendererText" id="freq_cellrenderertext">
+                        <property name="xalign">0.50999999046325684</property>
                       </object>
+                      <attributes>
+                        <attribute name="text">4</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="pos_treeviewcolumn">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Pos.</property>
+                    <property name="alignment">0.5</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="pos_treeviewcolumn">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">Pos.</property>
-                        <property name="alignment">0.5</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="pos_cellrenderertext">
-                            <property name="xalign">0.50999999046325684</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">5</attribute>
-                          </attributes>
-                        </child>
+                      <object class="GtkCellRendererText" id="pos_cellrenderertext">
+                        <property name="xalign">0.50999999046325684</property>
                       </object>
+                      <attributes>
+                        <attribute name="text">5</attribute>
+                      </attributes>
                     </child>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator" id="tr_srv_dialog_separator">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="padding">2</property>
-                <property name="position">4</property>
-              </packing>
             </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">4</property>
           </packing>
         </child>
       </object>