diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp
index ef62650..78e06d9 100644
--- a/eeschema/dialogs/dialog_eeschema_options_base.cpp
+++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp
@@ -212,16 +212,16 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
 	bSizer2->Add( m_checkHVOrientation, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 3 );
 	
 	m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show page limi&ts"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );
+	bSizer2->Add( m_checkPageLimits, 0, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 3 );
 	
 	m_checkAutoplaceFields = new wxCheckBox( m_panel1, wxID_ANY, _("Automatically place component fields"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2->Add( m_checkAutoplaceFields, 0, wxALL, 3 );
+	bSizer2->Add( m_checkAutoplaceFields, 0, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 3 );
 	
 	m_checkAutoplaceJustify = new wxCheckBox( m_panel1, wxID_ANY, _("Allow field autoplace to change justification"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2->Add( m_checkAutoplaceJustify, 0, wxALL, 3 );
+	bSizer2->Add( m_checkAutoplaceJustify, 0, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 3 );
 	
 	m_checkAutoplaceAlign = new wxCheckBox( m_panel1, wxID_ANY, _("Always align autoplaced fields to the 50 mil grid"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2->Add( m_checkAutoplaceAlign, 0, wxALL, 3 );
+	bSizer2->Add( m_checkAutoplaceAlign, 0, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 3 );
 	
 	
 	bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp
index f270dfb..2783a55 100644
--- a/eeschema/dialogs/dialog_eeschema_options_base.fbp
+++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp
@@ -3577,7 +3577,7 @@
                                                             </object>
                                                             <object class="sizeritem" expanded="0">
                                                                 <property name="border">3</property>
-                                                                <property name="flag">wxALL|wxEXPAND</property>
+                                                                <property name="flag">wxEXPAND|wxLEFT|wxTOP|wxRIGHT</property>
                                                                 <property name="proportion">0</property>
                                                                 <object class="wxCheckBox" expanded="0">
                                                                     <property name="BottomDockable">1</property>
@@ -3663,9 +3663,9 @@
                                                                     <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
-                                                            <object class="sizeritem" expanded="1">
+                                                            <object class="sizeritem" expanded="0">
                                                                 <property name="border">3</property>
-                                                                <property name="flag">wxALL</property>
+                                                                <property name="flag">wxEXPAND|wxLEFT|wxTOP|wxRIGHT</property>
                                                                 <property name="proportion">0</property>
                                                                 <object class="wxCheckBox" expanded="1">
                                                                     <property name="BottomDockable">1</property>
@@ -3751,9 +3751,9 @@
                                                                     <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
-                                                            <object class="sizeritem" expanded="1">
+                                                            <object class="sizeritem" expanded="0">
                                                                 <property name="border">3</property>
-                                                                <property name="flag">wxALL</property>
+                                                                <property name="flag">wxEXPAND|wxLEFT|wxTOP|wxRIGHT</property>
                                                                 <property name="proportion">0</property>
                                                                 <object class="wxCheckBox" expanded="1">
                                                                     <property name="BottomDockable">1</property>
@@ -3839,9 +3839,9 @@
                                                                     <event name="OnUpdateUI"></event>
                                                                 </object>
                                                             </object>
-                                                            <object class="sizeritem" expanded="1">
+                                                            <object class="sizeritem" expanded="0">
                                                                 <property name="border">3</property>
-                                                                <property name="flag">wxALL</property>
+                                                                <property name="flag">wxEXPAND|wxLEFT|wxTOP|wxRIGHT</property>
                                                                 <property name="proportion">0</property>
                                                                 <object class="wxCheckBox" expanded="1">
                                                                     <property name="BottomDockable">1</property>