From 07470efc0b124c27623f0bde7feb4c89b6f049cc Mon Sep 17 00:00:00 2001
From: Alex Shvartzkop <dudesuchamazing@gmail.com>
Date: Mon, 27 May 2024 00:12:51 +0300
Subject: [PATCH] Autosize bitmap buttons in wxFB.

---
 .../dialogs/dialog_field_properties_base.cpp  |  32 +-
 .../dialogs/dialog_field_properties_base.fbp  |  30 +-
 .../dialogs/dialog_field_properties_base.h    |   2 +-
 .../dialogs/dialog_label_properties_base.cpp  |  20 +-
 .../dialogs/dialog_label_properties_base.fbp  |  18 +-
 .../dialogs/dialog_label_properties_base.h    |   2 +-
 .../dialog_sheet_pin_properties_base.cpp      |  10 +-
 .../dialog_sheet_pin_properties_base.fbp      |   8 +-
 .../dialog_sheet_pin_properties_base.h        |   2 +-
 .../dialog_tablecell_properties_base.cpp      |  14 +-
 .../dialog_tablecell_properties_base.fbp      |  12 +-
 .../dialog_tablecell_properties_base.h        |   2 +-
 .../dialogs/dialog_text_properties_base.cpp   |  32 +-
 .../dialogs/dialog_text_properties_base.fbp   |  30 +-
 .../dialogs/dialog_text_properties_base.h     |   2 +-
 eeschema/widgets/tuner_slider_base.cpp        |  12 +-
 eeschema/widgets/tuner_slider_base.fbp        |  10 +-
 eeschema/widgets/tuner_slider_base.h          |   2 +-
 .../dialogs/properties_frame_base.cpp         |  26 +-
 .../dialogs/properties_frame_base.fbp         |  22 +-
 .../dialogs/properties_frame_base.h           |   2 +-
 .../dialog_dimension_properties_base.cpp      |  22 +-
 .../dialog_dimension_properties_base.fbp      |  20 +-
 .../dialog_dimension_properties_base.h        |   2 +-
 .../dialog_tablecell_properties_base.cpp      |  14 +-
 .../dialog_tablecell_properties_base.fbp      |  12 +-
 .../dialog_tablecell_properties_base.h        |   2 +-
 .../dialogs/dialog_text_properties_base.cpp   |  26 +-
 .../dialogs/dialog_text_properties_base.fbp   |  24 +-
 pcbnew/dialogs/dialog_text_properties_base.h  |   2 +-
 .../dialog_textbox_properties_base.cpp        |  22 +-
 .../dialog_textbox_properties_base.fbp        |  20 +-
 .../dialogs/dialog_textbox_properties_base.h  |   2 +-
 pcbnew/dialogs/panel_setup_rules_base.cpp     |   4 +-
 pcbnew/dialogs/panel_setup_rules_base.fbp     | 856 +++++++++---------
 pcbnew/dialogs/panel_setup_rules_base.h       |   2 +-
 36 files changed, 663 insertions(+), 657 deletions(-)

diff --git a/eeschema/dialogs/dialog_field_properties_base.cpp b/eeschema/dialogs/dialog_field_properties_base.cpp
index bf44484b91..0ab433902e 100644
--- a/eeschema/dialogs/dialog_field_properties_base.cpp
+++ b/eeschema/dialogs/dialog_field_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -129,77 +129,77 @@ DIALOG_FIELD_PROPERTIES_BASE::DIALOG_FIELD_PROPERTIES_BASE( wxWindow* parent, wx
 	wxBoxSizer* formattingSizer;
 	formattingSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator1->Enable( false );
 
 	formattingSizer->Add( m_separator1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_bold->SetToolTip( _("Bold") );
 
 	formattingSizer->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_italic->SetToolTip( _("Italic") );
 
 	formattingSizer->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	formattingSizer->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignLeft->SetToolTip( _("Align left") );
 
 	formattingSizer->Add( m_hAlignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignCenter->SetToolTip( _("Align horizontal center") );
 
 	formattingSizer->Add( m_hAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignRight->SetToolTip( _("Align right") );
 
 	formattingSizer->Add( m_hAlignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator3->Enable( false );
 
 	formattingSizer->Add( m_separator3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignTop->SetToolTip( _("Align top") );
 
 	formattingSizer->Add( m_vAlignTop, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignCenter->SetToolTip( _("Align vertical center") );
 
 	formattingSizer->Add( m_vAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignBottom->SetToolTip( _("Align bottom") );
 
 	formattingSizer->Add( m_vAlignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator4 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator4 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator4->Enable( false );
 
 	formattingSizer->Add( m_separator4, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_horizontal = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_horizontal = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_horizontal->SetToolTip( _("Horizontal text") );
 
 	formattingSizer->Add( m_horizontal, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vertical = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vertical = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vertical->SetToolTip( _("Vertical text") );
 
 	formattingSizer->Add( m_vertical, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator5 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator5 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator5->Enable( false );
 
 	formattingSizer->Add( m_separator5, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/eeschema/dialogs/dialog_field_properties_base.fbp b/eeschema/dialogs/dialog_field_properties_base.fbp
index e5dc2c471e..ac1207cbd0 100644
--- a/eeschema/dialogs/dialog_field_properties_base.fbp
+++ b/eeschema/dialogs/dialog_field_properties_base.fbp
@@ -875,7 +875,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -949,7 +949,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1023,7 +1023,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1097,7 +1097,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1171,7 +1171,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1245,7 +1245,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1319,7 +1319,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1393,7 +1393,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1467,7 +1467,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1541,7 +1541,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1615,7 +1615,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1689,7 +1689,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1763,7 +1763,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1837,7 +1837,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -1911,7 +1911,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
diff --git a/eeschema/dialogs/dialog_field_properties_base.h b/eeschema/dialogs/dialog_field_properties_base.h
index c9c7af8fcd..36525902cb 100644
--- a/eeschema/dialogs/dialog_field_properties_base.h
+++ b/eeschema/dialogs/dialog_field_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_label_properties_base.cpp b/eeschema/dialogs/dialog_label_properties_base.cpp
index f3dd5994c2..9f3ec690f0 100644
--- a/eeschema/dialogs/dialog_label_properties_base.cpp
+++ b/eeschema/dialogs/dialog_label_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -200,42 +200,42 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx
 
 	m_iconBar = new wxBoxSizer( wxHORIZONTAL );
 
-	m_separator1 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator1 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator1->Enable( false );
 
 	m_iconBar->Add( m_separator1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-	m_bold = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_bold->SetToolTip( _("Bold") );
 
 	m_iconBar->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_italic->SetToolTip( _("Italic") );
 
 	m_iconBar->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	m_iconBar->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_spin0 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_spin0 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_iconBar->Add( m_spin0, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_spin1 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_spin1 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_iconBar->Add( m_spin1, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_spin2 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_spin2 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_iconBar->Add( m_spin2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_spin3 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_spin3 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_iconBar->Add( m_spin3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_autoRotate = new wxCheckBox( formatting->GetStaticBox(), wxID_ANY, _("Auto"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_iconBar->Add( m_autoRotate, 0, wxALL, 5 );
 
-	m_separator3 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator3 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator3->Enable( false );
 
 	m_iconBar->Add( m_separator3, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/eeschema/dialogs/dialog_label_properties_base.fbp b/eeschema/dialogs/dialog_label_properties_base.fbp
index a63505ff7f..eed931f2b2 100644
--- a/eeschema/dialogs/dialog_label_properties_base.fbp
+++ b/eeschema/dialogs/dialog_label_properties_base.fbp
@@ -1657,7 +1657,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -1730,7 +1730,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -1803,7 +1803,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -1876,7 +1876,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -1949,7 +1949,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -2022,7 +2022,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -2095,7 +2095,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -2168,7 +2168,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
@@ -2305,7 +2305,7 @@
                                                         <property name="pressed"></property>
                                                         <property name="resize">Resizable</property>
                                                         <property name="show">1</property>
-                                                        <property name="size">21,21</property>
+                                                        <property name="size"></property>
                                                         <property name="style">wxBORDER_NONE</property>
                                                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
diff --git a/eeschema/dialogs/dialog_label_properties_base.h b/eeschema/dialogs/dialog_label_properties_base.h
index d82beb0ce5..e029ee7d2f 100644
--- a/eeschema/dialogs/dialog_label_properties_base.h
+++ b/eeschema/dialogs/dialog_label_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_sheet_pin_properties_base.cpp b/eeschema/dialogs/dialog_sheet_pin_properties_base.cpp
index f4ac2342a8..88babd59ff 100644
--- a/eeschema/dialogs/dialog_sheet_pin_properties_base.cpp
+++ b/eeschema/dialogs/dialog_sheet_pin_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -91,22 +91,22 @@ DIALOG_SHEET_PIN_PROPERTIES_BASE::DIALOG_SHEET_PIN_PROPERTIES_BASE( wxWindow* pa
 	wxBoxSizer* formattingSizer;
 	formattingSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_separator1 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator1 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator1->Enable( false );
 
 	formattingSizer->Add( m_separator1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-	m_bold = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_bold->SetToolTip( _("Bold") );
 
 	formattingSizer->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_italic->SetToolTip( _("Italic") );
 
 	formattingSizer->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( formatting->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	formattingSizer->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp b/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp
index bff1b02344..1aca72b2b0 100644
--- a/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp
+++ b/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp
@@ -861,7 +861,7 @@
                                                                 <property name="pressed"></property>
                                                                 <property name="resize">Resizable</property>
                                                                 <property name="show">1</property>
-                                                                <property name="size">21,21</property>
+                                                                <property name="size"></property>
                                                                 <property name="style">wxBORDER_NONE</property>
                                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                                 <property name="toolbar_pane">0</property>
@@ -934,7 +934,7 @@
                                                                 <property name="pressed"></property>
                                                                 <property name="resize">Resizable</property>
                                                                 <property name="show">1</property>
-                                                                <property name="size">21,21</property>
+                                                                <property name="size"></property>
                                                                 <property name="style">wxBORDER_NONE</property>
                                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                                 <property name="toolbar_pane">0</property>
@@ -1007,7 +1007,7 @@
                                                                 <property name="pressed"></property>
                                                                 <property name="resize">Resizable</property>
                                                                 <property name="show">1</property>
-                                                                <property name="size">21,21</property>
+                                                                <property name="size"></property>
                                                                 <property name="style">wxBORDER_NONE</property>
                                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                                 <property name="toolbar_pane">0</property>
@@ -1080,7 +1080,7 @@
                                                                 <property name="pressed"></property>
                                                                 <property name="resize">Resizable</property>
                                                                 <property name="show">1</property>
-                                                                <property name="size">21,21</property>
+                                                                <property name="size"></property>
                                                                 <property name="style">wxBORDER_NONE</property>
                                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                                 <property name="toolbar_pane">0</property>
diff --git a/eeschema/dialogs/dialog_sheet_pin_properties_base.h b/eeschema/dialogs/dialog_sheet_pin_properties_base.h
index e785cceb74..1ecf6dc86e 100644
--- a/eeschema/dialogs/dialog_sheet_pin_properties_base.h
+++ b/eeschema/dialogs/dialog_sheet_pin_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_tablecell_properties_base.cpp b/eeschema/dialogs/dialog_tablecell_properties_base.cpp
index 1613e9bfc8..a6d8bd914f 100644
--- a/eeschema/dialogs/dialog_tablecell_properties_base.cpp
+++ b/eeschema/dialogs/dialog_tablecell_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -49,17 +49,17 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
 	wxBoxSizer* hAlignButtons;
 	hAlignButtons = new wxBoxSizer( wxHORIZONTAL );
 
-	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignLeft->SetToolTip( _("Align left") );
 
 	hAlignButtons->Add( m_hAlignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignCenter->SetToolTip( _("Align horizontal center") );
 
 	hAlignButtons->Add( m_hAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignRight->SetToolTip( _("Align right") );
 
 	hAlignButtons->Add( m_hAlignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -76,17 +76,17 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
 	wxBoxSizer* vAlignButtons;
 	vAlignButtons = new wxBoxSizer( wxHORIZONTAL );
 
-	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignTop->SetToolTip( _("Align top") );
 
 	vAlignButtons->Add( m_vAlignTop, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignCenter->SetToolTip( _("Align vertical center") );
 
 	vAlignButtons->Add( m_vAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignBottom->SetToolTip( _("Align bottom") );
 
 	vAlignButtons->Add( m_vAlignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/eeschema/dialogs/dialog_tablecell_properties_base.fbp b/eeschema/dialogs/dialog_tablecell_properties_base.fbp
index 93f23dc4c6..bbbce631d9 100644
--- a/eeschema/dialogs/dialog_tablecell_properties_base.fbp
+++ b/eeschema/dialogs/dialog_tablecell_properties_base.fbp
@@ -288,7 +288,7 @@
                             <property name="pressed"></property>
                             <property name="resize">Resizable</property>
                             <property name="show">1</property>
-                            <property name="size">21,21</property>
+                            <property name="size"></property>
                             <property name="style">wxBORDER_NONE</property>
                             <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                             <property name="toolbar_pane">0</property>
@@ -362,7 +362,7 @@
                             <property name="pressed"></property>
                             <property name="resize">Resizable</property>
                             <property name="show">1</property>
-                            <property name="size">21,21</property>
+                            <property name="size"></property>
                             <property name="style">wxBORDER_NONE</property>
                             <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                             <property name="toolbar_pane">0</property>
@@ -436,7 +436,7 @@
                             <property name="pressed"></property>
                             <property name="resize">Resizable</property>
                             <property name="show">1</property>
-                            <property name="size">21,21</property>
+                            <property name="size"></property>
                             <property name="style">wxBORDER_NONE</property>
                             <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                             <property name="toolbar_pane">0</property>
@@ -583,7 +583,7 @@
                             <property name="pressed"></property>
                             <property name="resize">Resizable</property>
                             <property name="show">1</property>
-                            <property name="size">21,21</property>
+                            <property name="size"></property>
                             <property name="style">wxBORDER_NONE</property>
                             <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                             <property name="toolbar_pane">0</property>
@@ -657,7 +657,7 @@
                             <property name="pressed"></property>
                             <property name="resize">Resizable</property>
                             <property name="show">1</property>
-                            <property name="size">21,21</property>
+                            <property name="size"></property>
                             <property name="style">wxBORDER_NONE</property>
                             <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                             <property name="toolbar_pane">0</property>
@@ -731,7 +731,7 @@
                             <property name="pressed"></property>
                             <property name="resize">Resizable</property>
                             <property name="show">1</property>
-                            <property name="size">21,21</property>
+                            <property name="size"></property>
                             <property name="style">wxBORDER_NONE</property>
                             <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                             <property name="toolbar_pane">0</property>
diff --git a/eeschema/dialogs/dialog_tablecell_properties_base.h b/eeschema/dialogs/dialog_tablecell_properties_base.h
index 609fdfdd26..c93fd0f1e6 100644
--- a/eeschema/dialogs/dialog_tablecell_properties_base.h
+++ b/eeschema/dialogs/dialog_tablecell_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_text_properties_base.cpp b/eeschema/dialogs/dialog_text_properties_base.cpp
index 606d23b171..993925cb38 100644
--- a/eeschema/dialogs/dialog_text_properties_base.cpp
+++ b/eeschema/dialogs/dialog_text_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -99,77 +99,77 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi
 	wxBoxSizer* bSizeCtrlSizer;
 	bSizeCtrlSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator1->Enable( false );
 
 	bSizeCtrlSizer->Add( m_separator1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_bold->SetToolTip( _("Bold") );
 
 	bSizeCtrlSizer->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_italic->SetToolTip( _("Italic") );
 
 	bSizeCtrlSizer->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	bSizeCtrlSizer->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignLeft->SetToolTip( _("Align left") );
 
 	bSizeCtrlSizer->Add( m_hAlignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignCenter->SetToolTip( _("Align horizontal center") );
 
 	bSizeCtrlSizer->Add( m_hAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignRight->SetToolTip( _("Align right") );
 
 	bSizeCtrlSizer->Add( m_hAlignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator3->Enable( false );
 
 	bSizeCtrlSizer->Add( m_separator3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignTop->SetToolTip( _("Align top") );
 
 	bSizeCtrlSizer->Add( m_vAlignTop, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignCenter->SetToolTip( _("Align vertical center") );
 
 	bSizeCtrlSizer->Add( m_vAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignBottom->SetToolTip( _("Align bottom") );
 
 	bSizeCtrlSizer->Add( m_vAlignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator4 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator4 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator4->Enable( false );
 
 	bSizeCtrlSizer->Add( m_separator4, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_horizontal = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_horizontal = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_horizontal->SetToolTip( _("Horizontal text") );
 
 	bSizeCtrlSizer->Add( m_horizontal, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vertical = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vertical = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vertical->SetToolTip( _("Vertical text") );
 
 	bSizeCtrlSizer->Add( m_vertical, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator5 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator5 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator5->Enable( false );
 
 	bSizeCtrlSizer->Add( m_separator5, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/eeschema/dialogs/dialog_text_properties_base.fbp b/eeschema/dialogs/dialog_text_properties_base.fbp
index f9422cd8f1..9bb56eb213 100644
--- a/eeschema/dialogs/dialog_text_properties_base.fbp
+++ b/eeschema/dialogs/dialog_text_properties_base.fbp
@@ -627,7 +627,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -701,7 +701,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -775,7 +775,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -849,7 +849,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -923,7 +923,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -997,7 +997,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1071,7 +1071,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1145,7 +1145,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1219,7 +1219,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1293,7 +1293,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1367,7 +1367,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1441,7 +1441,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1515,7 +1515,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1589,7 +1589,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1663,7 +1663,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
diff --git a/eeschema/dialogs/dialog_text_properties_base.h b/eeschema/dialogs/dialog_text_properties_base.h
index c1823bab68..f0b3c318dc 100644
--- a/eeschema/dialogs/dialog_text_properties_base.h
+++ b/eeschema/dialogs/dialog_text_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/widgets/tuner_slider_base.cpp b/eeschema/widgets/tuner_slider_base.cpp
index 2f873ee25a..be617fa931 100644
--- a/eeschema/widgets/tuner_slider_base.cpp
+++ b/eeschema/widgets/tuner_slider_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -39,17 +39,17 @@ TUNER_SLIDER_BASE::TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id, const wxP
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_e24 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_e24 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_e24->SetToolTip( _("Limit to E24 series values.") );
 
 	bSizer7->Add( m_e24, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator->SetToolTip( _("Bold") );
 
 	bSizer7->Add( m_separator, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_e48 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_e48 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_e48->SetToolTip( _("Limit to E48 series values.") );
 
 	bSizer7->Add( m_e48, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -57,7 +57,7 @@ TUNER_SLIDER_BASE::TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id, const wxP
 
 	bSizer7->Add( 0, 0, 1, wxEXPAND, 5 );
 
-	m_e96 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_e96 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_e96->SetToolTip( _("Limit to E96 series values") );
 
 	bSizer7->Add( m_e96, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -65,7 +65,7 @@ TUNER_SLIDER_BASE::TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id, const wxP
 
 	bSizer7->Add( 0, 0, 1, wxEXPAND, 5 );
 
-	m_e192 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_e192 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_e192->SetToolTip( _("Limit to E192 series values") );
 
 	bSizer7->Add( m_e192, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/eeschema/widgets/tuner_slider_base.fbp b/eeschema/widgets/tuner_slider_base.fbp
index f583a47494..bca28ca60b 100644
--- a/eeschema/widgets/tuner_slider_base.fbp
+++ b/eeschema/widgets/tuner_slider_base.fbp
@@ -320,7 +320,7 @@
                       <property name="pressed"></property>
                       <property name="resize">Resizable</property>
                       <property name="show">1</property>
-                      <property name="size">21,21</property>
+                      <property name="size"></property>
                       <property name="style">wxBORDER_NONE</property>
                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                       <property name="toolbar_pane">0</property>
@@ -395,7 +395,7 @@
                       <property name="pressed"></property>
                       <property name="resize">Resizable</property>
                       <property name="show">1</property>
-                      <property name="size">21,21</property>
+                      <property name="size"></property>
                       <property name="style">wxBORDER_NONE</property>
                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                       <property name="toolbar_pane">0</property>
@@ -469,7 +469,7 @@
                       <property name="pressed"></property>
                       <property name="resize">Resizable</property>
                       <property name="show">1</property>
-                      <property name="size">21,21</property>
+                      <property name="size"></property>
                       <property name="style">wxBORDER_NONE</property>
                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                       <property name="toolbar_pane">0</property>
@@ -554,7 +554,7 @@
                       <property name="pressed"></property>
                       <property name="resize">Resizable</property>
                       <property name="show">1</property>
-                      <property name="size">21,21</property>
+                      <property name="size"></property>
                       <property name="style">wxBORDER_NONE</property>
                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                       <property name="toolbar_pane">0</property>
@@ -639,7 +639,7 @@
                       <property name="pressed"></property>
                       <property name="resize">Resizable</property>
                       <property name="show">1</property>
-                      <property name="size">21,21</property>
+                      <property name="size"></property>
                       <property name="style">wxBORDER_NONE</property>
                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                       <property name="toolbar_pane">0</property>
diff --git a/eeschema/widgets/tuner_slider_base.h b/eeschema/widgets/tuner_slider_base.h
index dae9d135e7..bc33b9e3ad 100644
--- a/eeschema/widgets/tuner_slider_base.h
+++ b/eeschema/widgets/tuner_slider_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp
index 7e55b4ae4d..530524a7b3 100644
--- a/pagelayout_editor/dialogs/properties_frame_base.cpp
+++ b/pagelayout_editor/dialogs/properties_frame_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -28,7 +28,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
 
 	m_staticTextType = new wxStaticText( m_swItemProperties, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextType->Wrap( -1 );
-	m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_SLANT, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
 	bSizerButt->Add( m_staticTextType, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 4 );
 
@@ -89,45 +89,45 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
 	wxBoxSizer* formattingSizer;
 	formattingSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bold = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_bold->SetToolTip( _("Bold") );
 
 	formattingSizer->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_italic->SetToolTip( _("Italic") );
 
 	formattingSizer->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	formattingSizer->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignLeft = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignLeft = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	formattingSizer->Add( m_alignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignCenter = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignCenter = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	formattingSizer->Add( m_alignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignRight = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignRight = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	formattingSizer->Add( m_alignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator3 = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator3 = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator3->Enable( false );
 
 	formattingSizer->Add( m_separator3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignTop = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignTop = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	formattingSizer->Add( m_vAlignTop, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignMiddle = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignMiddle = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	formattingSizer->Add( m_vAlignMiddle, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignBottom = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignBottom = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	formattingSizer->Add( m_vAlignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator4 = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator4 = new BITMAP_BUTTON( m_swItemProperties, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator4->Enable( false );
 
 	formattingSizer->Add( m_separator4, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp
index c058efbffa..919c435402 100644
--- a/pagelayout_editor/dialogs/properties_frame_base.fbp
+++ b/pagelayout_editor/dialogs/properties_frame_base.fbp
@@ -567,7 +567,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -641,7 +641,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -715,7 +715,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -789,7 +789,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -863,7 +863,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -937,7 +937,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -1011,7 +1011,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -1085,7 +1085,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -1159,7 +1159,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -1233,7 +1233,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
@@ -1307,7 +1307,7 @@
                                       <property name="pressed"></property>
                                       <property name="resize">Resizable</property>
                                       <property name="show">1</property>
-                                      <property name="size">21,21</property>
+                                      <property name="size"></property>
                                       <property name="style">wxBORDER_NONE</property>
                                       <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                       <property name="toolbar_pane">0</property>
diff --git a/pagelayout_editor/dialogs/properties_frame_base.h b/pagelayout_editor/dialogs/properties_frame_base.h
index 057f260356..b558a09d3c 100644
--- a/pagelayout_editor/dialogs/properties_frame_base.h
+++ b/pagelayout_editor/dialogs/properties_frame_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcbnew/dialogs/dialog_dimension_properties_base.cpp b/pcbnew/dialogs/dialog_dimension_properties_base.cpp
index 9e82538032..e883095bb2 100644
--- a/pcbnew/dialogs/dialog_dimension_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_dimension_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -226,40 +226,40 @@ DIALOG_DIMENSION_PROPERTIES_BASE::DIALOG_DIMENSION_PROPERTIES_BASE( wxWindow* pa
 	wxBoxSizer* bSizerButtonBar;
 	bSizerButtonBar = new wxBoxSizer( wxHORIZONTAL );
 
-	m_separator0 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator0 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator0->Enable( false );
 
 	bSizerButtonBar->Add( m_separator0, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_bold = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator1 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator1 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator1->Enable( false );
 
 	bSizerButtonBar->Add( m_separator1, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignLeft = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignLeft = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignCenter = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignCenter = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignRight = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignRight = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	bSizerButtonBar->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_mirrored = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_mirrored = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_mirrored, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator3 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator3 = new BITMAP_BUTTON( m_sizerText->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator3->Enable( false );
 
 	bSizerButtonBar->Add( m_separator3, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/pcbnew/dialogs/dialog_dimension_properties_base.fbp b/pcbnew/dialogs/dialog_dimension_properties_base.fbp
index 7b3edd7462..a00f88070a 100644
--- a/pcbnew/dialogs/dialog_dimension_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_dimension_properties_base.fbp
@@ -2118,7 +2118,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2191,7 +2191,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2265,7 +2265,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2338,7 +2338,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2411,7 +2411,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2485,7 +2485,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2559,7 +2559,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2633,7 +2633,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2706,7 +2706,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -2779,7 +2779,7 @@
                                                 <property name="pressed"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">21,21</property>
+                                                <property name="size"></property>
                                                 <property name="style">wxBORDER_NONE</property>
                                                 <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
diff --git a/pcbnew/dialogs/dialog_dimension_properties_base.h b/pcbnew/dialogs/dialog_dimension_properties_base.h
index 9bd064f7cb..02750e3eb2 100644
--- a/pcbnew/dialogs/dialog_dimension_properties_base.h
+++ b/pcbnew/dialogs/dialog_dimension_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcbnew/dialogs/dialog_tablecell_properties_base.cpp b/pcbnew/dialogs/dialog_tablecell_properties_base.cpp
index 6bb405d3d4..cdd961e64e 100644
--- a/pcbnew/dialogs/dialog_tablecell_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_tablecell_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -45,17 +45,17 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
 	wxBoxSizer* hAlignButtons;
 	hAlignButtons = new wxBoxSizer( wxHORIZONTAL );
 
-	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignLeft->SetToolTip( _("Align left") );
 
 	hAlignButtons->Add( m_hAlignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignCenter->SetToolTip( _("Align horizontal center") );
 
 	hAlignButtons->Add( m_hAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_hAlignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_hAlignRight->SetToolTip( _("Align right") );
 
 	hAlignButtons->Add( m_hAlignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -72,17 +72,17 @@ DIALOG_TABLECELL_PROPERTIES_BASE::DIALOG_TABLECELL_PROPERTIES_BASE( wxWindow* pa
 	wxBoxSizer* vAlignButtons;
 	vAlignButtons = new wxBoxSizer( wxHORIZONTAL );
 
-	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignTop->SetToolTip( _("Align top") );
 
 	vAlignButtons->Add( m_vAlignTop, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignCenter->SetToolTip( _("Align vertical center") );
 
 	vAlignButtons->Add( m_vAlignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_vAlignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_vAlignBottom->SetToolTip( _("Align bottom") );
 
 	vAlignButtons->Add( m_vAlignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/pcbnew/dialogs/dialog_tablecell_properties_base.fbp b/pcbnew/dialogs/dialog_tablecell_properties_base.fbp
index 2e38471db8..671babfe51 100644
--- a/pcbnew/dialogs/dialog_tablecell_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_tablecell_properties_base.fbp
@@ -279,7 +279,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -353,7 +353,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -427,7 +427,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -574,7 +574,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -648,7 +648,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
@@ -722,7 +722,7 @@
                         <property name="pressed"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size">21,21</property>
+                        <property name="size"></property>
                         <property name="style">wxBORDER_NONE</property>
                         <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
diff --git a/pcbnew/dialogs/dialog_tablecell_properties_base.h b/pcbnew/dialogs/dialog_tablecell_properties_base.h
index 382bdc3037..9fd163a496 100644
--- a/pcbnew/dialogs/dialog_tablecell_properties_base.h
+++ b/pcbnew/dialogs/dialog_tablecell_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcbnew/dialogs/dialog_text_properties_base.cpp b/pcbnew/dialogs/dialog_text_properties_base.cpp
index b23226391b..ad0ef0106a 100644
--- a/pcbnew/dialogs/dialog_text_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_text_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -120,46 +120,46 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi
 	wxBoxSizer* bSizerButtonBar;
 	bSizerButtonBar = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator1->Enable( false );
 
 	bSizerButtonBar->Add( m_separator1, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	bSizerButtonBar->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_valignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_valignTop = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_valignTop, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_valignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_valignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_valignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_valignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_valignBottom = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_valignBottom, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator3->Enable( false );
 
 	bSizerButtonBar->Add( m_separator3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_mirrored = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_mirrored = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_mirrored, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
diff --git a/pcbnew/dialogs/dialog_text_properties_base.fbp b/pcbnew/dialogs/dialog_text_properties_base.fbp
index 3b2053c4a8..049fec787f 100644
--- a/pcbnew/dialogs/dialog_text_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_text_properties_base.fbp
@@ -980,7 +980,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1055,7 +1055,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1129,7 +1129,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1203,7 +1203,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1278,7 +1278,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1353,7 +1353,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1428,7 +1428,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1502,7 +1502,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1577,7 +1577,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1652,7 +1652,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1727,7 +1727,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1801,7 +1801,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
diff --git a/pcbnew/dialogs/dialog_text_properties_base.h b/pcbnew/dialogs/dialog_text_properties_base.h
index 3b797b6f31..21711163c7 100644
--- a/pcbnew/dialogs/dialog_text_properties_base.h
+++ b/pcbnew/dialogs/dialog_text_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcbnew/dialogs/dialog_textbox_properties_base.cpp b/pcbnew/dialogs/dialog_textbox_properties_base.cpp
index 6a2d0cdd50..7444b05541 100644
--- a/pcbnew/dialogs/dialog_textbox_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_textbox_properties_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -95,40 +95,40 @@ DIALOG_TEXTBOX_PROPERTIES_BASE::DIALOG_TEXTBOX_PROPERTIES_BASE( wxWindow* parent
 	wxBoxSizer* bSizerButtonBar;
 	bSizerButtonBar = new wxBoxSizer( wxHORIZONTAL );
 
-	m_separator0 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator0 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator0->Enable( false );
 
 	bSizerButtonBar->Add( m_separator0, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_bold = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_italic = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_italic, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator1->Enable( false );
 
 	bSizerButtonBar->Add( m_separator1, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignLeft = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignCenter = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignCenter, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_alignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_alignRight = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_alignRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator2->Enable( false );
 
 	bSizerButtonBar->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_mirrored = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_mirrored = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	bSizerButtonBar->Add( m_mirrored, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE );
+	m_separator3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE );
 	m_separator3->Enable( false );
 
 	bSizerButtonBar->Add( m_separator3, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/pcbnew/dialogs/dialog_textbox_properties_base.fbp b/pcbnew/dialogs/dialog_textbox_properties_base.fbp
index 59361e0db7..8d9f466ee1 100644
--- a/pcbnew/dialogs/dialog_textbox_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_textbox_properties_base.fbp
@@ -628,7 +628,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -702,7 +702,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -777,7 +777,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -851,7 +851,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -925,7 +925,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1000,7 +1000,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1075,7 +1075,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1150,7 +1150,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1224,7 +1224,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
@@ -1298,7 +1298,7 @@
                     <property name="pressed"></property>
                     <property name="resize">Resizable</property>
                     <property name="show">1</property>
-                    <property name="size">21,21</property>
+                    <property name="size"></property>
                     <property name="style">wxBORDER_NONE</property>
                     <property name="subclass">BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare</property>
                     <property name="toolbar_pane">0</property>
diff --git a/pcbnew/dialogs/dialog_textbox_properties_base.h b/pcbnew/dialogs/dialog_textbox_properties_base.h
index fa82c10b16..f5416e7b08 100644
--- a/pcbnew/dialogs/dialog_textbox_properties_base.h
+++ b/pcbnew/dialogs/dialog_textbox_properties_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcbnew/dialogs/panel_setup_rules_base.cpp b/pcbnew/dialogs/panel_setup_rules_base.cpp
index 47b6b0ced1..4803aac154 100644
--- a/pcbnew/dialogs/panel_setup_rules_base.cpp
+++ b/pcbnew/dialogs/panel_setup_rules_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -73,7 +73,7 @@ PANEL_SETUP_RULES_BASE::PANEL_SETUP_RULES_BASE( wxWindow* parent, wxWindowID id,
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_compileButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 28,28 ), wxBU_AUTODRAW|0 );
+	m_compileButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_compileButton->SetToolTip( _("Check rule syntax") );
 
 	bSizer5->Add( m_compileButton, 0, wxTOP|wxBOTTOM, 5 );
diff --git a/pcbnew/dialogs/panel_setup_rules_base.fbp b/pcbnew/dialogs/panel_setup_rules_base.fbp
index 12330b25b1..89417cf051 100644
--- a/pcbnew/dialogs/panel_setup_rules_base.fbp
+++ b/pcbnew/dialogs/panel_setup_rules_base.fbp
@@ -1,432 +1,438 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="16" />
-    <object class="Project" expanded="1">
-        <property name="class_decoration"></property>
-        <property name="code_generation">C++</property>
-        <property name="disconnect_events">1</property>
-        <property name="disconnect_mode">source_name</property>
-        <property name="disconnect_php_events">0</property>
-        <property name="disconnect_python_events">0</property>
-        <property name="embedded_files_path">res</property>
-        <property name="encoding">UTF-8</property>
-        <property name="event_generation">connect</property>
-        <property name="file">panel_setup_rules_base</property>
-        <property name="first_id">2240</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">PanelSetupRules</property>
-        <property name="namespace"></property>
-        <property name="path">.</property>
-        <property name="precompiled_header"></property>
-        <property name="relative_path">1</property>
-        <property name="skip_lua_events">1</property>
-        <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="Panel" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
+  <FileVersion major="1" minor="17"/>
+  <object class="Project" expanded="true">
+    <property name="class_decoration"></property>
+    <property name="code_generation">C++</property>
+    <property name="disconnect_events">1</property>
+    <property name="disconnect_mode">source_name</property>
+    <property name="disconnect_php_events">0</property>
+    <property name="disconnect_python_events">0</property>
+    <property name="embedded_files_path">res</property>
+    <property name="encoding">UTF-8</property>
+    <property name="event_generation">connect</property>
+    <property name="file">panel_setup_rules_base</property>
+    <property name="first_id">2240</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">PanelSetupRules</property>
+    <property name="namespace"></property>
+    <property name="path">.</property>
+    <property name="precompiled_header"></property>
+    <property name="relative_path">1</property>
+    <property name="skip_lua_events">1</property>
+    <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="Panel" expanded="true">
+      <property name="aui_managed">0</property>
+      <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+      <property name="bg"></property>
+      <property name="context_help"></property>
+      <property name="context_menu">1</property>
+      <property name="drag_accept_files">0</property>
+      <property name="enabled">1</property>
+      <property name="event_handler">impl_virtual</property>
+      <property name="fg"></property>
+      <property name="font"></property>
+      <property name="hidden">0</property>
+      <property name="id">wxID_ANY</property>
+      <property name="maximum_size"></property>
+      <property name="minimum_size"></property>
+      <property name="name">PANEL_SETUP_RULES_BASE</property>
+      <property name="pos"></property>
+      <property name="size">-1,-1</property>
+      <property name="subclass">; forward_declare</property>
+      <property name="tooltip"></property>
+      <property name="two_step_creation">0</property>
+      <property name="window_extra_style"></property>
+      <property name="window_name"></property>
+      <property name="window_style">wxTAB_TRAVERSAL</property>
+      <object class="wxBoxSizer" expanded="true">
+        <property name="minimum_size"></property>
+        <property name="name">bPanelSizer</property>
+        <property name="orient">wxVERTICAL</property>
+        <property name="permission">none</property>
+        <object class="sizeritem" expanded="true">
+          <property name="border">5</property>
+          <property name="flag">wxEXPAND</property>
+          <property name="proportion">0</property>
+          <object class="wxBoxSizer" expanded="true">
             <property name="minimum_size"></property>
-            <property name="name">PANEL_SETUP_RULES_BASE</property>
-            <property name="pos"></property>
-            <property name="size">-1,-1</property>
-            <property name="subclass">; forward_declare</property>
-            <property name="tooltip"></property>
-            <property name="two_step_creation">0</property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <object class="wxBoxSizer" expanded="1">
+            <property name="name">bSizer4</property>
+            <property name="orient">wxHORIZONTAL</property>
+            <property name="permission">none</property>
+            <object class="sizeritem" expanded="true">
+              <property name="border">5</property>
+              <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
+              <property name="proportion">0</property>
+              <object class="wxStaticText" expanded="true">
+                <property name="BottomDockable">1</property>
+                <property name="LeftDockable">1</property>
+                <property name="RightDockable">1</property>
+                <property name="TopDockable">1</property>
+                <property name="aui_layer"></property>
+                <property name="aui_name"></property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
+                <property name="best_size"></property>
+                <property name="bg"></property>
+                <property name="caption"></property>
+                <property name="caption_visible">1</property>
+                <property name="center_pane">0</property>
+                <property name="close_button">1</property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="default_pane">0</property>
+                <property name="dock">Dock</property>
+                <property name="dock_fixed">0</property>
+                <property name="docking">Left</property>
+                <property name="drag_accept_files">0</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="floatable">1</property>
+                <property name="font"></property>
+                <property name="gripper">0</property>
+                <property name="hidden">0</property>
+                <property name="id">wxID_ANY</property>
+                <property name="label">DRC rules:</property>
+                <property name="markup">0</property>
+                <property name="max_size"></property>
+                <property name="maximize_button">0</property>
+                <property name="maximum_size"></property>
+                <property name="min_size"></property>
+                <property name="minimize_button">0</property>
                 <property name="minimum_size"></property>
-                <property name="name">bPanelSizer</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bSizer4</property>
-                        <property name="orient">wxHORIZONTAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticText" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">DRC rules:</property>
-                                <property name="markup">0</property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_title</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass">; ; forward_declare</property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <property name="wrap">-1</property>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">1</property>
-                            <object class="spacer" expanded="1">
-                                <property name="height">0</property>
-                                <property name="permission">protected</property>
-                                <property name="width">0</property>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
-                            <property name="proportion">0</property>
-                            <object class="wxHyperlinkCtrl" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="hover_color"></property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Syntax help</property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_syntaxHelp</property>
-                                <property name="normal_color"></property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style">wxHL_DEFAULT_STYLE</property>
-                                <property name="subclass">; ; forward_declare</property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip">Show syntax help window</property>
-                                <property name="url"></property>
-                                <property name="visited_color"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnHyperlink">OnSyntaxHelp</event>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">10</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">1</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">m_topMargin</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">protected</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT</property>
-                            <property name="proportion">3</property>
-                            <object class="wxStyledTextCtrl" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="backspace_unindents">1</property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="folding">0</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">ID_RULES_EDITOR</property>
-                                <property name="indentation_guides">1</property>
-                                <property name="line_numbers">1</property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_textEditor</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="read_only">0</property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="subclass">; ; forward_declare</property>
-                                <property name="tab_indents">1</property>
-                                <property name="tab_width">4</property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="use_tabs">1</property>
-                                <property name="view_eol">0</property>
-                                <property name="view_whitespace">0</property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnRightDown">OnContextMenu</event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="1">
-                                <property name="minimum_size"></property>
-                                <property name="name">bSizer5</property>
-                                <property name="orient">wxHORIZONTAL</property>
-                                <property name="permission">none</property>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxTOP|wxBOTTOM</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxBitmapButton" expanded="1">
-                                        <property name="BottomDockable">1</property>
-                                        <property name="LeftDockable">1</property>
-                                        <property name="RightDockable">1</property>
-                                        <property name="TopDockable">1</property>
-                                        <property name="aui_layer"></property>
-                                        <property name="aui_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="auth_needed">0</property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="bitmap"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</property>
-                                        <property name="center_pane">0</property>
-                                        <property name="close_button">1</property>
-                                        <property name="context_help"></property>
-                                        <property name="context_menu">1</property>
-                                        <property name="current"></property>
-                                        <property name="default">0</property>
-                                        <property name="default_pane">0</property>
-                                        <property name="disabled"></property>
-                                        <property name="dock">Dock</property>
-                                        <property name="dock_fixed">0</property>
-                                        <property name="docking">Left</property>
-                                        <property name="enabled">1</property>
-                                        <property name="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="focus"></property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="label">MyButton</property>
-                                        <property name="margins"></property>
-                                        <property name="markup">0</property>
-                                        <property name="max_size"></property>
-                                        <property name="maximize_button">0</property>
-                                        <property name="maximum_size"></property>
-                                        <property name="min_size"></property>
-                                        <property name="minimize_button">0</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_compileButton</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="position"></property>
-                                        <property name="pressed"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size">28,28</property>
-                                        <property name="style"></property>
-                                        <property name="subclass">STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare</property>
-                                        <property name="toolbar_pane">0</property>
-                                        <property name="tooltip">Check rule syntax</property>
-                                        <property name="validator_data_type"></property>
-                                        <property name="validator_style">wxFILTER_NONE</property>
-                                        <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable"></property>
-                                        <property name="window_extra_style"></property>
-                                        <property name="window_name"></property>
-                                        <property name="window_style"></property>
-                                        <event name="OnButtonClick">OnCompile</event>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property>
-                                    <property name="proportion">1</property>
-                                    <object class="wxHtmlWindow" expanded="1">
-                                        <property name="BottomDockable">1</property>
-                                        <property name="LeftDockable">1</property>
-                                        <property name="RightDockable">1</property>
-                                        <property name="TopDockable">1</property>
-                                        <property name="aui_layer"></property>
-                                        <property name="aui_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</property>
-                                        <property name="center_pane">0</property>
-                                        <property name="close_button">1</property>
-                                        <property name="context_help"></property>
-                                        <property name="context_menu">1</property>
-                                        <property name="default_pane">0</property>
-                                        <property name="dock">Dock</property>
-                                        <property name="dock_fixed">0</property>
-                                        <property name="docking">Left</property>
-                                        <property name="enabled">1</property>
-                                        <property name="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="max_size"></property>
-                                        <property name="maximize_button">0</property>
-                                        <property name="maximum_size"></property>
-                                        <property name="min_size"></property>
-                                        <property name="minimize_button">0</property>
-                                        <property name="minimum_size">400,60</property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_errorsReport</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                        <property name="subclass">WX_HTML_REPORT_BOX; widgets/wx_html_report_box.h; forward_declare</property>
-                                        <property name="toolbar_pane">0</property>
-                                        <property name="tooltip"></property>
-                                        <property name="window_extra_style"></property>
-                                        <property name="window_name"></property>
-                                        <property name="window_style"></property>
-                                        <event name="OnHtmlLinkClicked">OnErrorLinkClicked</event>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
+                <property name="moveable">1</property>
+                <property name="name">m_title</property>
+                <property name="pane_border">1</property>
+                <property name="pane_position"></property>
+                <property name="pane_size"></property>
+                <property name="permission">protected</property>
+                <property name="pin_button">1</property>
+                <property name="pos"></property>
+                <property name="resize">Resizable</property>
+                <property name="show">1</property>
+                <property name="size"></property>
+                <property name="style"></property>
+                <property name="subclass">; ; forward_declare</property>
+                <property name="toolbar_pane">0</property>
+                <property name="tooltip"></property>
+                <property name="window_extra_style"></property>
+                <property name="window_name"></property>
+                <property name="window_style"></property>
+                <property name="wrap">-1</property>
+              </object>
             </object>
+            <object class="sizeritem" expanded="true">
+              <property name="border">5</property>
+              <property name="flag">wxEXPAND</property>
+              <property name="proportion">1</property>
+              <object class="spacer" expanded="true">
+                <property name="height">0</property>
+                <property name="permission">protected</property>
+                <property name="width">0</property>
+              </object>
+            </object>
+            <object class="sizeritem" expanded="true">
+              <property name="border">5</property>
+              <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
+              <property name="proportion">0</property>
+              <object class="wxHyperlinkCtrl" expanded="true">
+                <property name="BottomDockable">1</property>
+                <property name="LeftDockable">1</property>
+                <property name="RightDockable">1</property>
+                <property name="TopDockable">1</property>
+                <property name="aui_layer"></property>
+                <property name="aui_name"></property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
+                <property name="best_size"></property>
+                <property name="bg"></property>
+                <property name="caption"></property>
+                <property name="caption_visible">1</property>
+                <property name="center_pane">0</property>
+                <property name="close_button">1</property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="default_pane">0</property>
+                <property name="dock">Dock</property>
+                <property name="dock_fixed">0</property>
+                <property name="docking">Left</property>
+                <property name="drag_accept_files">0</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="floatable">1</property>
+                <property name="font"></property>
+                <property name="gripper">0</property>
+                <property name="hidden">0</property>
+                <property name="hover_color"></property>
+                <property name="id">wxID_ANY</property>
+                <property name="label">Syntax help</property>
+                <property name="max_size"></property>
+                <property name="maximize_button">0</property>
+                <property name="maximum_size"></property>
+                <property name="min_size"></property>
+                <property name="minimize_button">0</property>
+                <property name="minimum_size"></property>
+                <property name="moveable">1</property>
+                <property name="name">m_syntaxHelp</property>
+                <property name="normal_color"></property>
+                <property name="pane_border">1</property>
+                <property name="pane_position"></property>
+                <property name="pane_size"></property>
+                <property name="permission">protected</property>
+                <property name="pin_button">1</property>
+                <property name="pos"></property>
+                <property name="resize">Resizable</property>
+                <property name="show">1</property>
+                <property name="size"></property>
+                <property name="style">wxHL_DEFAULT_STYLE</property>
+                <property name="subclass">; ; forward_declare</property>
+                <property name="toolbar_pane">0</property>
+                <property name="tooltip">Show syntax help window</property>
+                <property name="url"></property>
+                <property name="visited_color"></property>
+                <property name="window_extra_style"></property>
+                <property name="window_name"></property>
+                <property name="window_style"></property>
+                <event name="OnHyperlink">OnSyntaxHelp</event>
+              </object>
+            </object>
+          </object>
         </object>
+        <object class="sizeritem" expanded="true">
+          <property name="border">10</property>
+          <property name="flag">wxEXPAND</property>
+          <property name="proportion">1</property>
+          <object class="wxBoxSizer" expanded="true">
+            <property name="minimum_size"></property>
+            <property name="name">m_topMargin</property>
+            <property name="orient">wxVERTICAL</property>
+            <property name="permission">protected</property>
+            <object class="sizeritem" expanded="true">
+              <property name="border">5</property>
+              <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT</property>
+              <property name="proportion">3</property>
+              <object class="wxStyledTextCtrl" expanded="true">
+                <property name="BottomDockable">1</property>
+                <property name="LeftDockable">1</property>
+                <property name="RightDockable">1</property>
+                <property name="TopDockable">1</property>
+                <property name="aui_layer"></property>
+                <property name="aui_name"></property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
+                <property name="backspace_unindents">1</property>
+                <property name="best_size"></property>
+                <property name="bg"></property>
+                <property name="caption"></property>
+                <property name="caption_visible">1</property>
+                <property name="center_pane">0</property>
+                <property name="close_button">1</property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="default_pane">0</property>
+                <property name="dock">Dock</property>
+                <property name="dock_fixed">0</property>
+                <property name="docking">Left</property>
+                <property name="drag_accept_files">0</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="floatable">1</property>
+                <property name="folding">0</property>
+                <property name="font"></property>
+                <property name="gripper">0</property>
+                <property name="hidden">0</property>
+                <property name="id">ID_RULES_EDITOR</property>
+                <property name="indentation_guides">1</property>
+                <property name="line_numbers">1</property>
+                <property name="max_size"></property>
+                <property name="maximize_button">0</property>
+                <property name="maximum_size"></property>
+                <property name="min_size"></property>
+                <property name="minimize_button">0</property>
+                <property name="minimum_size"></property>
+                <property name="moveable">1</property>
+                <property name="name">m_textEditor</property>
+                <property name="pane_border">1</property>
+                <property name="pane_position"></property>
+                <property name="pane_size"></property>
+                <property name="permission">protected</property>
+                <property name="pin_button">1</property>
+                <property name="pos"></property>
+                <property name="read_only">0</property>
+                <property name="resize">Resizable</property>
+                <property name="show">1</property>
+                <property name="size"></property>
+                <property name="subclass">; ; forward_declare</property>
+                <property name="tab_indents">1</property>
+                <property name="tab_width">4</property>
+                <property name="toolbar_pane">0</property>
+                <property name="tooltip"></property>
+                <property name="use_tabs">1</property>
+                <property name="view_eol">0</property>
+                <property name="view_whitespace">0</property>
+                <property name="window_extra_style"></property>
+                <property name="window_name"></property>
+                <property name="window_style"></property>
+                <event name="OnRightDown">OnContextMenu</event>
+              </object>
+            </object>
+            <object class="sizeritem" expanded="true">
+              <property name="border">5</property>
+              <property name="flag">wxEXPAND</property>
+              <property name="proportion">1</property>
+              <object class="wxBoxSizer" expanded="true">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer5</property>
+                <property name="orient">wxHORIZONTAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="true">
+                  <property name="border">5</property>
+                  <property name="flag">wxTOP|wxBOTTOM</property>
+                  <property name="proportion">0</property>
+                  <object class="wxBitmapButton" expanded="true">
+                    <property name="BottomDockable">1</property>
+                    <property name="LeftDockable">1</property>
+                    <property name="RightDockable">1</property>
+                    <property name="TopDockable">1</property>
+                    <property name="aui_layer"></property>
+                    <property name="aui_name"></property>
+                    <property name="aui_position"></property>
+                    <property name="aui_row"></property>
+                    <property name="auth_needed">0</property>
+                    <property name="best_size"></property>
+                    <property name="bg"></property>
+                    <property name="bitmap"></property>
+                    <property name="caption"></property>
+                    <property name="caption_visible">1</property>
+                    <property name="center_pane">0</property>
+                    <property name="close_button">1</property>
+                    <property name="context_help"></property>
+                    <property name="context_menu">1</property>
+                    <property name="current"></property>
+                    <property name="default">0</property>
+                    <property name="default_pane">0</property>
+                    <property name="disabled"></property>
+                    <property name="dock">Dock</property>
+                    <property name="dock_fixed">0</property>
+                    <property name="docking">Left</property>
+                    <property name="drag_accept_files">0</property>
+                    <property name="enabled">1</property>
+                    <property name="fg"></property>
+                    <property name="floatable">1</property>
+                    <property name="focus"></property>
+                    <property name="font"></property>
+                    <property name="gripper">0</property>
+                    <property name="hidden">0</property>
+                    <property name="id">wxID_ANY</property>
+                    <property name="label">MyButton</property>
+                    <property name="margins"></property>
+                    <property name="markup">0</property>
+                    <property name="max_size"></property>
+                    <property name="maximize_button">0</property>
+                    <property name="maximum_size"></property>
+                    <property name="min_size"></property>
+                    <property name="minimize_button">0</property>
+                    <property name="minimum_size"></property>
+                    <property name="moveable">1</property>
+                    <property name="name">m_compileButton</property>
+                    <property name="pane_border">1</property>
+                    <property name="pane_position"></property>
+                    <property name="pane_size"></property>
+                    <property name="permission">protected</property>
+                    <property name="pin_button">1</property>
+                    <property name="pos"></property>
+                    <property name="position"></property>
+                    <property name="pressed"></property>
+                    <property name="resize">Resizable</property>
+                    <property name="show">1</property>
+                    <property name="size">-1,-1</property>
+                    <property name="style"></property>
+                    <property name="subclass">STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare</property>
+                    <property name="toolbar_pane">0</property>
+                    <property name="tooltip">Check rule syntax</property>
+                    <property name="validator_data_type"></property>
+                    <property name="validator_style">wxFILTER_NONE</property>
+                    <property name="validator_type">wxDefaultValidator</property>
+                    <property name="validator_variable"></property>
+                    <property name="window_extra_style"></property>
+                    <property name="window_name"></property>
+                    <property name="window_style"></property>
+                    <event name="OnButtonClick">OnCompile</event>
+                  </object>
+                </object>
+                <object class="sizeritem" expanded="true">
+                  <property name="border">5</property>
+                  <property name="flag">wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property>
+                  <property name="proportion">1</property>
+                  <object class="wxHtmlWindow" expanded="true">
+                    <property name="BottomDockable">1</property>
+                    <property name="LeftDockable">1</property>
+                    <property name="RightDockable">1</property>
+                    <property name="TopDockable">1</property>
+                    <property name="aui_layer"></property>
+                    <property name="aui_name"></property>
+                    <property name="aui_position"></property>
+                    <property name="aui_row"></property>
+                    <property name="best_size"></property>
+                    <property name="bg"></property>
+                    <property name="caption"></property>
+                    <property name="caption_visible">1</property>
+                    <property name="center_pane">0</property>
+                    <property name="close_button">1</property>
+                    <property name="context_help"></property>
+                    <property name="context_menu">1</property>
+                    <property name="default_pane">0</property>
+                    <property name="dock">Dock</property>
+                    <property name="dock_fixed">0</property>
+                    <property name="docking">Left</property>
+                    <property name="drag_accept_files">0</property>
+                    <property name="enabled">1</property>
+                    <property name="fg"></property>
+                    <property name="floatable">1</property>
+                    <property name="font"></property>
+                    <property name="gripper">0</property>
+                    <property name="hidden">0</property>
+                    <property name="id">wxID_ANY</property>
+                    <property name="max_size"></property>
+                    <property name="maximize_button">0</property>
+                    <property name="maximum_size"></property>
+                    <property name="min_size"></property>
+                    <property name="minimize_button">0</property>
+                    <property name="minimum_size">400,60</property>
+                    <property name="moveable">1</property>
+                    <property name="name">m_errorsReport</property>
+                    <property name="pane_border">1</property>
+                    <property name="pane_position"></property>
+                    <property name="pane_size"></property>
+                    <property name="permission">protected</property>
+                    <property name="pin_button">1</property>
+                    <property name="pos"></property>
+                    <property name="resize">Resizable</property>
+                    <property name="show">1</property>
+                    <property name="size"></property>
+                    <property name="style">wxHW_SCROLLBAR_AUTO</property>
+                    <property name="subclass">WX_HTML_REPORT_BOX; widgets/wx_html_report_box.h; forward_declare</property>
+                    <property name="toolbar_pane">0</property>
+                    <property name="tooltip"></property>
+                    <property name="window_extra_style"></property>
+                    <property name="window_name"></property>
+                    <property name="window_style"></property>
+                    <event name="OnHtmlLinkClicked">OnErrorLinkClicked</event>
+                  </object>
+                </object>
+              </object>
+            </object>
+          </object>
+        </object>
+      </object>
     </object>
+  </object>
 </wxFormBuilder_Project>
diff --git a/pcbnew/dialogs/panel_setup_rules_base.h b/pcbnew/dialogs/panel_setup_rules_base.h
index 61b520c740..4212005a2f 100644
--- a/pcbnew/dialogs/panel_setup_rules_base.h
+++ b/pcbnew/dialogs/panel_setup_rules_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!