diff --git a/3d-viewer/dialogs/panel_3D_display_options_base.cpp b/3d-viewer/dialogs/panel_3D_display_options_base.cpp
index 628f64d6c9..fe0f77ef6e 100644
--- a/3d-viewer/dialogs/panel_3D_display_options_base.cpp
+++ b/3d-viewer/dialogs/panel_3D_display_options_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.0-39-g3487c3cb)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -124,7 +124,7 @@ PANEL_3D_DISPLAY_OPTIONS_BASE::PANEL_3D_DISPLAY_OPTIONS_BASE( wxWindow* parent,
 	bSizeLeft->Add( fgSizer2, 1, wxEXPAND|wxTOP|wxLEFT, 5 );
 
 
-	bSizer7->Add( bSizeLeft, 1, wxEXPAND|wxRIGHT, 20 );
+	bSizer7->Add( bSizeLeft, 0, wxEXPAND|wxRIGHT, 20 );
 
 	wxBoxSizer* bSizerRight;
 	bSizerRight = new wxBoxSizer( wxVERTICAL );
@@ -180,7 +180,7 @@ PANEL_3D_DISPLAY_OPTIONS_BASE::PANEL_3D_DISPLAY_OPTIONS_BASE( wxWindow* parent,
 	bSizerRight->Add( bSizerSlider, 0, wxEXPAND|wxLEFT, 5 );
 
 
-	bSizer7->Add( bSizerRight, 1, wxEXPAND, 15 );
+	bSizer7->Add( bSizerRight, 0, wxEXPAND, 15 );
 
 
 	bSizerMain->Add( bSizer7, 1, 0, 5 );
diff --git a/3d-viewer/dialogs/panel_3D_display_options_base.fbp b/3d-viewer/dialogs/panel_3D_display_options_base.fbp
index efd66f661e..25c69b0383 100644
--- a/3d-viewer/dialogs/panel_3D_display_options_base.fbp
+++ b/3d-viewer/dialogs/panel_3D_display_options_base.fbp
@@ -69,7 +69,7 @@
                         <object class="sizeritem" expanded="1">
                             <property name="border">20</property>
                             <property name="flag">wxEXPAND|wxRIGHT</property>
-                            <property name="proportion">1</property>
+                            <property name="proportion">0</property>
                             <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
                                 <property name="name">bSizeLeft</property>
@@ -1418,7 +1418,7 @@
                         <object class="sizeritem" expanded="1">
                             <property name="border">15</property>
                             <property name="flag">wxEXPAND</property>
-                            <property name="proportion">1</property>
+                            <property name="proportion">0</property>
                             <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
                                 <property name="name">bSizerRight</property>
diff --git a/3d-viewer/dialogs/panel_3D_display_options_base.h b/3d-viewer/dialogs/panel_3D_display_options_base.h
index 217cd58109..db1242f600 100644
--- a/3d-viewer/dialogs/panel_3D_display_options_base.h
+++ b/3d-viewer/dialogs/panel_3D_display_options_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp b/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp
index 5f4db2e437..33aac7c45e 100644
--- a/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp
+++ b/3d-viewer/dialogs/panel_3D_raytracing_options_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.0-39-g3487c3cb)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -211,9 +211,9 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText21, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 	m_colourPickerLight1 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight1->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight1->SetMinSize( wxSize( 40,20 ) );
 
-	fgSizer11->Add( m_colourPickerLight1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	fgSizer11->Add( m_colourPickerLight1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_lightElevation1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer11->Add( m_lightElevation1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
@@ -229,9 +229,9 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText22, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
 	m_colourPickerLight5 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight5->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight5->SetMinSize( wxSize( 40,20 ) );
 
-	fgSizer11->Add( m_colourPickerLight5, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	fgSizer11->Add( m_colourPickerLight5, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_lightElevation5 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer11->Add( m_lightElevation5, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -244,7 +244,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText23, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
 	m_colourPickerLight2 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight2->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight2->SetMinSize( wxSize( 40,20 ) );
 
 	fgSizer11->Add( m_colourPickerLight2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
@@ -262,7 +262,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText24, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
 	m_colourPickerLight6 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight6->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight6->SetMinSize( wxSize( 40,20 ) );
 
 	fgSizer11->Add( m_colourPickerLight6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
@@ -277,7 +277,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText25, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
 	m_colourPickerLight3 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight3->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight3->SetMinSize( wxSize( 40,20 ) );
 
 	fgSizer11->Add( m_colourPickerLight3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
@@ -295,7 +295,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText26, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
 	m_colourPickerLight7 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight7->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight7->SetMinSize( wxSize( 40,20 ) );
 
 	fgSizer11->Add( m_colourPickerLight7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
@@ -310,7 +310,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText171, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
 	m_colourPickerLight4 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight4->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight4->SetMinSize( wxSize( 40,20 ) );
 
 	fgSizer11->Add( m_colourPickerLight4, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
@@ -328,7 +328,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 	fgSizer11->Add( m_staticText181, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
 	m_colourPickerLight8 = new COLOR_SWATCH( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_colourPickerLight8->SetMinSize( wxSize( 72,20 ) );
+	m_colourPickerLight8->SetMinSize( wxSize( 40,20 ) );
 
 	fgSizer11->Add( m_colourPickerLight8, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
@@ -347,7 +347,6 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 
 	this->SetSizer( bSizerMain );
 	this->Layout();
-	bSizerMain->Fit( this );
 }
 
 PANEL_3D_RAYTRACING_OPTIONS_BASE::~PANEL_3D_RAYTRACING_OPTIONS_BASE()
diff --git a/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp b/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp
index 728863f95e..782cfde2bd 100644
--- a/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp
+++ b/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp
@@ -45,7 +45,7 @@
             <property name="minimum_size"></property>
             <property name="name">PANEL_3D_RAYTRACING_OPTIONS_BASE</property>
             <property name="pos"></property>
-            <property name="size">-1,-1</property>
+            <property name="size">834,514</property>
             <property name="subclass">RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare</property>
             <property name="tooltip"></property>
             <property name="two_step_creation">0</property>
@@ -2282,7 +2282,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
+                                    <property name="flag">wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL</property>
                                     <property name="proportion">0</property>
                                     <object class="CustomControl" expanded="1">
                                         <property name="BottomDockable">1</property>
@@ -2321,7 +2321,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight1</property>
                                         <property name="pane_border">1</property>
@@ -2543,7 +2543,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
+                                    <property name="flag">wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL</property>
                                     <property name="proportion">0</property>
                                     <object class="CustomControl" expanded="1">
                                         <property name="BottomDockable">1</property>
@@ -2582,7 +2582,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight5</property>
                                         <property name="pane_border">1</property>
@@ -2833,7 +2833,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight2</property>
                                         <property name="pane_border">1</property>
@@ -3094,7 +3094,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight6</property>
                                         <property name="pane_border">1</property>
@@ -3345,7 +3345,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight3</property>
                                         <property name="pane_border">1</property>
@@ -3606,7 +3606,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight7</property>
                                         <property name="pane_border">1</property>
@@ -3857,7 +3857,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight4</property>
                                         <property name="pane_border">1</property>
@@ -4118,7 +4118,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">72,20</property>
+                                        <property name="minimum_size">40,20</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_colourPickerLight8</property>
                                         <property name="pane_border">1</property>
diff --git a/3d-viewer/dialogs/panel_3D_raytracing_options_base.h b/3d-viewer/dialogs/panel_3D_raytracing_options_base.h
index 12e98b500f..411aae0485 100644
--- a/3d-viewer/dialogs/panel_3D_raytracing_options_base.h
+++ b/3d-viewer/dialogs/panel_3D_raytracing_options_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -103,7 +103,7 @@ class PANEL_3D_RAYTRACING_OPTIONS_BASE : public RESETTABLE_PANEL
 
 	public:
 
-		PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 834,514 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 
 		~PANEL_3D_RAYTRACING_OPTIONS_BASE();
 
diff --git a/common/dialogs/panel_common_settings_base.cpp b/common/dialogs/panel_common_settings_base.cpp
index c1b77af7a0..36fdcc489b 100644
--- a/common/dialogs/panel_common_settings_base.cpp
+++ b/common/dialogs/panel_common_settings_base.cpp
@@ -210,7 +210,7 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
 
 	m_highContrastLabel = new wxStaticText( this, wxID_ANY, _("High-contrast mode dimming factor:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_highContrastLabel->Wrap( -1 );
-	bSizerHighContrast->Add( m_highContrastLabel, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	bSizerHighContrast->Add( m_highContrastLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 	m_highContrastCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerHighContrast->Add( m_highContrastCtrl, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/common/dialogs/panel_common_settings_base.fbp b/common/dialogs/panel_common_settings_base.fbp
index b4954a6d09..b47366da08 100644
--- a/common/dialogs/panel_common_settings_base.fbp
+++ b/common/dialogs/panel_common_settings_base.fbp
@@ -2092,7 +2092,7 @@
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
-                                            <property name="proportion">1</property>
+                                            <property name="proportion">0</property>
                                             <object class="wxStaticText" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>