diff --git a/acronyms_expander/gtk/config.py b/acronyms_expander/gtk/config.py
index 7a4fa02..7b59525 100644
--- a/acronyms_expander/gtk/config.py
+++ b/acronyms_expander/gtk/config.py
@@ -42,7 +42,7 @@ class ConfigDialog(Gtk.ApplicationWindow):
 
         self._plugin = plugin
 
-        self.add(self._ui.grid)
+        self.add(self._ui.box)
 
         self._fill_list()
         self.show_all()
diff --git a/acronyms_expander/gtk/config.ui b/acronyms_expander/gtk/config.ui
index 9c2a03b..009bc61 100644
--- a/acronyms_expander/gtk/config.ui
+++ b/acronyms_expander/gtk/config.ui
@@ -10,27 +10,21 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkGrid" id="grid">
+  <object class="GtkBox" id="box">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="margin_left">12</property>
-    <property name="margin_right">12</property>
-    <property name="margin_top">12</property>
-    <property name="margin_bottom">12</property>
-    <property name="row_spacing">6</property>
+    <property name="border_width">18</property>
+    <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="shadow_type">in</property>
         <child>
           <object class="GtkTreeView" id="acronyms_treeview">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
             <property name="model">acronyms_store</property>
             <property name="search_column">1</property>
             <child internal-child="selection">
@@ -78,61 +72,51 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkButtonBox">
+      <object class="GtkToolbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="toolbar_style">icons</property>
+        <property name="icon_size">4</property>
         <child>
-          <object class="GtkButton">
+          <object class="GtkToolButton">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="halign">start</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">Add</property>
+            <property name="icon_name">list-add-symbolic</property>
             <signal name="clicked" handler="_on_add_clicked" swapped="no"/>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">list-add-symbolic</property>
-              </object>
-            </child>
-            <style>
-              <class name="suggested-action"/>
-            </style>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="label" translatable="yes">Remove</property>
+          <object class="GtkToolButton">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="halign">end</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">Remove</property>
+            <property name="icon_name">list-remove-symbolic</property>
             <signal name="clicked" handler="_on_remove_clicked" swapped="no"/>
-            <style>
-              <class name="destructive-action"/>
-            </style>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
+        <style>
+          <class name="inline-toolbar"/>
+        </style>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>