diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp
index 475235c874..4c97847263 100644
--- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp
@@ -112,10 +112,10 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
 	fgSizer1->Add( m_LayerCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
 	
 	
-	fgSizer1->Add( 0, 0, 0, wxEXPAND, 10 );
+	fgSizer1->Add( 0, 0, 0, wxEXPAND, 5 );
 	
 	
-	fgSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 30 );
+	fgSizer1->Add( 55, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 	
 	m_Visible = new wxCheckBox( m_specifiedValues, wxID_ANY, _("Visible"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER );
 	m_Visible->SetValue(true); 
@@ -224,12 +224,12 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
 	
 	// Columns
 	m_grid->SetColSize( 0, 120 );
-	m_grid->SetColSize( 1, 95 );
+	m_grid->SetColSize( 1, 110 );
 	m_grid->SetColSize( 2, 95 );
 	m_grid->SetColSize( 3, 95 );
-	m_grid->SetColSize( 4, 95 );
+	m_grid->SetColSize( 4, 110 );
 	m_grid->SetColSize( 5, 50 );
-	m_grid->SetColSize( 6, 50 );
+	m_grid->SetColSize( 6, 75 );
 	m_grid->EnableDragColMove( false );
 	m_grid->EnableDragColSize( false );
 	m_grid->SetColLabelSize( 0 );
diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp
index 2a66af58c0..65f385e91b 100644
--- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp
+++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp
@@ -1450,7 +1450,7 @@
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
-                                                <property name="border">10</property>
+                                                <property name="border">5</property>
                                                 <property name="flag">wxEXPAND</property>
                                                 <property name="proportion">0</property>
                                                 <object class="spacer" expanded="0">
@@ -1460,13 +1460,13 @@
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
-                                                <property name="border">30</property>
+                                                <property name="border">5</property>
                                                 <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
                                                 <property name="proportion">0</property>
                                                 <object class="spacer" expanded="0">
                                                     <property name="height">0</property>
                                                     <property name="permission">protected</property>
-                                                    <property name="width">0</property>
+                                                    <property name="width">55</property>
                                                 </object>
                                             </object>
                                             <object class="sizeritem" expanded="0">
@@ -2975,7 +2975,7 @@
                                 <property name="col_label_values"></property>
                                 <property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
                                 <property name="cols">7</property>
-                                <property name="column_sizes">120,95,95,95,95,50,50</property>
+                                <property name="column_sizes">120,110,95,95,110,50,75</property>
                                 <property name="context_help"></property>
                                 <property name="context_menu">1</property>
                                 <property name="default_pane">0</property>
diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp b/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp
index 1cc762b73a..dfc1089207 100644
--- a/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp
+++ b/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp
@@ -32,12 +32,12 @@ PANEL_SETUP_TEXT_AND_GRAPHICS_BASE::PANEL_SETUP_TEXT_AND_GRAPHICS_BASE( wxWindow
 	m_grid->SetMargins( 0, 0 );
 	
 	// Columns
-	m_grid->SetColSize( 0, 120 );
-	m_grid->SetColSize( 1, 100 );
-	m_grid->SetColSize( 2, 100 );
-	m_grid->SetColSize( 3, 120 );
-	m_grid->SetColSize( 4, 60 );
-	m_grid->SetColSize( 5, 100 );
+	m_grid->SetColSize( 0, 130 );
+	m_grid->SetColSize( 1, 106 );
+	m_grid->SetColSize( 2, 106 );
+	m_grid->SetColSize( 3, 130 );
+	m_grid->SetColSize( 4, 70 );
+	m_grid->SetColSize( 5, 116 );
 	m_grid->EnableDragColMove( false );
 	m_grid->EnableDragColSize( true );
 	m_grid->SetColLabelSize( 22 );
diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp b/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp
index a7dea06e37..072d15ad65 100644
--- a/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp
+++ b/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp
@@ -206,7 +206,7 @@
                                 <property name="col_label_values">&quot;Line Thickness&quot; &quot;Text Width&quot; &quot;Text Height&quot; &quot;Text Thickness&quot; &quot;Italic&quot; &quot;Keep Upright&quot;</property>
                                 <property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
                                 <property name="cols">6</property>
-                                <property name="column_sizes">120,100,100,120,60,100</property>
+                                <property name="column_sizes">130,106,106,130,70,116</property>
                                 <property name="context_help"></property>
                                 <property name="context_menu">1</property>
                                 <property name="default_pane">0</property>