diff --git a/utils/screenshotgen/src/guidesign.fbp b/utils/screenshotgen/src/guidesign.fbp
index a1df187060..00e0a5b4f7 100644
--- a/utils/screenshotgen/src/guidesign.fbp
+++ b/utils/screenshotgen/src/guidesign.fbp
@@ -296,7 +296,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Tiny Controls</property>
-                            <property name="select">0</property>
+                            <property name="select">1</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
@@ -768,120 +768,6 @@
                                             <event name="OnUpdateUI"></event>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
-                                        <property name="border">5</property>
-                                        <property name="flag">wxALIGN_CENTER|wxALL</property>
-                                        <property name="proportion">0</property>
-                                        <object class="wxBitmapButton" expanded="1">
-                                            <property name="bg"></property>
-                                            <property name="bitmap">bitmaps/wxwin32x32.png; Load From File</property>
-                                            <property name="context_help"></property>
-                                            <property name="default">0</property>
-                                            <property name="disabled"></property>
-                                            <property name="enabled">1</property>
-                                            <property name="fg"></property>
-                                            <property name="focus"></property>
-                                            <property name="font"></property>
-                                            <property name="hidden">0</property>
-                                            <property name="hover"></property>
-                                            <property name="id">wxID_ANY</property>
-                                            <property name="label">wxBitmapButton</property>
-                                            <property name="maximum_size"></property>
-                                            <property name="minimum_size"></property>
-                                            <property name="name">m_bpButton12</property>
-                                            <property name="permission">protected</property>
-                                            <property name="pos"></property>
-                                            <property name="selected"></property>
-                                            <property name="size"></property>
-                                            <property name="style">wxBU_AUTODRAW</property>
-                                            <property name="subclass"></property>
-                                            <property name="tooltip">wxBitmapButton</property>
-                                            <property name="window_extra_style"></property>
-                                            <property name="window_name"></property>
-                                            <property name="window_style"></property>
-                                            <event name="OnButtonClick"></event>
-                                            <event name="OnChar"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
-                                            <event name="OnLeftDClick"></event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnPaint"></event>
-                                            <event name="OnRightDClick"></event>
-                                            <event name="OnRightDown"></event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
-                                            <event name="OnUpdateUI"></event>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem" expanded="1">
-                                        <property name="border">5</property>
-                                        <property name="flag">wxALIGN_CENTER|wxALL</property>
-                                        <property name="proportion">0</property>
-                                        <object class="wxBitmapButton" expanded="1">
-                                            <property name="bg"></property>
-                                            <property name="bitmap">bitmaps/wxwin32x32.png; Load From File</property>
-                                            <property name="context_help"></property>
-                                            <property name="default">0</property>
-                                            <property name="disabled"></property>
-                                            <property name="enabled">1</property>
-                                            <property name="fg"></property>
-                                            <property name="focus"></property>
-                                            <property name="font"></property>
-                                            <property name="hidden">0</property>
-                                            <property name="hover"></property>
-                                            <property name="id">wxID_ANY</property>
-                                            <property name="label">wxBitmapButton</property>
-                                            <property name="maximum_size"></property>
-                                            <property name="minimum_size"></property>
-                                            <property name="name">m_bpButton11</property>
-                                            <property name="permission">protected</property>
-                                            <property name="pos"></property>
-                                            <property name="selected"></property>
-                                            <property name="size"></property>
-                                            <property name="style">wxBU_AUTODRAW</property>
-                                            <property name="subclass"></property>
-                                            <property name="tooltip">wxBitmapButton</property>
-                                            <property name="window_extra_style"></property>
-                                            <property name="window_name"></property>
-                                            <property name="window_style"></property>
-                                            <event name="OnButtonClick"></event>
-                                            <event name="OnChar"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
-                                            <event name="OnLeftDClick"></event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnPaint"></event>
-                                            <event name="OnRightDClick"></event>
-                                            <event name="OnRightDown"></event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
-                                            <event name="OnUpdateUI"></event>
-                                        </object>
-                                    </object>
                                     <object class="sizeritem" expanded="1">
                                         <property name="border">20</property>
                                         <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
@@ -1348,7 +1234,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Multiple choice Controls</property>
-                            <property name="select">1</property>
+                            <property name="select">0</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
diff --git a/utils/screenshotgen/src/guiframe.cpp b/utils/screenshotgen/src/guiframe.cpp
index b2885382ca..5f1b4ddd0e 100644
--- a/utils/screenshotgen/src/guiframe.cpp
+++ b/utils/screenshotgen/src/guiframe.cpp
@@ -139,20 +139,6 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
 	
 	fgSizer1->Add( m_bitmap1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 );
 	
-	m_bpButton12 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	m_bpButton12->SetToolTip( _("wxBitmapButton") );
-	
-	m_bpButton12->SetToolTip( _("wxBitmapButton") );
-	
-	fgSizer1->Add( m_bpButton12, 0, wxALIGN_CENTER|wxALL, 5 );
-	
-	m_bpButton11 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	m_bpButton11->SetToolTip( _("wxBitmapButton") );
-	
-	m_bpButton11->SetToolTip( _("wxBitmapButton") );
-	
-	fgSizer1->Add( m_bpButton11, 0, wxALIGN_CENTER|wxALL, 5 );
-	
 	m_gauge1 = new wxGauge( m_panel1, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL, wxDefaultValidator, wxT("_Gauge") );
 	m_gauge1->SetValue( 50 ); 
 	m_gauge1->SetToolTip( _("wxGauge") );
@@ -198,7 +184,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
 	m_panel1->SetSizer( fgSizer1 );
 	m_panel1->Layout();
 	fgSizer1->Fit( m_panel1 );
-	m_notebook1->AddPage( m_panel1, _("Tiny Controls"), false );
+	m_notebook1->AddPage( m_panel1, _("Tiny Controls"), true );
 	m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer2;
 	fgSizer2 = new wxFlexGridSizer( 5, 2, 0, 0 );
@@ -274,7 +260,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
 	m_panel2->SetSizer( fgSizer2 );
 	m_panel2->Layout();
 	fgSizer2->Fit( m_panel2 );
-	m_notebook1->AddPage( m_panel2, _("Multiple choice Controls"), true );
+	m_notebook1->AddPage( m_panel2, _("Multiple choice Controls"), false );
 	m_panel3 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer2;
 	bSizer2 = new wxBoxSizer( wxVERTICAL );
diff --git a/utils/screenshotgen/src/guiframe.h b/utils/screenshotgen/src/guiframe.h
index 40d3bfed0a..89105a1e62 100644
--- a/utils/screenshotgen/src/guiframe.h
+++ b/utils/screenshotgen/src/guiframe.h
@@ -91,8 +91,6 @@ class GUIFrame : public wxFrame
 		wxRadioButton* m_radioBtn2;
 		wxBitmapButton* m_bpButton1;
 		wxStaticBitmap* m_bitmap1;
-		wxBitmapButton* m_bpButton12;
-		wxBitmapButton* m_bpButton11;
 		wxGauge* m_gauge1;
 		wxSlider* m_slider1;
 		wxToggleButton* m_toggleBtn1;
diff --git a/utils/screenshotgen/src/screenshot_main.cpp b/utils/screenshotgen/src/screenshot_main.cpp
index 2994deb5bc..a8697bdbae 100644
--- a/utils/screenshotgen/src/screenshot_main.cpp
+++ b/utils/screenshotgen/src/screenshot_main.cpp
@@ -80,6 +80,9 @@ ScreenshotFrame::~ScreenshotFrame()
 */
 void ScreenshotFrame::InitFBControls()
 {
+    // explicitely uncheck radio button:
+    m_radioBtn2->SetValue(false);
+
     // For some reason, wxFormBuilder does not set the scrollbar range
     m_scrollBar1->SetScrollbar(50, 1, 100, 1);