diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt
index 9746795a7fd..c6a5cdf5f65 100644
--- a/dll/cpl/main/CMakeLists.txt
+++ b/dll/cpl/main/CMakeLists.txt
@@ -7,7 +7,8 @@ list(APPEND SOURCE
     mouse.c
     main.h)
 
-file(GLOB main_rc_deps resources/*.*)
+set(ICONS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../win32/shell32/res/icons)
+file(GLOB main_rc_deps resources/*.* ${ICONS_DIR}/38.ico ${ICONS_DIR}/39.ico)
 add_rc_deps(main.rc ${main_rc_deps})
 
 add_library(main MODULE
diff --git a/dll/cpl/main/lang/bg-BG.rc b/dll/cpl/main/lang/bg-BG.rc
index 9ef7d2e17e1..9f3ae82e16f 100644
--- a/dll/cpl/main/lang/bg-BG.rc
+++ b/dll/cpl/main/lang/bg-BG.rc
@@ -43,7 +43,7 @@ BEGIN
     PUSHBUTTON "&Добре", IDOK, 120, 75, 50, 15
     PUSHBUTTON "&Отказ", IDCANCEL, 175, 75, 50, 15
     LTEXT "На&стройка продължителността на задържане на цъка на мишката, необходимо за да бъде отчетено цъкането", -1, 60, 15, 170, 30
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/cs-CZ.rc b/dll/cpl/main/lang/cs-CZ.rc
index 207afb38c5f..a86bb826aca 100644
--- a/dll/cpl/main/lang/cs-CZ.rc
+++ b/dll/cpl/main/lang/cs-CZ.rc
@@ -49,7 +49,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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/de-DE.rc b/dll/cpl/main/lang/de-DE.rc
index e858533cb95..46b2cbae25e 100644
--- a/dll/cpl/main/lang/de-DE.rc
+++ b/dll/cpl/main/lang/de-DE.rc
@@ -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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/el-GR.rc b/dll/cpl/main/lang/el-GR.rc
index d4ca1e4d796..a7eeb9b5749 100644
--- a/dll/cpl/main/lang/el-GR.rc
+++ b/dll/cpl/main/lang/el-GR.rc
@@ -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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/en-US.rc b/dll/cpl/main/lang/en-US.rc
index 033b265e4af..0e165d4df54 100644
--- a/dll/cpl/main/lang/en-US.rc
+++ b/dll/cpl/main/lang/en-US.rc
@@ -43,7 +43,7 @@ BEGIN
     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
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/es-ES.rc b/dll/cpl/main/lang/es-ES.rc
index 4434f07abd2..3f33320c5b7 100644
--- a/dll/cpl/main/lang/es-ES.rc
+++ b/dll/cpl/main/lang/es-ES.rc
@@ -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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/fr-FR.rc b/dll/cpl/main/lang/fr-FR.rc
index c523ebfcee8..1a09f402d1a 100644
--- a/dll/cpl/main/lang/fr-FR.rc
+++ b/dll/cpl/main/lang/fr-FR.rc
@@ -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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/he-IL.rc b/dll/cpl/main/lang/he-IL.rc
index 7b03f3b4df3..80ec90bdf5f 100644
--- a/dll/cpl/main/lang/he-IL.rc
+++ b/dll/cpl/main/lang/he-IL.rc
@@ -45,7 +45,7 @@ BEGIN
     PUSHBUTTON "אישור", IDOK, 110, 59, 60, 14
     PUSHBUTTON "ביטול", 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
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/hu-HU.rc b/dll/cpl/main/lang/hu-HU.rc
index 680d92d2dfa..da5433dd099 100644
--- a/dll/cpl/main/lang/hu-HU.rc
+++ b/dll/cpl/main/lang/hu-HU.rc
@@ -43,7 +43,7 @@ BEGIN
     PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
     PUSHBUTTON "&Mégse", IDCANCEL, 174, 59, 60, 14
     LTEXT "&Beállíthatja milyen hosszan kell lenyomva tartania az egér vagy hanyattegér gombját, mielőtt megmarkolná\naz elemet.", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/id-ID.rc b/dll/cpl/main/lang/id-ID.rc
index c47eafe12a0..57e327ffe9d 100644
--- a/dll/cpl/main/lang/id-ID.rc
+++ b/dll/cpl/main/lang/id-ID.rc
@@ -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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/it-IT.rc b/dll/cpl/main/lang/it-IT.rc
index d042575cc27..c1e128e3d1c 100644
--- a/dll/cpl/main/lang/it-IT.rc
+++ b/dll/cpl/main/lang/it-IT.rc
@@ -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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/ja-JP.rc b/dll/cpl/main/lang/ja-JP.rc
index 6b84aa1d8f4..6f094c9a4a9 100644
--- a/dll/cpl/main/lang/ja-JP.rc
+++ b/dll/cpl/main/lang/ja-JP.rc
@@ -43,7 +43,7 @@ BEGIN
     PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
     PUSHBUTTON "キャンセル(&C)", IDCANCEL, 174, 59, 60, 14
     LTEXT "クリックする前にマウスかトラックボールのボタンをどの程度押し続けるかを補正する(&A)", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/nl-NL.rc b/dll/cpl/main/lang/nl-NL.rc
index 69b93ab3fdf..f1b20ac203e 100644
--- a/dll/cpl/main/lang/nl-NL.rc
+++ b/dll/cpl/main/lang/nl-NL.rc
@@ -43,7 +43,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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/no-NO.rc b/dll/cpl/main/lang/no-NO.rc
index c7566905289..e774e93c04a 100644
--- a/dll/cpl/main/lang/no-NO.rc
+++ b/dll/cpl/main/lang/no-NO.rc
@@ -43,7 +43,7 @@ BEGIN
     PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
     PUSHBUTTON "&Avbryt", IDCANCEL, 174, 59, 60, 14
     LTEXT "&Juster hvor lenge du må holde mus eller styrekuleknappen nede før klikket er låst.", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/pl-PL.rc b/dll/cpl/main/lang/pl-PL.rc
index d1c49a5a706..c8c4d7dd5a0 100644
--- a/dll/cpl/main/lang/pl-PL.rc
+++ b/dll/cpl/main/lang/pl-PL.rc
@@ -51,7 +51,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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/pt-PT.rc b/dll/cpl/main/lang/pt-PT.rc
index 4646b79fce4..ce463172d58 100644
--- a/dll/cpl/main/lang/pt-PT.rc
+++ b/dll/cpl/main/lang/pt-PT.rc
@@ -43,7 +43,7 @@ BEGIN
     PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
     PUSHBUTTON "&Cancelar", IDCANCEL, 174, 59, 60, 14
     LTEXT "&Ajuste por quanto tempo precisa manter pressionado o botão do rato ou do trackball antes que o clique seja bloqueado", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/ro-RO.rc b/dll/cpl/main/lang/ro-RO.rc
index e8d137731c2..ac4feae62bc 100644
--- a/dll/cpl/main/lang/ro-RO.rc
+++ b/dll/cpl/main/lang/ro-RO.rc
@@ -52,7 +52,7 @@ BEGIN
     PUSHBUTTON "Con&firmă", IDOK, 110, 59, 60, 14
     PUSHBUTTON "A&nulează", IDCANCEL, 174, 59, 60, 14
     LTEXT "Sp&ecificați perioada de menținere apăsată a unui buton pentru a-l imobiliza.", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/ru-RU.rc b/dll/cpl/main/lang/ru-RU.rc
index b583ac990eb..69c24083725 100644
--- a/dll/cpl/main/lang/ru-RU.rc
+++ b/dll/cpl/main/lang/ru-RU.rc
@@ -43,7 +43,7 @@ BEGIN
     PUSHBUTTON "&OK", IDOK, 120, 79, 50, 15
     PUSHBUTTON "&Отмена", IDCANCEL, 177, 79, 50, 15
     LTEXT "&Выберите, как долго следует удерживать нажатой кнопку мыши или трекбола для того, чтобы сработало залипание.", -1, 60, 15, 170, 30
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/sk-SK.rc b/dll/cpl/main/lang/sk-SK.rc
index 0a8288e0695..3b0ac318392 100644
--- a/dll/cpl/main/lang/sk-SK.rc
+++ b/dll/cpl/main/lang/sk-SK.rc
@@ -48,7 +48,7 @@ BEGIN
     PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
     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, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/sq-AL.rc b/dll/cpl/main/lang/sq-AL.rc
index f57d11b2a80..7ac5d6258e6 100644
--- a/dll/cpl/main/lang/sq-AL.rc
+++ b/dll/cpl/main/lang/sq-AL.rc
@@ -47,7 +47,7 @@ BEGIN
     PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14
     PUSHBUTTON "&Anulo", IDCANCEL, 174, 59, 60, 14
     LTEXT "&Rregullo se sa kohë ju duhet të mbani të shtypur një buton të miut para klikimi juaj është mbyllur", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/tr-TR.rc b/dll/cpl/main/lang/tr-TR.rc
index a205c1e92e2..bd96a07d5ab 100644
--- a/dll/cpl/main/lang/tr-TR.rc
+++ b/dll/cpl/main/lang/tr-TR.rc
@@ -45,7 +45,7 @@ BEGIN
     PUSHBUTTON "Tamam", IDOK, 110, 59, 60, 14
     PUSHBUTTON "İptal", IDCANCEL, 174, 59, 60, 14
     LTEXT "&Tıklamanız kilitlenmeden önce bir fare ya da iztopu düğmesine ne kadar basılı tutmanız gerektiğini ayarlayınız:", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/uk-UA.rc b/dll/cpl/main/lang/uk-UA.rc
index 49ecf2e27e5..980cb899bbf 100644
--- a/dll/cpl/main/lang/uk-UA.rc
+++ b/dll/cpl/main/lang/uk-UA.rc
@@ -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 IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/zh-CN.rc b/dll/cpl/main/lang/zh-CN.rc
index aaa5eecefaa..6e16755f67d 100644
--- a/dll/cpl/main/lang/zh-CN.rc
+++ b/dll/cpl/main/lang/zh-CN.rc
@@ -50,7 +50,7 @@ BEGIN
     PUSHBUTTON "确定(&O)", IDOK, 110, 59, 60, 14
     PUSHBUTTON "取消(&C)", IDCANCEL, 174, 59, 60, 14
     LTEXT "调整您需要按下鼠标或轨迹球按钮多久单击才能被“锁定”(&A)。", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/zh-HK.rc b/dll/cpl/main/lang/zh-HK.rc
index 01f4c3c9b1a..bf72bd56a9a 100644
--- a/dll/cpl/main/lang/zh-HK.rc
+++ b/dll/cpl/main/lang/zh-HK.rc
@@ -51,7 +51,7 @@ BEGIN
     PUSHBUTTON "確定(&O)", IDOK, 110, 59, 60, 14
     PUSHBUTTON "取消(&C)", IDCANCEL, 174, 59, 60, 14
     LTEXT "調整您按住滑鼠或軌跡球按鈕時所需要的時間(&A)", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/lang/zh-TW.rc b/dll/cpl/main/lang/zh-TW.rc
index fd8e83b6245..a3153a2fe20 100644
--- a/dll/cpl/main/lang/zh-TW.rc
+++ b/dll/cpl/main/lang/zh-TW.rc
@@ -51,7 +51,7 @@ BEGIN
     PUSHBUTTON "確定(&O)", IDOK, 110, 59, 60, 14
     PUSHBUTTON "取消(&C)", IDCANCEL, 174, 59, 60, 14
     LTEXT "調整您按住滑鼠或軌跡球按鈕時所需要的時間(&A)", -1, 37, 5, 200, 27
-    ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
+    ICON IDI_LOCK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15
 END
 
 IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228
diff --git a/dll/cpl/main/main.rc b/dll/cpl/main/main.rc
index 92dfeef9e21..54045896bec 100644
--- a/dll/cpl/main/main.rc
+++ b/dll/cpl/main/main.rc
@@ -22,13 +22,14 @@ 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_HIDE ICON "resources/mouse_hide.ico"
-IDI_FONTS_FOLDER ICON "resources/fonts_folder.ico"
+IDI_PRINTERS_FOLDER ICON "../../win32/shell32/res/icons/38.ico" // IDI_SHELL_PRINTERS_FOLDER
+IDI_FONTS_FOLDER ICON "../../win32/shell32/res/icons/39.ico" // IDI_SHELL_FONTS_FOLDER
 IDI_ADMIN_TOOLS_FOLDER ICON "resources/admintools_folder.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"
+IDI_LOCK_KEY ICON "resources/lock_key.ico"
 
 #include <reactos/manifest_hosted.rc>
 
diff --git a/dll/cpl/main/mouse.c b/dll/cpl/main/mouse.c
index 28ca28f3590..8290a0541ce 100644
--- a/dll/cpl/main/mouse.c
+++ b/dll/cpl/main/mouse.c
@@ -204,7 +204,7 @@ ClickLockProc(IN HWND hwndDlg,
             pos = (pButtonData->g_ClickLockTime - 200) / 200;
             SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos);
 
-            hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOOK_KEY),
+            hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOCK_KEY),
                               IMAGE_ICON, 16, 16, 0);
             SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
             return TRUE;
diff --git a/dll/cpl/main/resource.h b/dll/cpl/main/resource.h
index 9bff0b95d1e..b0708ad5a45 100644
--- a/dll/cpl/main/resource.h
+++ b/dll/cpl/main/resource.h
@@ -5,21 +5,22 @@
 #define IDC_CPLICON_1 100
 #define IDC_CPLICON_2 200
 
-#define IDI_FOLDER_OPEN        201
-#define IDI_FOLDER_CLOSED      202
-#define IDI_MOUSE_LEFT         203
-#define IDI_MOUSE_RIGHT        204
-#define IDI_MOUSE_SPEED        205
-#define IDI_MOUSE_BUTTON       206
-#define IDI_MOUSE_TRAILS       207
-#define IDI_MOUSE_HIDE         208
+#define IDI_MOUSE_SPEED        104
+#define IDI_REPEAT_DELAY       105
+#define IDI_REPEAT_RATE        106
+#define IDI_MOUSE_BUTTON       108
+#define IDI_MOUSE_LEFT         109
+#define IDI_MOUSE_RIGHT        110
+#define IDI_PRINTERS_FOLDER    300
 #define IDI_FONTS_FOLDER       400
 #define IDI_ADMIN_TOOLS_FOLDER 500
-#define IDI_MOUSE_POINTER      600
-#define IDI_MOUSE_WHEEL        601
-#define IDI_REPEAT_RATE        602
-#define IDI_REPEAT_DELAY       603
-#define IDI_LOOK_KEY           604
+#define IDI_MOUSE_TRAILS       600
+#define IDI_MOUSE_HIDE         601
+#define IDI_MOUSE_POINTER      602
+#define IDI_MOUSE_WHEEL        603
+#define IDI_FOLDER_CLOSED      605
+#define IDI_FOLDER_OPEN        606
+#define IDI_LOCK_KEY           607
 
 #define IDD_PAGE_BUTTON          101
 #define IDD_PAGE_POINTER         102
diff --git a/dll/cpl/main/resources/fonts_folder.ico b/dll/cpl/main/resources/fonts_folder.ico
deleted file mode 100644
index f7b94af2e7c..00000000000
Binary files a/dll/cpl/main/resources/fonts_folder.ico and /dev/null differ
diff --git a/dll/cpl/main/resources/look_key.ico b/dll/cpl/main/resources/lock_key.ico
similarity index 100%
rename from dll/cpl/main/resources/look_key.ico
rename to dll/cpl/main/resources/lock_key.ico