diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc
index 087bb06a3e0..9dd02012d76 100644
--- a/reactos/dll/win32/msgina/lang/bg-BG.rc
+++ b/reactos/dll/win32/msgina/lang/bg-BG.rc
@@ -15,7 +15,7 @@ CAPTION "РеактОС ви приветства"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Натиснете едновременно Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "Изключване на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Какво искате да направи компютъра?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "Изключване на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Какво искате да направи компютъра?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc
index 0a56b0d2450..65ade5f6a9e 100644
--- a/reactos/dll/win32/msgina/lang/cs-CZ.rc
+++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc
@@ -20,7 +20,7 @@ CAPTION "Vítejte v systému ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Stiskněte klávesy Ctrl-Alt-Delete", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -113,7 +113,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Odhlásit se ze systému"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Určitě se chcete odhlásit?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Ano", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "Ne", IDNO, 95, 39, 50, 14
@@ -125,7 +125,7 @@ CAPTION "Vypnout ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Co má počítač provést?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -148,7 +148,7 @@ CAPTION "Vypnout ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Co má počítač provést?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc
index 67c17850db0..5e8755a1ef3 100644
--- a/reactos/dll/win32/msgina/lang/de-DE.rc
+++ b/reactos/dll/win32/msgina/lang/de-DE.rc
@@ -15,7 +15,7 @@ CAPTION "Willkommen bei ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Drücken Sie Strg+Alt+Entf",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Von ReactOS abmelden"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Wollen Sie sich wirklich abmelden?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Ja", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "Nein", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "ReactOS herunterfahren"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Welcher Vorgang soll durchgeführt werden?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "ReactOS herunterfahren"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Welcher Vorgang soll durchgeführt werden?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/en-US.rc b/reactos/dll/win32/msgina/lang/en-US.rc
index ede9dc1b793..de69b9df430 100644
--- a/reactos/dll/win32/msgina/lang/en-US.rc
+++ b/reactos/dll/win32/msgina/lang/en-US.rc
@@ -15,7 +15,7 @@ CAPTION "Welcome to ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Press Ctrl-Alt-Delete to begin.",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc
index 76fcee5f5c1..18f2b4cc2e5 100644
--- a/reactos/dll/win32/msgina/lang/es-ES.rc
+++ b/reactos/dll/win32/msgina/lang/es-ES.rc
@@ -16,7 +16,7 @@ CAPTION "Bienvenido a ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Para empezar, presione Ctrl-Alt-Supr.",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -109,7 +109,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Cerrar sesión de ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "¿Seguro que desea cerrar sesión?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Sí", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -121,7 +121,7 @@ CAPTION "Apagar ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "¿&Qué desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -144,7 +144,7 @@ CAPTION "Apagar ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "¿&Qué desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc
index ce381bb1fb1..19f35fcb7b2 100644
--- a/reactos/dll/win32/msgina/lang/fr-FR.rc
+++ b/reactos/dll/win32/msgina/lang/fr-FR.rc
@@ -15,7 +15,7 @@ CAPTION "Bienvenue à ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Déconnexion de ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Êtes-vous sûr de vouloir vous déconnecter?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Oui", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "Non", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "Fermer ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "Fermer ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc
index e5b8b724a0a..1bb11db873e 100644
--- a/reactos/dll/win32/msgina/lang/he-IL.rc
+++ b/reactos/dll/win32/msgina/lang/he-IL.rc
@@ -15,7 +15,7 @@ CAPTION "ברוכים הבאים לReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "לחץ על Ctrl-Alt-Del בו זמנית", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc
index 47d492db98f..79b23f93aaf 100644
--- a/reactos/dll/win32/msgina/lang/id-ID.rc
+++ b/reactos/dll/win32/msgina/lang/id-ID.rc
@@ -15,7 +15,7 @@ CAPTION "Selamat datang di ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc
index 0fb161c1b00..bec4e15a0b3 100644
--- a/reactos/dll/win32/msgina/lang/it-IT.rc
+++ b/reactos/dll/win32/msgina/lang/it-IT.rc
@@ -24,7 +24,7 @@ CAPTION "Benvenuti in ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Premere i tasti Ctrl-Alt-Canc ",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -117,7 +117,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Disconetti da ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Sei sicuro di volerti disconettere?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Si", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -129,7 +129,7 @@ CAPTION "Spegnimento di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -152,7 +152,7 @@ CAPTION "Spegnimento di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc
index 011ce3572a7..71c79ab109d 100644
--- a/reactos/dll/win32/msgina/lang/ja-JP.rc
+++ b/reactos/dll/win32/msgina/lang/ja-JP.rc
@@ -15,7 +15,7 @@ CAPTION "ReactOS へようこそ"
 FONT 9, "MS UI Gothic", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Ctrl-Alt-Del キーの組み合わせを押してください", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 9,"MS UI Gothic", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "ReactOSのシャットダウン"
 FONT 9,"MS UI Gothic", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&コンピュータの動作を選択してください", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "ReactOSのシャットダウン"
 FONT 9, "MS UI Gothic"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&コンピュータの動作を選択してください", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc
index 0b4eac63666..4e230a37eaf 100644
--- a/reactos/dll/win32/msgina/lang/no-NO.rc
+++ b/reactos/dll/win32/msgina/lang/no-NO.rc
@@ -15,7 +15,7 @@ CAPTION "Velkommen til ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -108,7 +108,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -120,7 +120,7 @@ CAPTION "Slå av ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Hva vil du at datamaskinen skal gjøre?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -143,7 +143,7 @@ CAPTION "Slå av ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Hva vil du at datamaskinen skal gjøre?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc
index f032910d889..d56501ff135 100644
--- a/reactos/dll/win32/msgina/lang/pl-PL.rc
+++ b/reactos/dll/win32/msgina/lang/pl-PL.rc
@@ -25,7 +25,7 @@ CAPTION "Witamy w ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Proszę wcisnąć kombinację klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -118,7 +118,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "ReactOS - Wylogowywanie z systemu"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Czy na pewno chcesz się wylogować?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Tak", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "Nie", IDNO, 95, 39, 50, 14
@@ -130,7 +130,7 @@ CAPTION "Zamknij ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Co chcesz, aby zrobił komputer?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -153,7 +153,7 @@ CAPTION "Zamknij ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Co chcesz, aby zrobił komputer?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc
index 56a3ee7372e..aac0441fcbc 100644
--- a/reactos/dll/win32/msgina/lang/ro-RO.rc
+++ b/reactos/dll/win32/msgina/lang/ro-RO.rc
@@ -24,7 +24,7 @@ CAPTION "Bun venit în ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO,IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Apasați simultan «Ctrl»+«Alt»+«Del»", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -117,7 +117,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Deautentificare ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Sigur doriți să vă deautentificați?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "D&a", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "N&u", IDNO, 95, 39, 50, 14
@@ -129,7 +129,7 @@ CAPTION "Închidere ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Ce doriți să se întâmple?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -152,7 +152,7 @@ CAPTION "Închidere ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Ce doriți să se întâmple?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc
index 13d1eb7f271..68617e10d06 100644
--- a/reactos/dll/win32/msgina/lang/ru-RU.rc
+++ b/reactos/dll/win32/msgina/lang/ru-RU.rc
@@ -17,7 +17,7 @@ CAPTION "Добро пожаловать в ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Нажмите клавиши Ctrl-Alt-Del.", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -110,7 +110,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Выход из ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Вы уверены, что хотите выйти?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Да", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "Нет", IDNO, 95, 39, 50, 14
@@ -122,7 +122,7 @@ CAPTION "Завершение работы ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Выберите желаемое действие:", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -145,7 +145,7 @@ CAPTION "Завершение работы ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Выберите желаемое действие.", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc
index 7bb1e3f2acf..3b9eeacc93e 100644
--- a/reactos/dll/win32/msgina/lang/sk-SK.rc
+++ b/reactos/dll/win32/msgina/lang/sk-SK.rc
@@ -20,7 +20,7 @@ CAPTION "Vitajte v systéme ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Stlačte kombináciu kláves Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -113,7 +113,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -125,7 +125,7 @@ CAPTION "Vypnutie systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Čo chcete aby počítač urobil?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -148,7 +148,7 @@ CAPTION "Vypnutie systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Čo chcete aby počítač urobil?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/sq-AL.rc b/reactos/dll/win32/msgina/lang/sq-AL.rc
index c03545c9174..cc8dc53a6e5 100644
--- a/reactos/dll/win32/msgina/lang/sq-AL.rc
+++ b/reactos/dll/win32/msgina/lang/sq-AL.rc
@@ -111,7 +111,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Dil nga ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Jeni te sigurte qe doni te dilni?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Po", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "Jo", IDNO, 95, 39, 50, 14
@@ -123,7 +123,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -146,7 +146,7 @@ CAPTION "Shut Down ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/tr-TR.rc b/reactos/dll/win32/msgina/lang/tr-TR.rc
index d53e20091a3..2ba02e6d3bd 100644
--- a/reactos/dll/win32/msgina/lang/tr-TR.rc
+++ b/reactos/dll/win32/msgina/lang/tr-TR.rc
@@ -17,7 +17,7 @@ CAPTION "ReactOS'a Hoşgeldiniz"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "Başlamak için Denetim, Seçenek ve Silme düğmelerine birlikte basınız.",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -110,7 +110,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Oturumu Kapat"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Oturumu kapatmayı istediğinizden emin misiniz?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Evet", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "Hayır", IDNO, 95, 39, 50, 14
@@ -122,7 +122,7 @@ CAPTION "Bilgisayarı Kapat"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Bilgisayarın ne yapmasını istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -145,7 +145,7 @@ CAPTION "Oturumu Kapat"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Bilgisayarınızın ne yapmasını istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc
index 926e6915dac..cf041b79849 100644
--- a/reactos/dll/win32/msgina/lang/uk-UA.rc
+++ b/reactos/dll/win32/msgina/lang/uk-UA.rc
@@ -116,7 +116,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "No", IDNO, 95, 39, 50, 14
@@ -128,7 +128,7 @@ CAPTION "Завершення роботи ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Виберіть одну з таких можливостей?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -151,7 +151,7 @@ CAPTION "Завершення роботи ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "&Виберіть одну з таких можливостей?", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/zh-CN.rc b/reactos/dll/win32/msgina/lang/zh-CN.rc
index 81b69de7c15..9682991bd4a 100644
--- a/reactos/dll/win32/msgina/lang/zh-CN.rc
+++ b/reactos/dll/win32/msgina/lang/zh-CN.rc
@@ -17,7 +17,7 @@ CAPTION "欢迎来到 ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "按 Ctrl-Alt-Delete 开始。",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -110,7 +110,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "ReactOS 注销"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "你确定你想要注销?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "是", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "否", IDNO, 95, 39, 50, 14
@@ -122,7 +122,7 @@ CAPTION "关闭 ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "你想让计算机做什么?(&W)", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -145,7 +145,7 @@ CAPTION "关闭 ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "你想让计算机做什么?(&W)", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/lang/zh-TW.rc b/reactos/dll/win32/msgina/lang/zh-TW.rc
index 5770ba7adb4..7ce5f406a01 100644
--- a/reactos/dll/win32/msgina/lang/zh-TW.rc
+++ b/reactos/dll/win32/msgina/lang/zh-TW.rc
@@ -17,7 +17,7 @@ CAPTION "歡迎來到 ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32
     LTEXT "按 Ctrl-Alt-Delete 開始。",IDC_STATIC, 38, 60, 144, 14
 END
 
@@ -110,7 +110,7 @@ STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS
 CAPTION "ReactOS 登出"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 7, 20, 20
+    ICON IDI_LOGOFF, -1, 7, 7, 20, 20
     LTEXT "你確定你想要登出?", IDC_STATIC, 35, 16, 146, 8
     PUSHBUTTON "是", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON
     PUSHBUTTON "否", IDNO, 95, 39, 50, 14
@@ -122,7 +122,7 @@ CAPTION "關閉 ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "你想讓計算機做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
@@ -145,7 +145,7 @@ CAPTION "關閉 ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
+    ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP
     LTEXT "你想讓計算機做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10
     COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27
diff --git a/reactos/dll/win32/msgina/msgina.rc b/reactos/dll/win32/msgina/msgina.rc
index dace1fe8ead..53ded839cab 100644
--- a/reactos/dll/win32/msgina/msgina.rc
+++ b/reactos/dll/win32/msgina/msgina.rc
@@ -9,9 +9,16 @@
 #define REACTOS_STR_ORIGINAL_FILENAME "msgina.dll"
 #include <reactos/version.rc>
 
+/* Icons */
+IDI_NOT_CONNECTED ICON "resources/13.ico"
+IDI_LOGOFF ICON "resources/21.ico"
+IDI_SHUTDOWN ICON "resources/22.ico"
+IDI_KEYBOARD ICON "resources/109.ico"
+IDI_HARDWARE ICON "resources/110.ico"
+IDI_LOCKICON ICON "resources/115.ico"
+
+/* Bitmaps */
 IDI_ROSLOGO BITMAP "resources/reactos.bmp"
-IDI_LOCKICON ICON "resources/21.ico"
-IDI_SHELL_SHUTDOWN ICON "resources/shutdown.ico"
 
 #include <reactos/manifest_dll.rc>
 
diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h
index c300e986e12..1ea73288915 100644
--- a/reactos/dll/win32/msgina/resource.h
+++ b/reactos/dll/win32/msgina/resource.h
@@ -40,9 +40,13 @@
 
 
 #define IDI_ROSLOGO         20000
-#define IDI_SHELL_SHUTDOWN  20001
 
-#define IDI_LOCKICON 21
+#define IDI_NOT_CONNECTED 13
+#define IDI_LOGOFF        21
+#define IDI_SHUTDOWN      22
+#define IDI_KEYBOARD      109
+#define IDI_HARDWARE      110
+#define IDI_LOCKICON      115
 
 #define IDS_LOGGEDOUTSAS         40000
 #define IDS_LOCKEDSAS            40001
diff --git a/reactos/dll/win32/msgina/resources/109.ico b/reactos/dll/win32/msgina/resources/109.ico
new file mode 100644
index 00000000000..d776eab5060
Binary files /dev/null and b/reactos/dll/win32/msgina/resources/109.ico differ
diff --git a/reactos/dll/win32/msgina/resources/110.ico b/reactos/dll/win32/msgina/resources/110.ico
new file mode 100644
index 00000000000..0b2aaa09b9b
Binary files /dev/null and b/reactos/dll/win32/msgina/resources/110.ico differ
diff --git a/reactos/dll/win32/msgina/resources/115.ico b/reactos/dll/win32/msgina/resources/115.ico
new file mode 100644
index 00000000000..83604f83c62
Binary files /dev/null and b/reactos/dll/win32/msgina/resources/115.ico differ
diff --git a/reactos/dll/win32/msgina/resources/13.ico b/reactos/dll/win32/msgina/resources/13.ico
new file mode 100644
index 00000000000..6eb3cc68b6f
Binary files /dev/null and b/reactos/dll/win32/msgina/resources/13.ico differ
diff --git a/reactos/dll/win32/msgina/resources/21.ico b/reactos/dll/win32/msgina/resources/21.ico
index 8972e587eb4..f989427c7e9 100644
Binary files a/reactos/dll/win32/msgina/resources/21.ico and b/reactos/dll/win32/msgina/resources/21.ico differ
diff --git a/reactos/dll/win32/msgina/resources/22.ico b/reactos/dll/win32/msgina/resources/22.ico
new file mode 100644
index 00000000000..f27fab80496
Binary files /dev/null and b/reactos/dll/win32/msgina/resources/22.ico differ