diff --git a/data/gui/screens/options_device.stkgui b/data/gui/screens/options_device.stkgui
index bfd53e405..94531e0d1 100644
--- a/data/gui/screens/options_device.stkgui
+++ b/data/gui/screens/options_device.stkgui
@@ -29,9 +29,9 @@
             <box width="80%" height="100%" layout="vertical-row">
 
                 <!-- Configuration name -->
-                 <spacer height="6" width="10"/>
+                 <spacer height="1%" width="10"/>
                  <label id="title" width="100%" text_align="center" />
-                 <spacer height="16" width="10"/>
+                 <spacer height="2%" width="10"/>
 
                  <!-- List of key bindings -->
                  <box proportion="10" width="75%" align="center" layout="vertical-row" padding="8">
@@ -40,20 +40,20 @@
 
                  <!-- Bottom buttons -->
 
-                 <spacer width="50" height="20" />
-                 <div proportion="3" width="100%"  layout="horizontal-row">
+                 <spacer width="50" height="2%" />
+                 <div height="4f" width="100%"  layout="horizontal-row">
                      <div height="100%" width="fit" layout="vertical-row">
                          <button id="delete"
                                  I18N="In the input configuration screen"  text="Delete Configuration"/>
-                         <spacer width="50" height="3%" />
+                         <spacer width="50" height="2%" />
                          <button id="disable_toggle"
                                  I18N="In the input configuration screen"  text="Disable Configuration"/>
-                         <spacer width="50" height="3%" />
+                         <spacer width="50" height="2%" />
                          <button id="back_to_device_list" I18N="In the input configuration screen"  text="Back to device list"/>
 
-                         <spacer width="50" height="3%" />
+                         <spacer width="50" height="2%" />
                      </div>
-                     <spacer width="20" height="10" />
+                     <spacer width="2%" height="10" />
                      <label id="conflict" proportion="1" text="" word_wrap="true" align="center"/>
                  </div>
             </box>
diff --git a/data/gui/screens/options_general.stkgui b/data/gui/screens/options_general.stkgui
index fa4f44662..d5d859c43 100644
--- a/data/gui/screens/options_general.stkgui
+++ b/data/gui/screens/options_general.stkgui
@@ -27,7 +27,7 @@
             <spacer width="2%" height="100%"/>
 
             <div width="100%" height="100%" layout="vertical-row" >
-                <box width="80%" height="49%" layout="vertical-row">
+                <box width="80%" height="59%" layout="vertical-row">
 
                     <spacer width="5" height="2%"/>
 
@@ -71,7 +71,7 @@
 
                 <spacer width="5" height="2%"/>
 
-                <box width="80%" height="49%" layout="vertical-row">
+                <box width="80%" height="39%" layout="vertical-row">
 
                    <spacer width="5" height="2%"/>