diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp
index bbd6cd967f..7462e6afe4 100644
--- a/common/dialogs/dialog_page_settings.cpp
+++ b/common/dialogs/dialog_page_settings.cpp
@@ -119,7 +119,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()
     // The first shows translated strings, the second contains not translated strings
     m_paperSizeComboBox->Clear();
 
-    for( unsigned ii = 0; ii<DIM(pageFmts); ii++ )
+    for( unsigned ii = 0; ii < DIM(pageFmts); ii++ )
     {
         m_pageFmt.Add( pageFmts[ii] );
         m_paperSizeComboBox->Append( wxGetTranslation( pageFmts[ii] ) );
diff --git a/common/dialogs/dialog_page_settings_base.cpp b/common/dialogs/dialog_page_settings_base.cpp
index e11dff30ca..d38544a21e 100644
--- a/common/dialogs/dialog_page_settings_base.cpp
+++ b/common/dialogs/dialog_page_settings_base.cpp
@@ -35,7 +35,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
 	
 	wxString m_paperSizeComboBoxChoices[] = { _("dummy text") };
 	int m_paperSizeComboBoxNChoices = sizeof( m_paperSizeComboBoxChoices ) / sizeof( wxString );
-	m_paperSizeComboBox = new wxChoice( this, ID_CHICE_PAGE_SIZE, wxDefaultPosition, wxDefaultSize, m_paperSizeComboBoxNChoices, m_paperSizeComboBoxChoices, 0 );
+	m_paperSizeComboBox = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_paperSizeComboBoxNChoices, m_paperSizeComboBoxChoices, 0 );
 	m_paperSizeComboBox->SetSelection( 0 );
 	bleftSizer->Add( m_paperSizeComboBox, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
diff --git a/common/dialogs/dialog_page_settings_base.fbp b/common/dialogs/dialog_page_settings_base.fbp
index 7cbdda3d75..220b6d3fef 100644
--- a/common/dialogs/dialog_page_settings_base.fbp
+++ b/common/dialogs/dialog_page_settings_base.fbp
@@ -390,7 +390,7 @@
                                         <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
-                                        <property name="id">ID_CHICE_PAGE_SIZE</property>
+                                        <property name="id">wxID_ANY</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
diff --git a/common/dialogs/dialog_page_settings_base.h b/common/dialogs/dialog_page_settings_base.h
index f4bcc42ab8..2fba886d27 100644
--- a/common/dialogs/dialog_page_settings_base.h
+++ b/common/dialogs/dialog_page_settings_base.h
@@ -37,27 +37,26 @@ class DIALOG_SHIM;
 
 ///////////////////////////////////////////////////////////////////////////
 
-#define ID_CHICE_PAGE_SIZE 1000
-#define ID_CHOICE_PAGE_ORIENTATION 1001
-#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 1002
-#define ID_TEXTCTRL_USER_PAGE_SIZE_X 1003
-#define ID_TEXTCTRL_DATE 1004
-#define ID_BTN_APPLY_DATE 1005
-#define ID_PICKER_DATE 1006
-#define ID_CHECKBOX_DATE 1007
-#define ID_TEXTCTRL_REVISION 1008
-#define ID_CHECKBOX_REVISION 1009
-#define ID_TEXTCTRL_TITLE 1010
-#define ID_TEXTCTRL_COMPANY 1011
-#define ID_CHECKBOX_COMPANY 1012
-#define ID_TEXTCTRL_COMMENT1 1013
-#define ID_CHECKBOX_COMMENT1 1014
-#define ID_TEXTCTRL_COMMENT2 1015
-#define ID_CHECKBOX_COMMENT2 1016
-#define ID_TEXTCTRL_COMMENT3 1017
-#define ID_CHECKBOX_COMMENT3 1018
-#define ID_TEXTCTRL_COMMENT4 1019
-#define ID_CHECKBOX_COMMENT4 1020
+#define ID_CHOICE_PAGE_ORIENTATION 1000
+#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 1001
+#define ID_TEXTCTRL_USER_PAGE_SIZE_X 1002
+#define ID_TEXTCTRL_DATE 1003
+#define ID_BTN_APPLY_DATE 1004
+#define ID_PICKER_DATE 1005
+#define ID_CHECKBOX_DATE 1006
+#define ID_TEXTCTRL_REVISION 1007
+#define ID_CHECKBOX_REVISION 1008
+#define ID_TEXTCTRL_TITLE 1009
+#define ID_TEXTCTRL_COMPANY 1010
+#define ID_CHECKBOX_COMPANY 1011
+#define ID_TEXTCTRL_COMMENT1 1012
+#define ID_CHECKBOX_COMMENT1 1013
+#define ID_TEXTCTRL_COMMENT2 1014
+#define ID_CHECKBOX_COMMENT2 1015
+#define ID_TEXTCTRL_COMMENT3 1016
+#define ID_CHECKBOX_COMMENT3 1017
+#define ID_TEXTCTRL_COMMENT4 1018
+#define ID_CHECKBOX_COMMENT4 1019
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DIALOG_PAGES_SETTINGS_BASE