diff --git a/common/dialogs/dialog_configure_paths_base.fbp b/common/dialogs/dialog_configure_paths_base.fbp
index dc419b0d35..197ce7391a 100644
--- a/common/dialogs/dialog_configure_paths_base.fbp
+++ b/common/dialogs/dialog_configure_paths_base.fbp
@@ -85,7 +85,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/common/dialogs/dialog_plugin_options_base.cpp b/common/dialogs/dialog_plugin_options_base.cpp
index 23a795b519..213acd8e14 100644
--- a/common/dialogs/dialog_plugin_options_base.cpp
+++ b/common/dialogs/dialog_plugin_options_base.cpp
@@ -53,7 +53,7 @@ DIALOG_PLUGIN_OPTIONS_BASE::DIALOG_PLUGIN_OPTIONS_BASE( wxWindow* parent, wxWind
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid_sizer->Add( m_grid, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
 	wxBoxSizer* bButtonsSizer;
diff --git a/common/dialogs/dialog_plugin_options_base.fbp b/common/dialogs/dialog_plugin_options_base.fbp
index 08364b4f86..1958704b37 100644
--- a/common/dialogs/dialog_plugin_options_base.fbp
+++ b/common/dialogs/dialog_plugin_options_base.fbp
@@ -105,7 +105,7 @@
                                         <property name="cell_font"></property>
                                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                         <property name="cell_text"></property>
-                                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/common/dialogs/panel_setup_netclasses_base.cpp b/common/dialogs/panel_setup_netclasses_base.cpp
index a13b8a1fb5..c7df3b7828 100644
--- a/common/dialogs/panel_setup_netclasses_base.cpp
+++ b/common/dialogs/panel_setup_netclasses_base.cpp
@@ -73,7 +73,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 	// Label Appearance
 
 	// Cell Defaults
-	m_netclassGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_netclassGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bUpperSizer->Add( m_netclassGrid, 1, wxEXPAND|wxFIXED_MINSIZE|wxLEFT|wxRIGHT|wxTOP, 1 );
 
 	wxBoxSizer* buttonBoxSizer;
@@ -146,7 +146,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 	// Label Appearance
 
 	// Cell Defaults
-	m_assignmentGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_assignmentGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizer14->Add( m_assignmentGrid, 2, wxEXPAND|wxFIXED_MINSIZE|wxLEFT, 5 );
 
 
diff --git a/common/dialogs/panel_setup_netclasses_base.fbp b/common/dialogs/panel_setup_netclasses_base.fbp
index d66ad7eaa5..773e694e1f 100644
--- a/common/dialogs/panel_setup_netclasses_base.fbp
+++ b/common/dialogs/panel_setup_netclasses_base.fbp
@@ -279,7 +279,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -758,7 +758,7 @@
                                                                     <property name="cell_font"></property>
                                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                                     <property name="cell_text"></property>
-                                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                                     <property name="center_pane">0</property>
                                                                     <property name="close_button">1</property>
                                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/common/dialogs/panel_text_variables_base.cpp b/common/dialogs/panel_text_variables_base.cpp
index c187ce4b34..0b00a2bbec 100644
--- a/common/dialogs/panel_text_variables_base.cpp
+++ b/common/dialogs/panel_text_variables_base.cpp
@@ -47,7 +47,7 @@ PANEL_TEXT_VARIABLES_BASE::PANEL_TEXT_VARIABLES_BASE( wxWindow* parent, wxWindow
 	// Label Appearance
 
 	// Cell Defaults
-	m_TextVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_TextVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_TextVars->SetMinSize( wxSize( 604,170 ) );
 
 	bSizer3->Add( m_TextVars, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
diff --git a/common/dialogs/panel_text_variables_base.fbp b/common/dialogs/panel_text_variables_base.fbp
index cbcc52ece1..d408207c05 100644
--- a/common/dialogs/panel_text_variables_base.fbp
+++ b/common/dialogs/panel_text_variables_base.fbp
@@ -90,7 +90,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.cpp b/cvpcb/dialogs/dialog_config_equfiles_base.cpp
index 6573df6de4..41c229339c 100644
--- a/cvpcb/dialogs/dialog_config_equfiles_base.cpp
+++ b/cvpcb/dialogs/dialog_config_equfiles_base.cpp
@@ -90,7 +90,7 @@ DIALOG_CONFIG_EQUFILES_BASE::DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWi
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridEnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_gridEnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerEnvVar->Add( m_gridEnvVars, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.fbp b/cvpcb/dialogs/dialog_config_equfiles_base.fbp
index 7b7b95dc72..42af63fcc7 100644
--- a/cvpcb/dialogs/dialog_config_equfiles_base.fbp
+++ b/cvpcb/dialogs/dialog_config_equfiles_base.fbp
@@ -633,7 +633,7 @@
                                         <property name="cell_font"></property>
                                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                         <property name="cell_text"></property>
-                                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_edit_symbols_libid_base.fbp b/eeschema/dialogs/dialog_edit_symbols_libid_base.fbp
index 6e922dd494..e496732210 100644
--- a/eeschema/dialogs/dialog_edit_symbols_libid_base.fbp
+++ b/eeschema/dialogs/dialog_edit_symbols_libid_base.fbp
@@ -83,7 +83,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_label_properties_base.cpp b/eeschema/dialogs/dialog_label_properties_base.cpp
index 987e2acc78..2bdd5332fd 100644
--- a/eeschema/dialogs/dialog_label_properties_base.cpp
+++ b/eeschema/dialogs/dialog_label_properties_base.cpp
@@ -109,7 +109,7 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( -1,100 ) );
 
 	sbFields->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
diff --git a/eeschema/dialogs/dialog_label_properties_base.fbp b/eeschema/dialogs/dialog_label_properties_base.fbp
index c5f908807c..5fbb077460 100644
--- a/eeschema/dialogs/dialog_label_properties_base.fbp
+++ b/eeschema/dialogs/dialog_label_properties_base.fbp
@@ -444,7 +444,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp
index 459f51c023..2317ed2b3d 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp
@@ -109,7 +109,7 @@ DIALOG_LIB_EDIT_PIN_TABLE_BASE::DIALOG_LIB_EDIT_PIN_TABLE_BASE( wxWindow* parent
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( 690,200 ) );
 
 	bGridMarginsSizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 );
diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp b/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp
index d24436ae8a..ea59a44f07 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp
@@ -492,7 +492,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp b/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp
index 711f4426fa..8b84a0558f 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp
@@ -81,7 +81,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow*
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( -1,160 ) );
 
 	sbSizer4->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp b/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp
index da444df47d..a450ccfce7 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp
@@ -223,7 +223,7 @@
                                                             <property name="cell_font"></property>
                                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                             <property name="cell_text"></property>
-                                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                             <property name="center_pane">0</property>
                                                             <property name="close_button">1</property>
                                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_pin_properties_base.cpp b/eeschema/dialogs/dialog_pin_properties_base.cpp
index 4ec7dd6971..41d27f6493 100644
--- a/eeschema/dialogs/dialog_pin_properties_base.cpp
+++ b/eeschema/dialogs/dialog_pin_properties_base.cpp
@@ -223,7 +223,7 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
 	// Label Appearance
 
 	// Cell Defaults
-	m_alternatesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_alternatesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_alternatesGrid->SetMinSize( wxSize( -1,100 ) );
 
 	bRightMargin->Add( m_alternatesGrid, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
diff --git a/eeschema/dialogs/dialog_pin_properties_base.fbp b/eeschema/dialogs/dialog_pin_properties_base.fbp
index 9ff82e3b00..daa6cdd2f7 100644
--- a/eeschema/dialogs/dialog_pin_properties_base.fbp
+++ b/eeschema/dialogs/dialog_pin_properties_base.fbp
@@ -2258,7 +2258,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_sheet_properties_base.cpp b/eeschema/dialogs/dialog_sheet_properties_base.cpp
index 459a2223e4..3b2106a52f 100644
--- a/eeschema/dialogs/dialog_sheet_properties_base.cpp
+++ b/eeschema/dialogs/dialog_sheet_properties_base.cpp
@@ -81,7 +81,7 @@ DIALOG_SHEET_PROPERTIES_BASE::DIALOG_SHEET_PROPERTIES_BASE( wxWindow* parent, wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( -1,120 ) );
 
 	sbFields->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
diff --git a/eeschema/dialogs/dialog_sheet_properties_base.fbp b/eeschema/dialogs/dialog_sheet_properties_base.fbp
index bc178b1385..75e8b9b494 100644
--- a/eeschema/dialogs/dialog_sheet_properties_base.fbp
+++ b/eeschema/dialogs/dialog_sheet_properties_base.fbp
@@ -167,7 +167,7 @@
                                         <property name="cell_font"></property>
                                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                         <property name="cell_text"></property>
-                                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_sim_model_base.cpp b/eeschema/dialogs/dialog_sim_model_base.cpp
index 59f4758a1d..1e886c19bf 100644
--- a/eeschema/dialogs/dialog_sim_model_base.cpp
+++ b/eeschema/dialogs/dialog_sim_model_base.cpp
@@ -248,7 +248,7 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c
 	// Label Appearance
 
 	// Cell Defaults
-	m_pinAssignmentsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_pinAssignmentsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizer10->Add( m_pinAssignmentsGrid, 1, wxALL|wxEXPAND, 5 );
 
 	m_subcktLabel = new wxStaticText( m_pinAssignmentsPanel, wxID_ANY, _("Reference"), wxDefaultPosition, wxDefaultSize, 0 );
diff --git a/eeschema/dialogs/dialog_sim_model_base.fbp b/eeschema/dialogs/dialog_sim_model_base.fbp
index 30f49be7c6..aa0a3e0686 100644
--- a/eeschema/dialogs/dialog_sim_model_base.fbp
+++ b/eeschema/dialogs/dialog_sim_model_base.fbp
@@ -1960,7 +1960,7 @@
                                             <property name="cell_font"></property>
                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                             <property name="cell_text"></property>
-                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                             <property name="center_pane">0</property>
                                             <property name="close_button">1</property>
                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp
index dc7654e0f6..fde1c770a8 100644
--- a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp
+++ b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp
@@ -149,7 +149,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( 600,240 ) );
 
 	bRightSizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp
index 2ab5db0ccb..bd2cbe050e 100644
--- a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp
+++ b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp
@@ -1349,7 +1349,7 @@
                                                                 <property name="cell_font"></property>
                                                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                                 <property name="cell_text"></property>
-                                                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                                 <property name="center_pane">0</property>
                                                                 <property name="close_button">1</property>
                                                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_symbol_properties_base.cpp b/eeschema/dialogs/dialog_symbol_properties_base.cpp
index e5ab5a845f..8975de2274 100644
--- a/eeschema/dialogs/dialog_symbol_properties_base.cpp
+++ b/eeschema/dialogs/dialog_symbol_properties_base.cpp
@@ -78,7 +78,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent,
 	// Label Appearance
 
 	// Cell Defaults
-	m_fieldsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_fieldsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_fieldsGrid->SetMinSize( wxSize( -1,180 ) );
 
 	sbFields->Add( m_fieldsGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -292,7 +292,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent,
 	// Label Appearance
 
 	// Cell Defaults
-	m_pinGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_pinGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bMargins->Add( m_pinGrid, 1, wxEXPAND|wxALL|wxFIXED_MINSIZE, 5 );
 
 
diff --git a/eeschema/dialogs/dialog_symbol_properties_base.fbp b/eeschema/dialogs/dialog_symbol_properties_base.fbp
index 9bae8a69a3..a2cff17080 100644
--- a/eeschema/dialogs/dialog_symbol_properties_base.fbp
+++ b/eeschema/dialogs/dialog_symbol_properties_base.fbp
@@ -215,7 +215,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -1967,7 +1967,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/dialog_user_defined_signals_base.cpp b/eeschema/dialogs/dialog_user_defined_signals_base.cpp
index 4d6997cc9c..aafb54a50f 100644
--- a/eeschema/dialogs/dialog_user_defined_signals_base.cpp
+++ b/eeschema/dialogs/dialog_user_defined_signals_base.cpp
@@ -52,7 +52,7 @@ DIALOG_USER_DEFINED_SIGNALS_BASE::DIALOG_USER_DEFINED_SIGNALS_BASE( wxWindow* pa
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( -1,120 ) );
 
 	bMainSizer->Add( m_grid, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
diff --git a/eeschema/dialogs/dialog_user_defined_signals_base.fbp b/eeschema/dialogs/dialog_user_defined_signals_base.fbp
index 03420feec3..5648118054 100644
--- a/eeschema/dialogs/dialog_user_defined_signals_base.fbp
+++ b/eeschema/dialogs/dialog_user_defined_signals_base.fbp
@@ -144,7 +144,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/panel_setup_buses_base.cpp b/eeschema/dialogs/panel_setup_buses_base.cpp
index bce68ba227..764c8531f6 100644
--- a/eeschema/dialogs/panel_setup_buses_base.cpp
+++ b/eeschema/dialogs/panel_setup_buses_base.cpp
@@ -53,7 +53,7 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 
 	// Cell Defaults
-	m_aliasesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_aliasesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_aliasesGrid->SetMinSize( wxSize( -1,180 ) );
 
 	bLeftCol->Add( m_aliasesGrid, 1, wxEXPAND, 10 );
@@ -123,7 +123,7 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 
 	// Cell Defaults
-	m_membersGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_membersGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_membersGrid->SetMinSize( wxSize( -1,180 ) );
 
 	bSizer7->Add( m_membersGrid, 1, wxEXPAND, 5 );
diff --git a/eeschema/dialogs/panel_setup_buses_base.fbp b/eeschema/dialogs/panel_setup_buses_base.fbp
index 75eb20f0c0..2edd744caf 100644
--- a/eeschema/dialogs/panel_setup_buses_base.fbp
+++ b/eeschema/dialogs/panel_setup_buses_base.fbp
@@ -170,7 +170,7 @@
                                         <property name="cell_font"></property>
                                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                         <property name="cell_text"></property>
-                                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -695,7 +695,7 @@
                                                             <property name="cell_font"></property>
                                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                             <property name="cell_text"></property>
-                                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                             <property name="center_pane">0</property>
                                                             <property name="close_button">1</property>
                                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp
index 0a456580db..80fd5cc93b 100644
--- a/eeschema/dialogs/panel_sym_lib_table_base.cpp
+++ b/eeschema/dialogs/panel_sym_lib_table_base.cpp
@@ -60,7 +60,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
 	// Label Appearance
 
 	// Cell Defaults
-	m_global_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_global_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_global_sizer->Add( m_global_grid, 5, wxALL|wxEXPAND, 5 );
 
 
@@ -109,7 +109,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
 	// Label Appearance
 
 	// Cell Defaults
-	m_project_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_project_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_project_grid->SetMinSize( wxSize( 600,-1 ) );
 
 	m_project_sizer->Add( m_project_grid, 2, wxALL|wxEXPAND, 5 );
@@ -199,7 +199,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
 	// Label Appearance
 
 	// Cell Defaults
-	m_path_subs_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_path_subs_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_path_subs_grid->SetToolTip( _("This is a read-only table which shows pertinent environment variables.") );
 
 	bMainSizer->Add( m_path_subs_grid, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp
index 8cd9755c72..ea2a4e6b2b 100644
--- a/eeschema/dialogs/panel_sym_lib_table_base.fbp
+++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp
@@ -198,7 +198,7 @@
                                             <property name="cell_font"></property>
                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                             <property name="cell_text"></property>
-                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                             <property name="center_pane">0</property>
                                             <property name="close_button">1</property>
                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -349,7 +349,7 @@
                                             <property name="cell_font"></property>
                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                             <property name="cell_text"></property>
-                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                             <property name="center_pane">0</property>
                                             <property name="close_button">1</property>
                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -998,7 +998,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/dialogs/panel_template_fieldnames_base.cpp b/eeschema/dialogs/panel_template_fieldnames_base.cpp
index 30c8b4d849..b11120719a 100644
--- a/eeschema/dialogs/panel_template_fieldnames_base.cpp
+++ b/eeschema/dialogs/panel_template_fieldnames_base.cpp
@@ -53,7 +53,7 @@ PANEL_TEMPLATE_FIELDNAMES_BASE::PANEL_TEMPLATE_FIELDNAMES_BASE( wxWindow* parent
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( -1,180 ) );
 
 	bPanelSizer->Add( m_grid, 1, wxEXPAND, 10 );
diff --git a/eeschema/dialogs/panel_template_fieldnames_base.fbp b/eeschema/dialogs/panel_template_fieldnames_base.fbp
index f07a36d64a..74e13b478c 100644
--- a/eeschema/dialogs/panel_template_fieldnames_base.fbp
+++ b/eeschema/dialogs/panel_template_fieldnames_base.fbp
@@ -151,7 +151,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/eeschema/sim/simulator_frame_ui_base.cpp b/eeschema/sim/simulator_frame_ui_base.cpp
index d639d05115..68430fbd74 100644
--- a/eeschema/sim/simulator_frame_ui_base.cpp
+++ b/eeschema/sim/simulator_frame_ui_base.cpp
@@ -124,7 +124,7 @@ SIMULATOR_FRAME_UI_BASE::SIMULATOR_FRAME_UI_BASE( wxWindow* parent, wxWindowID i
 	// Label Appearance
 
 	// Cell Defaults
-	m_signalsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_signalsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerSignals->Add( m_signalsGrid, 1, wxEXPAND, 5 );
 
 
@@ -179,7 +179,7 @@ SIMULATOR_FRAME_UI_BASE::SIMULATOR_FRAME_UI_BASE( wxWindow* parent, wxWindowID i
 	// Label Appearance
 
 	// Cell Defaults
-	m_cursorsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_cursorsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerCursors->Add( m_cursorsGrid, 1, wxEXPAND, 5 );
 
 
@@ -232,7 +232,7 @@ SIMULATOR_FRAME_UI_BASE::SIMULATOR_FRAME_UI_BASE( wxWindow* parent, wxWindowID i
 	// Label Appearance
 
 	// Cell Defaults
-	m_measurementsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_measurementsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerMeasurements->Add( m_measurementsGrid, 1, wxEXPAND, 5 );
 
 
diff --git a/eeschema/sim/simulator_frame_ui_base.fbp b/eeschema/sim/simulator_frame_ui_base.fbp
index f4044cae51..4a733d8588 100644
--- a/eeschema/sim/simulator_frame_ui_base.fbp
+++ b/eeschema/sim/simulator_frame_ui_base.fbp
@@ -756,7 +756,7 @@
                                                                 <property name="cell_font"></property>
                                                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                                 <property name="cell_text"></property>
-                                                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                                 <property name="center_pane">0</property>
                                                                 <property name="close_button">1</property>
                                                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -1023,7 +1023,7 @@
                                                                                     <property name="cell_font"></property>
                                                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                                                     <property name="cell_text"></property>
-                                                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                                                     <property name="center_pane">0</property>
                                                                                     <property name="close_button">1</property>
                                                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -1290,7 +1290,7 @@
                                                                                                         <property name="cell_font"></property>
                                                                                                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                                                                         <property name="cell_text"></property>
-                                                                                                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                                                                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                                                                         <property name="center_pane">0</property>
                                                                                                         <property name="close_button">1</property>
                                                                                                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp b/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp
index 3f7d1b31e5..f012038845 100644
--- a/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp
+++ b/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp
@@ -49,7 +49,7 @@ DIALOG_MANAGE_REPOSITORIES_BASE::DIALOG_MANAGE_REPOSITORIES_BASE( wxWindow* pare
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_TopSizer->Add( m_grid, 1, wxEXPAND|wxALL, 5 );
 
 	wxBoxSizer* bButtonsSizer;
diff --git a/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp b/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp
index b7d9ac5f2b..f71fbdc122 100644
--- a/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp
+++ b/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp
@@ -93,7 +93,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/kicad/pcm/dialogs/dialog_pcm_base.cpp b/kicad/pcm/dialogs/dialog_pcm_base.cpp
index 64b380d489..2948472922 100644
--- a/kicad/pcm/dialogs/dialog_pcm_base.cpp
+++ b/kicad/pcm/dialogs/dialog_pcm_base.cpp
@@ -35,7 +35,7 @@ DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	bSizer6->Add( m_choiceRepository, 1, wxALIGN_CENTER|wxALL, 5 );
 
 	m_buttonManage = new wxButton( m_panelRepository, wxID_ANY, _("Manage..."), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer6->Add( m_buttonManage, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer6->Add( m_buttonManage, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
 	bSizer4->Add( bSizer6, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -97,7 +97,7 @@ DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridPendingActions->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_gridPendingActions->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizer8->Add( m_gridPendingActions, 1, wxEXPAND|wxALL, 5 );
 
 	wxBoxSizer* bSizer9;
@@ -135,7 +135,7 @@ DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	m_BottomSizer->Add( m_installLocalButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 	m_openPackageDirButton = new wxButton( this, wxID_ANY, _("Open Package Directory"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_BottomSizer->Add( m_openPackageDirButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_BottomSizer->Add( m_openPackageDirButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
 	m_BottomSizer->Add( 0, 0, 1, 0, 5 );
diff --git a/kicad/pcm/dialogs/dialog_pcm_base.fbp b/kicad/pcm/dialogs/dialog_pcm_base.fbp
index 6aa89bd174..7811530799 100644
--- a/kicad/pcm/dialogs/dialog_pcm_base.fbp
+++ b/kicad/pcm/dialogs/dialog_pcm_base.fbp
@@ -263,7 +263,7 @@
                                                     </object>
                                                     <object class="sizeritem" expanded="1">
                                                         <property name="border">5</property>
-                                                        <property name="flag">wxALL</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                         <property name="proportion">0</property>
                                                         <object class="wxButton" expanded="1">
                                                             <property name="BottomDockable">1</property>
@@ -545,7 +545,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -872,7 +872,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALL</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                             <property name="proportion">0</property>
                             <object class="wxButton" expanded="1">
                                 <property name="BottomDockable">1</property>
diff --git a/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp b/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp
index e16824ccda..b33d42d518 100644
--- a/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp
+++ b/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp
@@ -48,7 +48,7 @@ DIALOG_INSPECTOR_BASE::DIALOG_INSPECTOR_BASE( wxWindow* parent, wxWindowID id, c
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridListItems->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_gridListItems->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerListMain->Add( m_gridListItems, 1, wxALL|wxEXPAND, 5 );
 
 
diff --git a/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp b/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp
index 11c40ff3d7..dcf3ed614b 100644
--- a/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp
+++ b/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp
@@ -144,7 +144,7 @@
                                     <property name="cell_font"></property>
                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                     <property name="cell_text"></property>
-                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                     <property name="center_pane">0</property>
                                     <property name="close_button">1</property>
                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.cpp
index be623b421d..06a5bbdd4b 100644
--- a/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.cpp
@@ -111,7 +111,7 @@ PANEL_ELECTRICAL_SPACING_IPC2221_BASE::PANEL_ELECTRICAL_SPACING_IPC2221_BASE( wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridElectricalSpacingValues->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP );
+	m_gridElectricalSpacingValues->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 	m_electricalSpacingSizer->Add( m_gridElectricalSpacingValues, 0, wxALL, 5 );
 
 	m_stHelp = new wxStaticText( this, wxID_ANY, _("*  B1 - Internal Conductors\n*  B2 - External Conductors, uncoated, sea level to 3050 m\n*  B3 - External Conductors, uncoated, over 3050 m\n*  B4 - External Conductors, with permanent polymer coating (any elevation)\n*  A5 - External Conductors, with conformal coating over assembly (any elevation)\n*  A6 - External Component lead/termination, uncoated\n*  A7 - External Component lead termination, with conformal coating (any elevation)"), wxDefaultPosition, wxDefaultSize, 0 );
diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.fbp b/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.fbp
index ae16b7f27e..41db27cfec 100644
--- a/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_ipc2221_base.fbp
@@ -496,7 +496,7 @@
                                 <property name="enabled">1</property>
                                 <property name="fg"></property>
                                 <property name="floatable">1</property>
-                                <property name="font">,93,92,-1,70,0</property>
+                                <property name="font">,93,700,-1,70,0</property>
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
@@ -552,7 +552,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_CENTER</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/dialog_board_statistics_base.cpp b/pcbnew/dialogs/dialog_board_statistics_base.cpp
index 93a3c52d31..f06e190bc6 100644
--- a/pcbnew/dialogs/dialog_board_statistics_base.cpp
+++ b/pcbnew/dialogs/dialog_board_statistics_base.cpp
@@ -63,7 +63,7 @@ DIALOG_BOARD_STATISTICS_BASE::DIALOG_BOARD_STATISTICS_BASE( wxWindow* parent, wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridComponents->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP );
+	m_gridComponents->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 	m_gridComponents->SetMaxSize( wxSize( -1,300 ) );
 
 	bSizerComponents->Add( m_gridComponents, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
@@ -102,7 +102,7 @@ DIALOG_BOARD_STATISTICS_BASE::DIALOG_BOARD_STATISTICS_BASE( wxWindow* parent, wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridPads->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP );
+	m_gridPads->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 	m_gridPads->SetMaxSize( wxSize( -1,300 ) );
 
 	bSizerPads->Add( m_gridPads, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -141,7 +141,7 @@ DIALOG_BOARD_STATISTICS_BASE::DIALOG_BOARD_STATISTICS_BASE( wxWindow* parent, wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridBoard->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP );
+	m_gridBoard->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 	m_gridBoard->SetMaxSize( wxSize( -1,300 ) );
 
 	bSizerBrdSize->Add( m_gridBoard, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
@@ -179,7 +179,7 @@ DIALOG_BOARD_STATISTICS_BASE::DIALOG_BOARD_STATISTICS_BASE( wxWindow* parent, wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridVias->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP );
+	m_gridVias->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 	m_gridVias->SetMaxSize( wxSize( -1,300 ) );
 
 	bSizerVias->Add( m_gridVias, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
@@ -243,7 +243,7 @@ DIALOG_BOARD_STATISTICS_BASE::DIALOG_BOARD_STATISTICS_BASE( wxWindow* parent, wx
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridDrills->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP );
+	m_gridDrills->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 	bDrillsSizer->Add( m_gridDrills, 1, wxALL|wxEXPAND, 5 );
 
 
diff --git a/pcbnew/dialogs/dialog_board_statistics_base.fbp b/pcbnew/dialogs/dialog_board_statistics_base.fbp
index 96994691be..e430a12a0e 100644
--- a/pcbnew/dialogs/dialog_board_statistics_base.fbp
+++ b/pcbnew/dialogs/dialog_board_statistics_base.fbp
@@ -288,7 +288,7 @@
                                                             <property name="cell_font"></property>
                                                             <property name="cell_horiz_alignment">wxALIGN_CENTER</property>
                                                             <property name="cell_text"></property>
-                                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                             <property name="center_pane">0</property>
                                                             <property name="close_button">1</property>
                                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -448,7 +448,7 @@
                                                             <property name="cell_font"></property>
                                                             <property name="cell_horiz_alignment">wxALIGN_CENTER</property>
                                                             <property name="cell_text"></property>
-                                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                             <property name="center_pane">0</property>
                                                             <property name="close_button">1</property>
                                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -608,7 +608,7 @@
                                                             <property name="cell_font"></property>
                                                             <property name="cell_horiz_alignment">wxALIGN_CENTER</property>
                                                             <property name="cell_text"></property>
-                                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                             <property name="center_pane">0</property>
                                                             <property name="close_button">1</property>
                                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -768,7 +768,7 @@
                                                             <property name="cell_font"></property>
                                                             <property name="cell_horiz_alignment">wxALIGN_CENTER</property>
                                                             <property name="cell_text"></property>
-                                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                             <property name="center_pane">0</property>
                                                             <property name="close_button">1</property>
                                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -1067,7 +1067,7 @@
                                             <property name="cell_font"></property>
                                             <property name="cell_horiz_alignment">wxALIGN_CENTER</property>
                                             <property name="cell_text"></property>
-                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                             <property name="center_pane">0</property>
                                             <property name="close_button">1</property>
                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/dialog_footprint_associations_base.cpp b/pcbnew/dialogs/dialog_footprint_associations_base.cpp
index 4b3bc44ad5..b11a6a4878 100644
--- a/pcbnew/dialogs/dialog_footprint_associations_base.cpp
+++ b/pcbnew/dialogs/dialog_footprint_associations_base.cpp
@@ -51,7 +51,7 @@ DIALOG_FOOTPRINT_ASSOCIATIONS_BASE::DIALOG_FOOTPRINT_ASSOCIATIONS_BASE( wxWindow
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridLibrary->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_gridLibrary->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_gridLibrary->SetMaxSize( wxSize( -1,300 ) );
 
 	bMainBoxSizer->Add( m_gridLibrary, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 10 );
@@ -92,7 +92,7 @@ DIALOG_FOOTPRINT_ASSOCIATIONS_BASE::DIALOG_FOOTPRINT_ASSOCIATIONS_BASE( wxWindow
 	// Label Appearance
 
 	// Cell Defaults
-	m_gridSymbol->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_gridSymbol->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bMainBoxSizer->Add( m_gridSymbol, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
 
 	wxBoxSizer* bSizerBottom;
diff --git a/pcbnew/dialogs/dialog_footprint_associations_base.fbp b/pcbnew/dialogs/dialog_footprint_associations_base.fbp
index 2cc8308f9c..2575d40adb 100644
--- a/pcbnew/dialogs/dialog_footprint_associations_base.fbp
+++ b/pcbnew/dialogs/dialog_footprint_associations_base.fbp
@@ -156,7 +156,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -325,7 +325,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/dialog_footprint_properties_base.cpp b/pcbnew/dialogs/dialog_footprint_properties_base.cpp
index 1fb7c5ecd8..6e03059901 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties_base.cpp
@@ -74,7 +74,7 @@ DIALOG_FOOTPRINT_PROPERTIES_BASE::DIALOG_FOOTPRINT_PROPERTIES_BASE( wxWindow* pa
 	// Label Appearance
 
 	// Cell Defaults
-	m_itemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_itemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_itemsGrid->SetMinSize( wxSize( 800,140 ) );
 
 	sbSizerTexts->Add( m_itemsGrid, 1, wxALL|wxBOTTOM|wxEXPAND, 5 );
diff --git a/pcbnew/dialogs/dialog_footprint_properties_base.fbp b/pcbnew/dialogs/dialog_footprint_properties_base.fbp
index a5e8286dee..826eaf904a 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_footprint_properties_base.fbp
@@ -216,7 +216,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp
index d2d7a28831..d3fb34f9d1 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -74,7 +74,7 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR_BASE::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITO
 	// Label Appearance
 
 	// Cell Defaults
-	m_itemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_itemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_itemsGrid->SetMinSize( wxSize( 800,140 ) );
 
 	sbSizerTexts->Add( m_itemsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
@@ -159,7 +159,7 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR_BASE::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITO
 	// Label Appearance
 
 	// Cell Defaults
-	m_privateLayersGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_privateLayersGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerPrivateLayers->Add( m_privateLayersGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	wxBoxSizer* bButtonSize1;
@@ -369,7 +369,7 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR_BASE::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITO
 	// Label Appearance
 
 	// Cell Defaults
-	m_padGroupsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_padGroupsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_padGroupsGrid->SetMinSize( wxSize( -1,30 ) );
 
 	sbSizerNetTies->Add( m_padGroupsGrid, 1, wxALL|wxEXPAND, 5 );
diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp
index 057a22deab..7958c91640 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp
+++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp
@@ -215,7 +215,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -890,7 +890,7 @@
                                                             <property name="cell_font"></property>
                                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                             <property name="cell_text"></property>
-                                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                             <property name="center_pane">0</property>
                                                             <property name="close_button">1</property>
                                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -2976,7 +2976,7 @@
                                                     <property name="cell_font"></property>
                                                     <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                     <property name="cell_text"></property>
-                                                    <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                    <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                     <property name="center_pane">0</property>
                                                     <property name="close_button">1</property>
                                                     <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp b/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp
index 92fc75e788..2f6feea11d 100644
--- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp
+++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp
@@ -53,7 +53,7 @@ DIALOG_FOOTPRINT_WIZARD_LIST_BASE::DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow*
 	// Label Appearance
 
 	// Cell Defaults
-	m_footprintGeneratorsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_footprintGeneratorsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_footprintGeneratorsGrid->SetMinSize( wxSize( 485,120 ) );
 
 	bSizerpanelGen->Add( m_footprintGeneratorsGrid, 1, wxALL|wxEXPAND, 5 );
diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp b/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp
index b684f844b6..f9a9cc6ac9 100644
--- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp
+++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp
@@ -201,7 +201,7 @@
                                             <property name="cell_font"></property>
                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                             <property name="cell_text"></property>
-                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                             <property name="center_pane">0</property>
                                             <property name="close_button">1</property>
                                             <property name="col_label_horiz_alignment">wxALIGN_LEFT</property>
diff --git a/pcbnew/dialogs/dialog_layer_selection_base.cpp b/pcbnew/dialogs/dialog_layer_selection_base.cpp
index 9691ea4f93..ed8ad4f229 100644
--- a/pcbnew/dialogs/dialog_layer_selection_base.cpp
+++ b/pcbnew/dialogs/dialog_layer_selection_base.cpp
@@ -45,7 +45,7 @@ DIALOG_LAYER_SELECTION_BASE::DIALOG_LAYER_SELECTION_BASE( wxWindow* parent, wxWi
 	// Label Appearance
 
 	// Cell Defaults
-	m_leftGridLayers->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_leftGridLayers->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerUpper->Add( m_leftGridLayers, 1, wxALL|wxEXPAND, 5 );
 
 	m_rightGridLayers = new wxGrid( this, ID_RIGHT_LIST, wxDefaultPosition, wxDefaultSize, 0 );
@@ -74,7 +74,7 @@ DIALOG_LAYER_SELECTION_BASE::DIALOG_LAYER_SELECTION_BASE( wxWindow* parent, wxWi
 	// Label Appearance
 
 	// Cell Defaults
-	m_rightGridLayers->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_rightGridLayers->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerUpper->Add( m_rightGridLayers, 1, wxALL|wxEXPAND, 5 );
 
 
diff --git a/pcbnew/dialogs/dialog_layer_selection_base.fbp b/pcbnew/dialogs/dialog_layer_selection_base.fbp
index 73c693c8d3..a1a5105016 100644
--- a/pcbnew/dialogs/dialog_layer_selection_base.fbp
+++ b/pcbnew/dialogs/dialog_layer_selection_base.fbp
@@ -94,7 +94,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -184,7 +184,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/dialog_swap_layers_base.fbp b/pcbnew/dialogs/dialog_swap_layers_base.fbp
index f1c20d88df..b1a24b19be 100644
--- a/pcbnew/dialogs/dialog_swap_layers_base.fbp
+++ b/pcbnew/dialogs/dialog_swap_layers_base.fbp
@@ -125,7 +125,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
diff --git a/pcbnew/dialogs/panel_fp_editor_defaults_base.cpp b/pcbnew/dialogs/panel_fp_editor_defaults_base.cpp
index e9c64dd477..808dfa2884 100644
--- a/pcbnew/dialogs/panel_fp_editor_defaults_base.cpp
+++ b/pcbnew/dialogs/panel_fp_editor_defaults_base.cpp
@@ -61,7 +61,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
 	// Label Appearance
 
 	// Cell Defaults
-	m_textItemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_textItemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_textItemsGrid->SetMinSize( wxSize( -1,140 ) );
 
 	defaultTextItemsSizer->Add( m_textItemsGrid, 1, wxEXPAND|wxBOTTOM, 5 );
@@ -148,7 +148,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
 	// Label Appearance
 
 	// Cell Defaults
-	m_graphicsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_graphicsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	defaultPropertiesSizer->Add( m_graphicsGrid, 1, wxEXPAND|wxBOTTOM, 1 );
 
 
diff --git a/pcbnew/dialogs/panel_fp_editor_defaults_base.fbp b/pcbnew/dialogs/panel_fp_editor_defaults_base.fbp
index 52c19e600f..5156f50377 100644
--- a/pcbnew/dialogs/panel_fp_editor_defaults_base.fbp
+++ b/pcbnew/dialogs/panel_fp_editor_defaults_base.fbp
@@ -169,7 +169,7 @@
                                         <property name="cell_font"></property>
                                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                         <property name="cell_text"></property>
-                                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -590,7 +590,7 @@
                                         <property name="cell_font"></property>
                                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                         <property name="cell_text"></property>
-                                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
                                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp
index 9ed7a95a05..52a657b5f2 100644
--- a/pcbnew/dialogs/panel_fp_lib_table_base.cpp
+++ b/pcbnew/dialogs/panel_fp_lib_table_base.cpp
@@ -59,7 +59,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i
 	// Label Appearance
 
 	// Cell Defaults
-	m_global_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_global_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_global_sizer->Add( m_global_grid, 1, wxALL|wxEXPAND, 5 );
 
 
@@ -108,7 +108,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i
 	// Label Appearance
 
 	// Cell Defaults
-	m_project_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_project_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_project_sizer->Add( m_project_grid, 1, wxALL|wxEXPAND, 5 );
 
 
@@ -193,7 +193,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i
 	// Label Appearance
 
 	// Cell Defaults
-	m_path_subs_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_path_subs_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_path_subs_grid->SetToolTip( _("This is a read-only table which shows pertinent environment variables.") );
 
 	bMainSizer->Add( m_path_subs_grid, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp
index 54ce4b5dcb..1bac5d96a4 100644
--- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp
+++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp
@@ -198,7 +198,7 @@
                                             <property name="cell_font"></property>
                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                             <property name="cell_text"></property>
-                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                             <property name="center_pane">0</property>
                                             <property name="close_button">1</property>
                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -349,7 +349,7 @@
                                             <property name="cell_font"></property>
                                             <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                             <property name="cell_text"></property>
-                                            <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                            <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                             <property name="center_pane">0</property>
                                             <property name="close_button">1</property>
                                             <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -976,7 +976,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/panel_fp_properties_3d_model_base.cpp b/pcbnew/dialogs/panel_fp_properties_3d_model_base.cpp
index e43df3820c..74c5fe4e98 100644
--- a/pcbnew/dialogs/panel_fp_properties_3d_model_base.cpp
+++ b/pcbnew/dialogs/panel_fp_properties_3d_model_base.cpp
@@ -45,7 +45,7 @@ PANEL_FP_PROPERTIES_3D_MODEL_BASE::PANEL_FP_PROPERTIES_3D_MODEL_BASE( wxWindow*
 	// Label Appearance
 
 	// Cell Defaults
-	m_modelsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_modelsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerMain3D->Add( m_modelsGrid, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
 	wxBoxSizer* bSizer3DButtons;
diff --git a/pcbnew/dialogs/panel_fp_properties_3d_model_base.fbp b/pcbnew/dialogs/panel_fp_properties_3d_model_base.fbp
index c640415f2b..682ab19edf 100644
--- a/pcbnew/dialogs/panel_fp_properties_3d_model_base.fbp
+++ b/pcbnew/dialogs/panel_fp_properties_3d_model_base.fbp
@@ -82,7 +82,7 @@
                         <property name="cell_font"></property>
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                         <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                        <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
                         <property name="col_label_horiz_alignment">wxALIGN_LEFT</property>
diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp b/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp
index d31cbb5edd..9d92dafb84 100644
--- a/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp
+++ b/pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp
@@ -69,7 +69,7 @@ PANEL_SETUP_TEXT_AND_GRAPHICS_BASE::PANEL_SETUP_TEXT_AND_GRAPHICS_BASE( wxWindow
 	// Label Appearance
 
 	// Cell Defaults
-	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_gridSizer->Add( m_grid, 0, wxBOTTOM, 15 );
 
 
diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp b/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp
index e3b3ef0e18..8e9b63025e 100644
--- a/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp
+++ b/pcbnew/dialogs/panel_setup_text_and_graphics_base.fbp
@@ -218,7 +218,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
index feab6f4ee4..90b99c3a50 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
@@ -57,7 +57,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	// Label Appearance
 
 	// Cell Defaults
-	m_trackWidthsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_trackWidthsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerTracks->Add( m_trackWidthsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 	wxBoxSizer* bSizer3;
@@ -122,7 +122,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	// Label Appearance
 
 	// Cell Defaults
-	m_viaSizesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_viaSizesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerVias->Add( m_viaSizesGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 	wxBoxSizer* bSizer4;
@@ -189,7 +189,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 
 	// Cell Defaults
 	m_diffPairsGrid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_diffPairsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_diffPairsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizerDiffPairs->Add( m_diffPairsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 	wxBoxSizer* bSizer5;
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
index 741d295008..e29d2834cc 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
@@ -150,7 +150,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -553,7 +553,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
@@ -956,7 +956,7 @@
                                 <property name="cell_font"></property>
                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                 <property name="cell_text"></property>
-                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                 <property name="center_pane">0</property>
                                 <property name="close_button">1</property>
                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
diff --git a/pcbnew/widgets/appearance_controls_base.cpp b/pcbnew/widgets/appearance_controls_base.cpp
index ec0b91f6c9..cec3451677 100644
--- a/pcbnew/widgets/appearance_controls_base.cpp
+++ b/pcbnew/widgets/appearance_controls_base.cpp
@@ -101,7 +101,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
 	// Label Appearance
 
 	// Cell Defaults
-	m_netsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	m_netsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	bSizer192->Add( m_netsGrid, 0, wxALL|wxEXPAND, 5 );
 
 
diff --git a/pcbnew/widgets/appearance_controls_base.fbp b/pcbnew/widgets/appearance_controls_base.fbp
index 62e2b20266..711dd8d5e2 100644
--- a/pcbnew/widgets/appearance_controls_base.fbp
+++ b/pcbnew/widgets/appearance_controls_base.fbp
@@ -771,7 +771,7 @@
                                                                 <property name="cell_font"></property>
                                                                 <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
                                                                 <property name="cell_text"></property>
-                                                                <property name="cell_vert_alignment">wxALIGN_TOP</property>
+                                                                <property name="cell_vert_alignment">wxALIGN_CENTER</property>
                                                                 <property name="center_pane">0</property>
                                                                 <property name="close_button">1</property>
                                                                 <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>