diff --git a/common/dialogs/dialog_text_entry.cpp b/common/dialogs/dialog_text_entry.cpp
index 325ec7741b..6c3bf9b1c5 100644
--- a/common/dialogs/dialog_text_entry.cpp
+++ b/common/dialogs/dialog_text_entry.cpp
@@ -38,9 +38,12 @@ WX_TEXT_ENTRY_DIALOG::WX_TEXT_ENTRY_DIALOG( wxWindow* aParent,
 }
 
 
-WX_TEXT_ENTRY_DIALOG::WX_TEXT_ENTRY_DIALOG( wxWindow* aParent, const wxString& aLabel, const wxString& aCaption,
-                      const wxString& aDefaultValue, const wxString& aChoiceCaption,
-                      const std::vector<wxString>& aChoices, int aDefaultChoice ) :
+WX_TEXT_ENTRY_DIALOG::WX_TEXT_ENTRY_DIALOG( wxWindow* aParent, const wxString& aLabel,
+                                            const wxString& aCaption,
+                                            const wxString& aDefaultValue,
+                                            const wxString& aChoiceCaption,
+                                            const std::vector<wxString>& aChoices,
+                                            int aDefaultChoice ) :
               WX_TEXT_ENTRY_DIALOG( aParent, aLabel, aCaption, aDefaultValue )
 {
     m_choiceLabel->SetLabel( aChoiceCaption );
diff --git a/common/dialogs/dialog_text_entry_base.fbp b/common/dialogs/dialog_text_entry_base.fbp
index 921ee9a765..d3d8b08c59 100644
--- a/common/dialogs/dialog_text_entry_base.fbp
+++ b/common/dialogs/dialog_text_entry_base.fbp
@@ -14,7 +14,6 @@
         <property name="file">dialog_text_entry_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">dialog_text_entry_base</property>
@@ -26,7 +25,6 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -205,8 +203,8 @@
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
-                                    <property name="proportion">2</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT</property>
+                                    <property name="proportion">0</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
@@ -266,7 +264,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">3</property>
                                     <object class="wxChoice" expanded="1">
                                         <property name="BottomDockable">1</property>
diff --git a/pcbnew/dialogs/panel_setup_constraints_base.cpp b/pcbnew/dialogs/panel_setup_constraints_base.cpp
index 378dd35402..4b08cb33dd 100644
--- a/pcbnew/dialogs/panel_setup_constraints_base.cpp
+++ b/pcbnew/dialogs/panel_setup_constraints_base.cpp
@@ -264,7 +264,7 @@ PANEL_SETUP_CONSTRAINTS_BASE::PANEL_SETUP_CONSTRAINTS_BASE( wxWindow* parent, wx
 
 	m_HoleClearanceUnits = new wxStaticText( m_scrolledWindow, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_HoleClearanceUnits->Wrap( -1 );
-	fgFeatureConstraints->Add( m_HoleClearanceUnits, 0, wxALL, 5 );
+	fgFeatureConstraints->Add( m_HoleClearanceUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_bitmapEdgeClearance = new wxStaticBitmap( m_scrolledWindow, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgFeatureConstraints->Add( m_bitmapEdgeClearance, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
diff --git a/pcbnew/dialogs/panel_setup_constraints_base.fbp b/pcbnew/dialogs/panel_setup_constraints_base.fbp
index e8b5ce78da..13d22665c1 100644
--- a/pcbnew/dialogs/panel_setup_constraints_base.fbp
+++ b/pcbnew/dialogs/panel_setup_constraints_base.fbp
@@ -2809,7 +2809,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxALL</property>
+                                                <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxStaticText" expanded="0">
                                                     <property name="BottomDockable">1</property>
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index 25b9a18f10..7b302820e6 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -1134,7 +1134,8 @@ FOOTPRINT* PCB_BASE_FRAME::CreateNewFootprint( const wxString& aFootprintName, b
     {
         WX_TEXT_ENTRY_DIALOG dlg( this, _( "Enter footprint name:" ), _( "New Footprint" ),
                                   footprintName, _( "Footprint type:" ),
-                                  { _( "Through hole" ), _( "SMD" ), _( "Other" ) }, footprintType );
+                                  { _( "Through hole" ), _( "SMD" ), _( "Other" ) },
+                                  footprintType );
         dlg.SetTextValidator( FOOTPRINT_NAME_VALIDATOR( &footprintName ) );
 
         if( dlg.ShowModal() != wxID_OK )