diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp
index c4f8f85d25..daf94da45b 100644
--- a/common/dialogs/panel_common_settings.cpp
+++ b/common/dialogs/panel_common_settings.cpp
@@ -80,20 +80,19 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aP
#if defined( __WXGTK__ ) || defined( __WXMSW__ )
// Sadly wxSlider is poorly implemented and adds its legends as sibling windows (so that
// showing/hiding the control doesn't work). So we have to create it conditionally.
- wxWindow* parent = m_sbUserInterface->GetStaticBox();
wxGridBagSizer* gb = m_gbUserInterface;
- m_iconScaleLabel = new wxStaticText( parent, wxID_ANY, _( "Icon scale:" ) );
+ m_iconScaleLabel = new wxStaticText( this, wxID_ANY, _( "Icon scale:" ) );
m_iconScaleLabel->Wrap( -1 );
gb->Add( m_iconScaleLabel, wxGBPosition( 3, 0 ),
wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
- m_iconScaleSlider = new STEPPED_SLIDER( parent, wxID_ANY, 100, 50, 275, wxDefaultPosition,
+ m_iconScaleSlider = new STEPPED_SLIDER( this, wxID_ANY, 100, 50, 275, wxDefaultPosition,
wxDefaultSize, wxSL_HORIZONTAL|wxSL_VALUE_LABEL );
m_iconScaleSlider->SetStep( 25 );
gb->Add( m_iconScaleSlider, wxGBPosition( 3, 1 ), wxGBSpan( 1, 2 ), wxEXPAND|wxBOTTOM, 5 );
- m_iconScaleAuto = new wxCheckBox( parent, wxID_ANY, _( "Automatic" ) );
+ m_iconScaleAuto = new wxCheckBox( this, wxID_ANY, _( "Automatic" ) );
gb->Add( m_iconScaleAuto, wxGBPosition( 3, 3 ),
wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 15 );
#endif
diff --git a/common/dialogs/panel_common_settings_base.cpp b/common/dialogs/panel_common_settings_base.cpp
index 26ac0cc150..bd475150bd 100644
--- a/common/dialogs/panel_common_settings_base.cpp
+++ b/common/dialogs/panel_common_settings_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-254-gc2ef7767)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -178,9 +178,8 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
m_rbIconThemeAuto = new wxRadioButton( this, wxID_ANY, _("Automatic"), wxDefaultPosition, wxDefaultSize, 0 );
m_rbIconThemeAuto->SetValue( true );
m_rbIconThemeAuto->SetToolTip( _("Automatically choose light or dark icons based on the system color theme") );
- m_rbIconThemeAuto->SetMinSize( wxSize( 92,-1 ) );
- m_gbUserInterface->Add( m_rbIconThemeAuto, wxGBPosition( 4, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 15 );
+ m_gbUserInterface->Add( m_rbIconThemeAuto, wxGBPosition( 4, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_staticTextCanvasScale = new wxStaticText( this, wxID_ANY, _("Canvas scale:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextCanvasScale->Wrap( -1 );
diff --git a/common/dialogs/panel_common_settings_base.fbp b/common/dialogs/panel_common_settings_base.fbp
index 461932add4..b52099b493 100644
--- a/common/dialogs/panel_common_settings_base.fbp
+++ b/common/dialogs/panel_common_settings_base.fbp
@@ -35,6 +35,7 @@
1
+ 0
1
impl_virtual
@@ -91,6 +92,7 @@
Dock
0
Left
+ 0
1
1
@@ -152,6 +154,7 @@
Dock
0
Left
+ 0
1
1
@@ -237,6 +240,7 @@
Dock
0
Left
+ 0
1
1
@@ -302,6 +306,7 @@
Dock
0
Left
+ 0
1
1
@@ -368,6 +373,7 @@
Dock
0
Left
+ 0
1
1
@@ -433,6 +439,7 @@
Dock
0
Left
+ 0
1
1
@@ -510,6 +517,7 @@
Dock
0
Left
+ 0
1
1
@@ -571,6 +579,7 @@
Dock
0
Left
+ 0
1
1
@@ -647,6 +656,7 @@
Dock
0
Left
+ 0
1
1
@@ -708,6 +718,7 @@
Dock
0
Left
+ 0
1
1
@@ -777,6 +788,7 @@
Dock
0
Left
+ 0
1
1
@@ -867,6 +879,7 @@
Dock
0
Left
+ 0
1
1
@@ -943,6 +956,7 @@
Dock
0
Left
+ 0
1
1
@@ -1008,6 +1022,7 @@
Dock
0
Left
+ 0
1
1
@@ -1077,6 +1092,7 @@
Dock
0
Left
+ 0
1
1
@@ -1160,6 +1176,7 @@
Dock
0
Left
+ 0
1
1
@@ -1221,6 +1238,7 @@
Dock
0
Left
+ 0
1
1
@@ -1278,7 +1296,7 @@
wxFLEX_GROWMODE_SPECIFIED
protected
5
-
-