From a69b0c9fd51df076a06a8df4d4e944fcbd432d3b Mon Sep 17 00:00:00 2001
From: Stanislav Motylkov <x86corez@gmail.com>
Date: Wed, 6 Mar 2024 16:00:36 +0300
Subject: [PATCH] [MAIN] Fix icon identifiers and their order

Additionally:
- Reuse printers and fonts folder icons from shell32,
  the same way as it was done in c0dbde04365.
  The printers folder icon was missing here though.
- Fix "look_key" => "lock_key" typos.

This fixes Administrative Tools and Fonts Folder icons in Control Panel
when being restored to defaults with Stardock IconPackager 5.1.

CORE-19471
---
 dll/cpl/main/CMakeLists.txt                   |   3 +-
 dll/cpl/main/lang/bg-BG.rc                    |   2 +-
 dll/cpl/main/lang/cs-CZ.rc                    |   2 +-
 dll/cpl/main/lang/de-DE.rc                    |   2 +-
 dll/cpl/main/lang/el-GR.rc                    |   2 +-
 dll/cpl/main/lang/en-US.rc                    |   2 +-
 dll/cpl/main/lang/es-ES.rc                    |   2 +-
 dll/cpl/main/lang/fr-FR.rc                    |   2 +-
 dll/cpl/main/lang/he-IL.rc                    |   2 +-
 dll/cpl/main/lang/hu-HU.rc                    |   2 +-
 dll/cpl/main/lang/id-ID.rc                    |   2 +-
 dll/cpl/main/lang/it-IT.rc                    |   2 +-
 dll/cpl/main/lang/ja-JP.rc                    |   2 +-
 dll/cpl/main/lang/nl-NL.rc                    |   2 +-
 dll/cpl/main/lang/no-NO.rc                    |   2 +-
 dll/cpl/main/lang/pl-PL.rc                    |   2 +-
 dll/cpl/main/lang/pt-PT.rc                    |   2 +-
 dll/cpl/main/lang/ro-RO.rc                    |   2 +-
 dll/cpl/main/lang/ru-RU.rc                    |   2 +-
 dll/cpl/main/lang/sk-SK.rc                    |   2 +-
 dll/cpl/main/lang/sq-AL.rc                    |   2 +-
 dll/cpl/main/lang/tr-TR.rc                    |   2 +-
 dll/cpl/main/lang/uk-UA.rc                    |   2 +-
 dll/cpl/main/lang/zh-CN.rc                    |   2 +-
 dll/cpl/main/lang/zh-HK.rc                    |   2 +-
 dll/cpl/main/lang/zh-TW.rc                    |   2 +-
 dll/cpl/main/main.rc                          |   5 ++--
 dll/cpl/main/mouse.c                          |   2 +-
 dll/cpl/main/resource.h                       |  27 +++++++++---------
 dll/cpl/main/resources/fonts_folder.ico       | Bin 25214 -> 0 bytes
 .../resources/{look_key.ico => lock_key.ico}  | Bin
 31 files changed, 45 insertions(+), 42 deletions(-)
 delete mode 100644 dll/cpl/main/resources/fonts_folder.ico
 rename dll/cpl/main/resources/{look_key.ico => lock_key.ico} (100%)

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 f7b94af2e7c0c26ad457e9626230de94df0c8fae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25214
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

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