diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
index 287c08ce0e..4247a24387 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.0)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -68,7 +68,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	bSizer3->Add( m_trackWidthsAddButton, 0, wxLEFT|wxRIGHT, 5 );
 
 	m_trackWidthsSortButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer3->Add( m_trackWidthsSortButton, 0, wxLEFT|wxRIGHT, 5 );
+	bSizer3->Add( m_trackWidthsSortButton, 0, wxRIGHT|wxLEFT, 5 );
 
 
 	bSizer3->Add( 20, 0, 0, wxEXPAND, 5 );
@@ -128,7 +128,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	bSizer4->Add( m_viaSizesAddButton, 0, wxLEFT|wxRIGHT, 5 );
 
 	m_viaSizesSortButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer4->Add( m_viaSizesSortButton, 0, wxALIGN_LEFT|wxALIGN_RIGHT, 5 );
+	bSizer4->Add( m_viaSizesSortButton, 0, wxRIGHT|wxLEFT, 5 );
 
 
 	bSizer4->Add( 20, 0, 0, wxEXPAND, 5 );
@@ -190,7 +190,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	bSizer5->Add( m_diffPairsAddButton, 0, wxLEFT|wxRIGHT, 5 );
 
 	m_diffPairsSortButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer5->Add( m_diffPairsSortButton, 0, wxALIGN_LEFT|wxALIGN_RIGHT, 5 );
+	bSizer5->Add( m_diffPairsSortButton, 0, wxRIGHT|wxLEFT, 5 );
 
 
 	bSizer5->Add( 20, 0, 0, wxEXPAND, 5 );
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
index ab7e176424..c2abf1ff3b 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
@@ -274,7 +274,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Add track width</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -312,7 +312,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxLEFT|wxRIGHT</property>
+                                            <property name="flag">wxRIGHT|wxLEFT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxBitmapButton" expanded="1">
                                                 <property name="BottomDockable">1</property>
@@ -348,7 +348,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Sort track widths</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -432,7 +432,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Delete track width</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -619,7 +619,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Add via size</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -657,7 +657,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_LEFT|wxALIGN_RIGHT</property>
+                                            <property name="flag">wxRIGHT|wxLEFT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxBitmapButton" expanded="1">
                                                 <property name="BottomDockable">1</property>
@@ -693,7 +693,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Sort via sizes</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -777,7 +777,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Delete via size</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -964,7 +964,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Add diff pair</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -1002,7 +1002,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_LEFT|wxALIGN_RIGHT</property>
+                                            <property name="flag">wxRIGHT|wxLEFT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxBitmapButton" expanded="1">
                                                 <property name="BottomDockable">1</property>
@@ -1038,7 +1038,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Sort diff pairs</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -1122,7 +1122,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">MyButton</property>
+                                                <property name="label">Delete diff pair</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
index 39cd8f95b2..7414dc8db2 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.0)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!