diff --git a/pcbnew/zone_manager/dialog_zone_manager_base.cpp b/pcbnew/zone_manager/dialog_zone_manager_base.cpp
index c0b777fded..e756623baa 100644
--- a/pcbnew/zone_manager/dialog_zone_manager_base.cpp
+++ b/pcbnew/zone_manager/dialog_zone_manager_base.cpp
@@ -67,10 +67,10 @@ DIALOG_ZONE_MANAGER_BASE::DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID
 	leftColumn->Add( m_sizerZoneOP, 0, wxEXPAND|wxTOP, 5 );
 
 
-	m_sizerTop->Add( leftColumn, 1, wxEXPAND|wxLEFT, 5 );
+	m_sizerTop->Add( leftColumn, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
 
 
-	m_MainBoxSizer->Add( m_sizerTop, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	m_MainBoxSizer->Add( m_sizerTop, 1, wxEXPAND|wxRIGHT, 5 );
 
 	m_sizerProperties = new wxBoxSizer( wxVERTICAL );
 
@@ -99,7 +99,7 @@ DIALOG_ZONE_MANAGER_BASE::DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
 
-	m_sizerBottom->Add( m_sdbSizer, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	m_sizerBottom->Add( m_sdbSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
 	m_MainBoxSizer->Add( m_sizerBottom, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
diff --git a/pcbnew/zone_manager/dialog_zone_manager_base.fbp b/pcbnew/zone_manager/dialog_zone_manager_base.fbp
index 5052908d50..1005538f91 100644
--- a/pcbnew/zone_manager/dialog_zone_manager_base.fbp
+++ b/pcbnew/zone_manager/dialog_zone_manager_base.fbp
@@ -67,7 +67,7 @@
         <property name="permission">protected</property>
         <object class="sizeritem" expanded="true">
           <property name="border">5</property>
-          <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
+          <property name="flag">wxEXPAND|wxRIGHT</property>
           <property name="proportion">1</property>
           <object class="wxBoxSizer" expanded="true">
             <property name="minimum_size"></property>
@@ -75,8 +75,8 @@
             <property name="orient">wxHORIZONTAL</property>
             <property name="permission">protected</property>
             <object class="sizeritem" expanded="true">
-              <property name="border">5</property>
-              <property name="flag">wxEXPAND|wxLEFT</property>
+              <property name="border">10</property>
+              <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
               <property name="proportion">1</property>
               <object class="wxBoxSizer" expanded="true">
                 <property name="minimum_size"></property>
@@ -674,7 +674,7 @@
             </object>
             <object class="sizeritem" expanded="false">
               <property name="border">5</property>
-              <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
+              <property name="flag">wxALIGN_CENTER_VERTICAL</property>
               <property name="proportion">0</property>
               <object class="wxStdDialogButtonSizer" expanded="false">
                 <property name="Apply">0</property>