diff --git a/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp
index 8b9d328431..6485c37277 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Aug  4 2017)
+// C++ code generated with wxFormBuilder (version Apr 19 2018)
 // http://www.wxformbuilder.org/
 //
-// PLEASE DO "NOT" EDIT THIS FILE!
+// PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
 #include "pcb_layer_box_selector.h"
@@ -103,13 +103,13 @@ DIALOG_EDIT_FPTEXT_BASE::DIALOG_EDIT_FPTEXT_BASE( wxWindow* parent, wxWindowID i
 	
 	wxString m_ShowChoices[] = { _("Visible"), _("Invisible") };
 	int m_ShowNChoices = sizeof( m_ShowChoices ) / sizeof( wxString );
-	m_Show = new wxRadioBox( this, wxID_ANY, _("Display"), wxDefaultPosition, wxDefaultSize, m_ShowNChoices, m_ShowChoices, 1, wxRA_SPECIFY_COLS );
+	m_Show = new wxRadioBox( this, wxID_ANY, _("Display:"), wxDefaultPosition, wxDefaultSize, m_ShowNChoices, m_ShowChoices, 1, wxRA_SPECIFY_COLS );
 	m_Show->SetSelection( 0 );
 	bSizer5->Add( m_Show, 1, wxEXPAND|wxRIGHT, 5 );
 	
 	wxString m_StyleChoices[] = { _("Normal"), _("Italic") };
 	int m_StyleNChoices = sizeof( m_StyleChoices ) / sizeof( wxString );
-	m_Style = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS );
+	m_Style = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS );
 	m_Style->SetSelection( 1 );
 	bSizer5->Add( m_Style, 1, wxEXPAND|wxLEFT, 5 );
 	
@@ -118,7 +118,7 @@ DIALOG_EDIT_FPTEXT_BASE::DIALOG_EDIT_FPTEXT_BASE( wxWindow* parent, wxWindowID i
 	
 	wxString m_OrientChoices[] = { _("0.0"), _("+90.0"), _("-90.0"), _("180.0"), _("Other") };
 	int m_OrientNChoices = sizeof( m_OrientChoices ) / sizeof( wxString );
-	m_Orient = new wxRadioBox( this, wxID_ANY, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientNChoices, m_OrientChoices, 1, wxRA_SPECIFY_COLS );
+	m_Orient = new wxRadioBox( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, m_OrientNChoices, m_OrientChoices, 1, wxRA_SPECIFY_COLS );
 	m_Orient->SetSelection( 2 );
 	bSizer4->Add( m_Orient, 0, wxALL|wxEXPAND, 5 );
 	
diff --git a/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp
index 3841f9e6b0..759f505745 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp
+++ b/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp
@@ -14,6 +14,7 @@
         <property name="file">dialog_edit_footprint_text_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">dialog_edit_footprint_text_base</property>
         <property name="namespace"></property>
@@ -1530,11 +1531,11 @@
                                         <property name="name">bSizer4</property>
                                         <property name="orient">wxVERTICAL</property>
                                         <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="0">
+                                        <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
                                             <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxBoxSizer" expanded="0">
+                                            <object class="wxBoxSizer" expanded="1">
                                                 <property name="minimum_size"></property>
                                                 <property name="name">bSizer5</property>
                                                 <property name="orient">wxHORIZONTAL</property>
@@ -1572,7 +1573,7 @@
                                                         <property name="gripper">0</property>
                                                         <property name="hidden">0</property>
                                                         <property name="id">wxID_ANY</property>
-                                                        <property name="label">Display</property>
+                                                        <property name="label">Display:</property>
                                                         <property name="majorDimension">1</property>
                                                         <property name="max_size"></property>
                                                         <property name="maximize_button">0</property>
@@ -1662,7 +1663,7 @@
                                                         <property name="gripper">0</property>
                                                         <property name="hidden">0</property>
                                                         <property name="id">wxID_ANY</property>
-                                                        <property name="label">Style</property>
+                                                        <property name="label">Style:</property>
                                                         <property name="majorDimension">1</property>
                                                         <property name="max_size"></property>
                                                         <property name="maximize_button">0</property>
@@ -1754,7 +1755,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">Orientation</property>
+                                                <property name="label">Orientation:</property>
                                                 <property name="majorDimension">1</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
diff --git a/pcbnew/dialogs/dialog_edit_footprint_text_base.h b/pcbnew/dialogs/dialog_edit_footprint_text_base.h
index 5bc5c63117..825fcac4cc 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_text_base.h
+++ b/pcbnew/dialogs/dialog_edit_footprint_text_base.h
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Aug  4 2017)
+// C++ code generated with wxFormBuilder (version Apr 19 2018)
 // http://www.wxformbuilder.org/
 //
-// PLEASE DO "NOT" EDIT THIS FILE!
+// PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOG_EDIT_FOOTPRINT_TEXT_BASE_H__
@@ -11,7 +11,6 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-class DIALOG_SHIM;
 class PCB_LAYER_BOX_SELECTOR;
 class TEXT_CTRL_EVAL;