diff --git a/reactos/dll/cpl/main/lang/bg-BG.rc b/reactos/dll/cpl/main/lang/bg-BG.rc
index a82b10c114b..7cb300477d4 100644
--- a/reactos/dll/cpl/main/lang/bg-BG.rc
+++ b/reactos/dll/cpl/main/lang/bg-BG.rc
@@ -7,12 +7,12 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Повтаряне на знаците", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Забавяне на повтарянето ", -1, 40, 15, 90, 10
   LTEXT "Кратко", -1, 35, 30, 25, 10
   LTEXT "Дълго", -1, 200, 30, 25, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Скорост на повтаряне", -1, 40, 65, 110, 10
   LTEXT "Бавно", -1, 40, 80, 20, 10
   LTEXT "Бързо", -1, 200, 80, 20, 10
@@ -44,7 +44,7 @@ BEGIN
   PUSHBUTTON "&Добре", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Отказ", IDCANCEL, 175, 75, 50, 15
   LTEXT "На&стройка продължителността на задържане на цъка на мишката, необходимо за да бъде отчетено цъкането",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -135,7 +135,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Превъртане", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Завъртане на колелото на една стъпка", -1, 60, 15, 150, 10
   RADIOBUTTON "Брой &редове наведнъж", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Един екран наведнъж", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/cs-CZ.rc b/reactos/dll/cpl/main/lang/cs-CZ.rc
index 9b578697bc5..2c626bab89d 100644
--- a/reactos/dll/cpl/main/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/main/lang/cs-CZ.rc
@@ -6,12 +6,12 @@ CAPTION "Rychlost"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Opakovбnн znakщ", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Prodleva pшed opakovбnнm", -1, 40, 15, 150, 10
   LTEXT "Dlouhб", -1, 40, 30, 25, 10
   LTEXT "Krбtkб", -1, 200, 30, 25, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Rychlost opakovбnн", -1, 40, 70, 120, 10
   LTEXT "Malб", -1, 40, 85, 25, 10
   LTEXT "Velkб", -1, 200, 85, 25, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "Storno", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Nastavte dobu, po kterou musнte drћet tlaинtko myљi stisknutй, neћ se funkce ClickLock aktivuje.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "Kole
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Posouvбnн", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Otoиenн koleиka o jeden krok posune o:", -1, 60, 15, 150, 10
   RADIOBUTTON "&tento poиet шбdkщ", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&celou obrazovku", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/de-DE.rc b/reactos/dll/cpl/main/lang/de-DE.rc
index cb65bed49d5..56da8f9bf42 100644
--- a/reactos/dll/cpl/main/lang/de-DE.rc
+++ b/reactos/dll/cpl/main/lang/de-DE.rc
@@ -8,12 +8,12 @@ CAPTION "Geschwindigkeit"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Zeichenwiederholung", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Verzцgerung:", -1, 40, 15, 50, 10
   LTEXT "Lang", -1, 40, 30, 24, 10
   LTEXT "Kurz", -1, 200, 30, 24, 10
   CONTROL "", IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Wiederholrate:", -1, 40, 70, 50, 10
   LTEXT "Niedrig", -1, 40, 85, 24, 10
   LTEXT "Hoch", -1, 200, 85, 24, 10
@@ -45,7 +45,7 @@ BEGIN
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Abbrechen", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Stellen Sie ein, wie lange eine Maus- oder Trackballtaste gedrьckt werden muss, bevor die KlickEinrasten-Funktion aktiviert wird.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -132,7 +132,7 @@ CAPTION "Rad"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bildlauf", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgefьhrt um:", -1, 60, 11, 150, 16
   RADIOBUTTON "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/el-GR.rc b/reactos/dll/cpl/main/lang/el-GR.rc
index c8ea77df4c9..b2bf57bcc40 100644
--- a/reactos/dll/cpl/main/lang/el-GR.rc
+++ b/reactos/dll/cpl/main/lang/el-GR.rc
@@ -6,12 +6,12 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "ЕрбнЬлзшз чбсбкфЮсб", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&КбихуфЭсзуз ербнЬлшзт:", -1, 36, 15, 100, 10
   LTEXT "МегЬлз", -1, 36, 30, 25, 10
   LTEXT "МйксЮ", -1, 197, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Схимьт еренЬлзшзт:", -1, 36, 60, 70, 10
   LTEXT "Мйксьт", -1, 36, 75, 23, 10
   LTEXT "МегЬлпт", -1, 197, 75, 28, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "ў&кхсп", IDCANCEL, 175, 75, 50, 15
   LTEXT "&ЕрйлЭофе рьуп рсЭрей нб ксбфЮуефе рбфзмЭнп фп кпхмрЯ фпх рпнфйкйпэ мЭчсй нб клейдщиеЯ",-1,60,15,170,30  
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "МефбкЯнзуз", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "МефбкЯнзуз кбфб фзн кэлйуз фпх фспчпэ кбфб мйб иЭуз:", -1, 60, 15, 150, 20
   RADIOBUTTON "&Бсйимьт гсбммюн фзн цпсЬ", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Пльклзсз уелЯдб", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/en-US.rc b/reactos/dll/cpl/main/lang/en-US.rc
index 007b9338ca9..634ddb54c05 100644
--- a/reactos/dll/cpl/main/lang/en-US.rc
+++ b/reactos/dll/cpl/main/lang/en-US.rc
@@ -5,22 +5,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Speed"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
-  LTEXT "Repeat &delay", -1, 40, 15, 50, 10
-  LTEXT "Long", -1, 40, 30, 20, 10
-  LTEXT "Short", -1, 200, 30, 20, 10
-  CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
-  LTEXT "&Repeat rate", -1, 40, 70, 50, 10
+  GROUPBOX "Character repeat", -1, 5, 5, 236, 135
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15
+  LTEXT "Repeat &delay:", -1, 40, 18, 100, 10
+  LTEXT "Long", -1, 40, 33, 20, 10
+  LTEXT "Short", -1, 200, 33, 20, 10
+  CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 33, 130, 17
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 13, 70, 15, 15
+  LTEXT "&Repeat rate:", -1, 40, 70, 100, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17
-  LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 200, 10
-  EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP
-  GROUPBOX "Cursor &blink rate:", -1, 5, 145, 230, 50
+  LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 216, 10
+  EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP
+  GROUPBOX "Cursor &blink rate:", -1, 5, 145, 236, 50
   LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8
-  LTEXT "None", -1, 40, 165, 30, 10
+  LTEXT "None", -1, 40, 165, 25, 10
   LTEXT "Fast", -1, 200, 165, 30, 10
   CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17
 END
@@ -32,18 +32,18 @@ FONT 8, "MS Shell Dlg"
 BEGIN
 END
 
-IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100
+IDD_CLICK_LOCK DIALOGEX 0, 0, 240, 78
 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Click Lock"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Short", -1, 35,  50, 30, 10
-  LTEXT "Long", -1, 140, 50, 30, 10
-  CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17
-  PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
-  PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15
-  LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  LTEXT "Short", -1, 50, 35, 27, 10
+  LTEXT "Long", -1, 157, 35, 27, 10
+  CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17
+  PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
+  PUSHBUTTON "&Cancel", IDCANCEL, 174, 59, 60, 14
+  LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,37,5,200,27
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -51,20 +51,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Button"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Button configuration", -1, 5, 5, 230, 70
-  CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 140, 10
-  CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 14, 65, 57, WS_EX_STATICEDGE
-  LTEXT "Select this checkbox to make the right mouse button the one used for primary functions such as selecting and dragging.", -1, 10, 36, 150, 30
-  GROUPBOX "Double-click speed", -1, 5, 78, 230, 70
-  LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 90, 150, 28
+  GROUPBOX "Button configuration", -1, 5, 5, 236, 70
+  CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 156, 10
+  CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE
+  LTEXT "Select this checkbox to make the right mouse button the one used for primary functions such as selecting and dragging.", -1, 10, 36, 156, 30
+  GROUPBOX "Double-click speed", -1, 5, 78, 236, 70
+  LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 90, 156, 28
   LTEXT "Spee&d:   Slow", -1, 10, 123, 50, 10
   LTEXT "Fast", -1, 136, 123, 24, 10
   CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17
-  CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 87, 65, 57, WS_EX_STATICEDGE
-  GROUPBOX "ClickLock", -1, 5, 150, 230, 70
+  CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 171, 87, 65, 57, WS_EX_STATICEDGE
+  GROUPBOX "ClickLock", -1, 5, 150, 236, 70
   CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20
-  PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 166, 161, 60, 14
-  LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again.", -1, 10, 180, 216, 30
+  PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14
+  LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again.", -1, 10, 180, 224, 30
 END
 
 IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228
@@ -84,15 +84,15 @@ BEGIN
   PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14
 END
 
-IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75
+IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53
 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10
+  LTEXT "Save this cursor scheme as:", -1, 5, 5, 181, 10
   EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP
-  PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15
-  PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15
+  PUSHBUTTON "&OK", IDOK, 63, 35, 60, 14
+  PUSHBUTTON "&Cancel", IDCANCEL, 126, 35, 60, 14
 END
 
 
@@ -131,9 +131,9 @@ CAPTION "Wheel"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Scrolling", -1, 5, 5, 236, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
-  RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
+  RADIOBUTTON "The following &number of lines at a time:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
   EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP
   CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12
diff --git a/reactos/dll/cpl/main/lang/es-ES.rc b/reactos/dll/cpl/main/lang/es-ES.rc
index 5b09b872d7b..ef9c7f80464 100644
--- a/reactos/dll/cpl/main/lang/es-ES.rc
+++ b/reactos/dll/cpl/main/lang/es-ES.rc
@@ -6,12 +6,12 @@ CAPTION "Velocidad"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Repeticiуn de caracteres", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Retra&so de la repeticiуn", -1, 40, 15, 50, 10
   LTEXT "Largo", -1, 40, 30, 20, 10
   LTEXT "Corto", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "Velocidad de &repeticiуn", -1, 40, 70, 50, 10
   LTEXT "Lenta", -1, 40, 85, 20, 10
   LTEXT "Rбpida", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "&Aceptar", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Cancelar", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Ajustar el tiempo que debe mantenerse presionado un botуn del ratуn o de la bola de seguimiento antes de que el clic se bloquee.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "Rueda"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Desplazamiento", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Girar la rueda una posiciуn para desplazar", -1, 60, 15, 150, 10
   RADIOBUTTON "&El siguiente nъmero de lнneas a la vez", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Una pantalla a la vez", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/fr-FR.rc b/reactos/dll/cpl/main/lang/fr-FR.rc
index 6333796420e..a0831167526 100644
--- a/reactos/dll/cpl/main/lang/fr-FR.rc
+++ b/reactos/dll/cpl/main/lang/fr-FR.rc
@@ -6,12 +6,12 @@ CAPTION "Vitesse"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Rйpйtition des caractиres", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Dйlai de rйpйtition", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Court", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Dйlai de rйpйtition", -1, 40, 70, 50, 10
   LTEXT "Lent", -1, 40, 85, 20, 10
   LTEXT "Rapide", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Annuler", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Ajuste le temps nйcessaire pendant lequel vous devez cliquer avant de verrouiller le clic.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "Roulette"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Dйfilement", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Bouger la roulette pour dйfiler", -1, 60, 15, 150, 10
   RADIOBUTTON "Le nombre suivant de &lignes а la fois", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Une page а la fois", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/hu-HU.rc b/reactos/dll/cpl/main/lang/hu-HU.rc
index 763ac55ab14..e7ea08af5e8 100644
--- a/reactos/dll/cpl/main/lang/hu-HU.rc
+++ b/reactos/dll/cpl/main/lang/hu-HU.rc
@@ -6,12 +6,12 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Repeat &delay", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Short", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Repeat rate", -1, 40, 70, 50, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "Wheel"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Scrolling", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
   RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/id-ID.rc b/reactos/dll/cpl/main/lang/id-ID.rc
index d81fd6a4159..1d47f5320d5 100644
--- a/reactos/dll/cpl/main/lang/id-ID.rc
+++ b/reactos/dll/cpl/main/lang/id-ID.rc
@@ -6,12 +6,12 @@ CAPTION "Kecepatan"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Pengulangan karakter", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Ten&ggang pengulangan", -1, 40, 15, 50, 10
   LTEXT "Panjang", -1, 40, 30, 20, 10
   LTEXT "Pendek", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "Rata-rata &Pengulangan", -1, 40, 70, 50, 10
   LTEXT "Lambat", -1, 40, 85, 20, 10
   LTEXT "Cepat", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Batal", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Sesuaikan berapa lama anda perlu menekan mouse atau tombol trackball sebelum klik anda dikunci",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "Roda"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Menggulung", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Putar roda satu derajat untuk menggulung", -1, 60, 15, 150, 10
   RADIOBUTTON "&Jumlah baris berikut sekali waktu", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Satu layar sekali waktu", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/it-IT.rc b/reactos/dll/cpl/main/lang/it-IT.rc
index b77786591ba..b4c991c8bf6 100644
--- a/reactos/dll/cpl/main/lang/it-IT.rc
+++ b/reactos/dll/cpl/main/lang/it-IT.rc
@@ -8,12 +8,12 @@ CAPTION "Velocit
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ripetizione caratteri", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Ritardo della ripetizione", -1, 40, 15, 150, 10
   LTEXT "Lungo", -1, 40, 30, 20, 10
   LTEXT "Corto", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Frequenza ripetizione", -1, 40, 60, 150, 10
   LTEXT "Lenta", -1, 40, 75, 20, 10
   LTEXT "Veloce", -1, 200, 75, 20, 10
@@ -45,7 +45,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Annulla", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Regola per quanto deve rimanere premuto il tasto di un mouse o una trackball prima che il clic sia rilevato",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -133,7 +133,7 @@ CAPTION "Rotella"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Scorrimento", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Gira la rotella una tacca per scorrere", -1, 60, 15, 150, 10
   RADIOBUTTON "Il seguente numero di linee per volta", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Uno schermo alla volta", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/ja-JP.rc b/reactos/dll/cpl/main/lang/ja-JP.rc
index 8b81aa8e3ce..079dba3beb1 100644
--- a/reactos/dll/cpl/main/lang/ja-JP.rc
+++ b/reactos/dll/cpl/main/lang/ja-JP.rc
@@ -6,12 +6,12 @@ CAPTION "Speed"
 FONT 9, "MS UI Gothic"
 BEGIN
   GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Repeat &delay", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Short", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Repeat rate", -1, 40, 70, 50, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "Wheel"
 FONT 9, "MS UI Gothic"
 BEGIN
   GROUPBOX "Scrolling", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
   RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/nl-NL.rc b/reactos/dll/cpl/main/lang/nl-NL.rc
index 661d6b60a28..9ebc1880ddd 100644
--- a/reactos/dll/cpl/main/lang/nl-NL.rc
+++ b/reactos/dll/cpl/main/lang/nl-NL.rc
@@ -7,12 +7,12 @@ CAPTION "Snelheid"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Tekenherhaling", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Herhaalvertraging:", -1, 40, 15, 50, 10
   LTEXT "Lang", -1, 40, 30, 20, 10
   LTEXT "Kort", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "Herhaal&snelheid:", -1, 40, 70, 50, 10
   LTEXT "Langzaam", -1, 40, 85, 20, 10
   LTEXT "Snel", -1, 200, 85, 20, 10
@@ -44,7 +44,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Annuleren", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Stel in hoe lang de muisknop ingedrukt moet worden voordat de klik vergrendeld is.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -132,7 +132,7 @@ CAPTION "Bladerwieltje"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Schuiven", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Bij elke rolbeweging van het bladerwieltje:", -1, 60, 15, 150, 10
   RADIOBUTTON "Dit &aantal regels verschuiven:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&Een scherm tegelijk verschuiven", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/pl-PL.rc b/reactos/dll/cpl/main/lang/pl-PL.rc
index 989d150cb6b..b0f06f75acc 100644
--- a/reactos/dll/cpl/main/lang/pl-PL.rc
+++ b/reactos/dll/cpl/main/lang/pl-PL.rc
@@ -12,12 +12,12 @@ CAPTION "Szybko
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Powtarzanie znaku", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Opуџnienie powtarzania:", -1, 40, 15, 50, 10
   LTEXT "Duїe", -1, 40, 30, 20, 10
   LTEXT "Maіe", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Czкstotliwoњж powtarzania", -1, 40, 70, 50, 10
   LTEXT "Maіa", -1, 40, 85, 20, 10
   LTEXT "Duїa", -1, 200, 85, 20, 10
@@ -49,7 +49,7 @@ BEGIN
   PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Anuluj", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Dopasuj czas potrzebny do przytrzymania wciњniкtego przycisku myszy lub urz№dzenia wskazuj№cego przed „zablokowaniem” klikniкcia.",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -137,7 +137,7 @@ CAPTION "K
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Przewijanie", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Obrуcenie kуіkiem o jeden skok powoduje przewiniкcie:", -1, 60, 15, 150, 10
   RADIOBUTTON "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/ru-RU.rc b/reactos/dll/cpl/main/lang/ru-RU.rc
index 3aa6d0c56ad..9b61b28d018 100644
--- a/reactos/dll/cpl/main/lang/ru-RU.rc
+++ b/reactos/dll/cpl/main/lang/ru-RU.rc
@@ -6,12 +6,12 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Повтор вводимого символа", -1, 5, 5, 230, 150
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Задержка перед началом повтора:", -1, 40, 15, 160, 10
   LTEXT "Длиннее", -1, 25, 30, 28, 10
   LTEXT "Короче", -1, 200, 30, 25, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Скорость повтора:", -1, 40, 70, 100, 10
   LTEXT "Ниже", -1, 40, 85, 20, 10
   LTEXT "Выше", -1, 200, 85, 20, 10
@@ -43,7 +43,7 @@ BEGIN
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Отмена", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -131,7 +131,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Прокрутка", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Поворот колесика на один щелчок служит для прокрутки:", -1, 20, 15, 212, 10
   RADIOBUTTON "на указанное количество &строк:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "на один &экран", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/sk-SK.rc b/reactos/dll/cpl/main/lang/sk-SK.rc
index 70c4e4c7083..de6edde0188 100644
--- a/reactos/dll/cpl/main/lang/sk-SK.rc
+++ b/reactos/dll/cpl/main/lang/sk-SK.rc
@@ -12,12 +12,12 @@ CAPTION "R
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Character repeat", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "Repeat &delay", -1, 40, 15, 50, 10
   LTEXT "Long", -1, 40, 30, 20, 10
   LTEXT "Short", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Repeat rate", -1, 40, 70, 50, 10
   LTEXT "Slow", -1, 40, 85, 20, 10
   LTEXT "Fast", -1, 200, 85, 20, 10
@@ -49,7 +49,7 @@ BEGIN
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Zruљiќ", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -137,7 +137,7 @@ CAPTION "Koliesko"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Rolovanie", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10
   RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/lang/uk-UA.rc b/reactos/dll/cpl/main/lang/uk-UA.rc
index 8e80559a319..992bed618b5 100644
--- a/reactos/dll/cpl/main/lang/uk-UA.rc
+++ b/reactos/dll/cpl/main/lang/uk-UA.rc
@@ -14,12 +14,12 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Повтор символу, що вводиться", -1, 5, 5, 230, 130
-  ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
+  ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
   LTEXT "&Затримка перед початком повтору символу", -1, 40, 15, 50, 10
   LTEXT "Довше", -1, 40, 30, 20, 10
   LTEXT "Коротше", -1, 200, 30, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
-  ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
+  ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
   LTEXT "&Швидкість повтору", -1, 40, 70, 50, 10
   LTEXT "Нижче", -1, 40, 85, 20, 10
   LTEXT "Вище", -1, 200, 85, 20, 10
@@ -51,7 +51,7 @@ BEGIN
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Скасувати", IDCANCEL, 175, 75, 50, 15
   LTEXT "&Виберіть, як довго слід утримувати натиснуту кнопку миші або трекбола перед спрацьовуванням заліпанія",-1,60,15,170,30
-  ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+  ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
@@ -139,7 +139,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Прокрутка", -1, 5, 5, 230, 80
-  ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15
+  ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
   LTEXT "Поворот колисчатка на одне клацання прокручує", -1, 60, 15, 150, 10
   RADIOBUTTON "На вказану кількість &рядків:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "На один &екран", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
diff --git a/reactos/dll/cpl/main/main.rc b/reactos/dll/cpl/main/main.rc
index 0a11f6c16b4..54ab6cd6b52 100644
--- a/reactos/dll/cpl/main/main.rc
+++ b/reactos/dll/cpl/main/main.rc
@@ -21,5 +21,9 @@ IDI_MOUSE_SPEED     ICON "resources/mouse_speed.ico"
 IDI_MOUSE_BUTTON    ICON "resources/mouse_button.ico"
 IDI_MOUSE_TRAILS    ICON "resources/mouse_trails.ico"
 IDI_MOUSE_POINTER   ICON "resources/mouse_pointer.ico"
+IDI_MOUSE_WHEEL     ICON "resources/mouse_wheel.ico"
+IDI_REPEAT_RATE     ICON "resources/repeat_rate.ico"
+IDI_REPEAT_DELAY    ICON "resources/repeat_delay.ico"
+IDI_LOOK_KEY        ICON "resources/look_key.ico"
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
index 495269d7299..220521888fd 100644
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@@ -201,6 +201,7 @@ ClickLockProc(IN HWND hwndDlg,
 {
     HWND hDlgCtrl;
     int pos;
+    static HICON hIcon;
 
     PBUTTON_DATA pButtonData;
 
@@ -216,6 +217,10 @@ ClickLockProc(IN HWND hwndDlg,
             SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10));
             pos = (pButtonData->g_ClickLockTime - 200) / 200;
             SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos);
+
+            hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOOK_KEY),
+                              IMAGE_ICON, 16, 16, 0);
+            SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
             return TRUE;
 
         case WM_COMMAND:
diff --git a/reactos/dll/cpl/main/resource.h b/reactos/dll/cpl/main/resource.h
index 0df697a33d1..745a09db19d 100644
--- a/reactos/dll/cpl/main/resource.h
+++ b/reactos/dll/cpl/main/resource.h
@@ -13,6 +13,10 @@
 #define IDI_MOUSE_BUTTON                    206
 #define IDI_MOUSE_TRAILS                    207
 #define IDI_MOUSE_POINTER                   208
+#define IDI_MOUSE_WHEEL                     209
+#define IDI_REPEAT_RATE                     210
+#define IDI_REPEAT_DELAY                    211
+#define IDI_LOOK_KEY                        212
 
 #define IDD_PAGE_BUTTON                     101
 #define IDD_PAGE_POINTER                    102
diff --git a/reactos/dll/cpl/main/resources/look_key.ico b/reactos/dll/cpl/main/resources/look_key.ico
new file mode 100644
index 00000000000..41cd4449f4d
Binary files /dev/null and b/reactos/dll/cpl/main/resources/look_key.ico differ
diff --git a/reactos/dll/cpl/main/resources/mouse_wheel.ico b/reactos/dll/cpl/main/resources/mouse_wheel.ico
new file mode 100644
index 00000000000..c2004b4e9bf
Binary files /dev/null and b/reactos/dll/cpl/main/resources/mouse_wheel.ico differ
diff --git a/reactos/dll/cpl/main/resources/repeat_delay.ico b/reactos/dll/cpl/main/resources/repeat_delay.ico
new file mode 100644
index 00000000000..ba3752badfb
Binary files /dev/null and b/reactos/dll/cpl/main/resources/repeat_delay.ico differ
diff --git a/reactos/dll/cpl/main/resources/repeat_rate.ico b/reactos/dll/cpl/main/resources/repeat_rate.ico
new file mode 100644
index 00000000000..bf260f501d2
Binary files /dev/null and b/reactos/dll/cpl/main/resources/repeat_rate.ico differ