diff --git a/common/dialogs/dialog_grid_settings_base.cpp b/common/dialogs/dialog_grid_settings_base.cpp
index b7ca6d7b95..a33236788c 100644
--- a/common/dialogs/dialog_grid_settings_base.cpp
+++ b/common/dialogs/dialog_grid_settings_base.cpp
@@ -114,7 +114,7 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow
 	sbUserGridSizer->Add( fgSizer31, 0, wxEXPAND|wxALL, 5 );
 
 
-	bUpperSizer->Add( sbUserGridSizer, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	bUpperSizer->Add( sbUserGridSizer, 1, wxEXPAND|wxALL, 5 );
 
 
 	bSizerMain->Add( bUpperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
@@ -168,13 +168,13 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow
 	bButtonSizer = new wxBoxSizer( wxHORIZONTAL );
 
 	m_buttonResetOrigin = new wxButton( this, wxID_ANY, _("Reset Grid Origin"), wxDefaultPosition, wxDefaultSize, 0 );
-	bButtonSizer->Add( m_buttonResetOrigin, 0, wxALL, 5 );
+	bButtonSizer->Add( m_buttonResetOrigin, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_buttonResetSizes = new wxButton( this, wxID_ANY, _("Reset Grid Sizes"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonResetSizes->Hide();
 	m_buttonResetSizes->SetToolTip( _("Resets the list of grid sizes to default values") );
 
-	bButtonSizer->Add( m_buttonResetSizes, 0, wxALL, 5 );
+	bButtonSizer->Add( m_buttonResetSizes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_sdbSizer = new wxStdDialogButtonSizer();
 	m_sdbSizerOK = new wxButton( this, wxID_OK );
@@ -183,7 +183,7 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
 
-	bButtonSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );
+	bButtonSizer->Add( m_sdbSizer, 1, wxALL|wxEXPAND, 5 );
 
 
 	bSizerMain->Add( bButtonSizer, 0, wxEXPAND|wxLEFT, 10 );
diff --git a/common/dialogs/dialog_grid_settings_base.fbp b/common/dialogs/dialog_grid_settings_base.fbp
index 2a8c4e3e8e..cdb9e69d43 100644
--- a/common/dialogs/dialog_grid_settings_base.fbp
+++ b/common/dialogs/dialog_grid_settings_base.fbp
@@ -714,7 +714,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxTOP|wxBOTTOM|wxLEFT</property>
+                            <property name="flag">wxEXPAND|wxALL</property>
                             <property name="proportion">1</property>
                             <object class="wxStaticBoxSizer" expanded="1">
                                 <property name="id">wxID_ANY</property>
@@ -1533,7 +1533,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
-                            <property name="flag">wxALL</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
                             <property name="proportion">0</property>
                             <object class="wxButton" expanded="0">
                                 <property name="BottomDockable">1</property>
@@ -1607,7 +1607,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALL</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
                             <property name="proportion">0</property>
                             <object class="wxButton" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -1681,7 +1681,7 @@
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
                             <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
+                            <property name="proportion">1</property>
                             <object class="wxStdDialogButtonSizer" expanded="1">
                                 <property name="Apply">0</property>
                                 <property name="Cancel">1</property>