diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc
index 310842acfce..c4909af9af4 100644
--- a/base/system/winlogon/lang/bg-BG.rc
+++ b/base/system/winlogon/lang/bg-BG.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "Пре&запуск", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc
index 503c231227c..a5aee95484b 100644
--- a/base/system/winlogon/lang/cs-CZ.rc
+++ b/base/system/winlogon/lang/cs-CZ.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc
index cf698c6e407..0c6065a3e89 100644
--- a/base/system/winlogon/lang/de-DE.rc
+++ b/base/system/winlogon/lang/de-DE.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc
index d4663ce8c43..f1b6eee22d1 100644
--- a/base/system/winlogon/lang/el-GR.rc
+++ b/base/system/winlogon/lang/el-GR.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc
index 2369394828c..1fa1c71d8bc 100644
--- a/base/system/winlogon/lang/en-US.rc
+++ b/base/system/winlogon/lang/en-US.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc
index 60e4334411e..772184ebe3e 100644
--- a/base/system/winlogon/lang/es-ES.rc
+++ b/base/system/winlogon/lang/es-ES.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc
index eab9d4b572e..e9cba337c92 100644
--- a/base/system/winlogon/lang/fr-FR.rc
+++ b/base/system/winlogon/lang/fr-FR.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc
index 0b900ec96ca..ebf4b2fb141 100644
--- a/base/system/winlogon/lang/he-IL.rc
+++ b/base/system/winlogon/lang/he-IL.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "הפעל מחדש", 1, 59, 32, 49, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc
index 14c127a362b..c0c8974e8a4 100644
--- a/base/system/winlogon/lang/hu-HU.rc
+++ b/base/system/winlogon/lang/hu-HU.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Újraindítás", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc
index c8fec2c143d..9cc54d56328 100644
--- a/base/system/winlogon/lang/id-ID.rc
+++ b/base/system/winlogon/lang/id-ID.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Mulai Lagi", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc
index f16f126013b..dc2ab0d8ee8 100644
--- a/base/system/winlogon/lang/it-IT.rc
+++ b/base/system/winlogon/lang/it-IT.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Riavvio", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc
index fd586f3d22c..30eeb77fb2a 100644
--- a/base/system/winlogon/lang/ja-JP.rc
+++ b/base/system/winlogon/lang/ja-JP.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "再起動(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc
index dd4ea232000..6aba0931c62 100644
--- a/base/system/winlogon/lang/lt-LT.rc
+++ b/base/system/winlogon/lang/lt-LT.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Perkrauti", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc
index b2a1ec4cc12..fa4cca5d5f6 100644
--- a/base/system/winlogon/lang/ms-MY.rc
+++ b/base/system/winlogon/lang/ms-MY.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "Mula semula(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc
index 53967ff4baf..fa28236f5cc 100644
--- a/base/system/winlogon/lang/nl-NL.rc
+++ b/base/system/winlogon/lang/nl-NL.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc
index 799df12b59f..0f7ef7e4b3f 100644
--- a/base/system/winlogon/lang/no-NO.rc
+++ b/base/system/winlogon/lang/no-NO.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE 
diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc
index a4a8f2c65c1..2c3f93c3117 100644
--- a/base/system/winlogon/lang/pl-PL.rc
+++ b/base/system/winlogon/lang/pl-PL.rc
@@ -27,15 +27,17 @@ BEGIN
     DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc
index 58e107b261a..346887795c7 100644
--- a/base/system/winlogon/lang/pt-BR.rc
+++ b/base/system/winlogon/lang/pt-BR.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc
index edad82edf62..f7684533d04 100644
--- a/base/system/winlogon/lang/ro-RO.rc
+++ b/base/system/winlogon/lang/ro-RO.rc
@@ -29,15 +29,17 @@ BEGIN
     DEFPUSHBUTTON "&Repornire", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc
index efa60bec945..479b0dd062c 100644
--- a/base/system/winlogon/lang/ru-RU.rc
+++ b/base/system/winlogon/lang/ru-RU.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Перезагрузка", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc
index ced0100fd4c..036ef00272d 100644
--- a/base/system/winlogon/lang/sk-SK.rc
+++ b/base/system/winlogon/lang/sk-SK.rc
@@ -25,15 +25,17 @@ BEGIN
     DEFPUSHBUTTON "&Reštartovať", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc
index de8b6046f23..e0c19673f67 100644
--- a/base/system/winlogon/lang/sq-AL.rc
+++ b/base/system/winlogon/lang/sq-AL.rc
@@ -24,15 +24,17 @@ BEGIN
     DEFPUSHBUTTON "&Rifillo", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc
index 92aa469aa3a..6f1c3e42d6d 100644
--- a/base/system/winlogon/lang/sv-SE.rc
+++ b/base/system/winlogon/lang/sv-SE.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Starta om", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc
index 2019d7a9b41..9c82dffd4c5 100644
--- a/base/system/winlogon/lang/tr-TR.rc
+++ b/base/system/winlogon/lang/tr-TR.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Yeniden Başlat", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc
index 3022a35e0b4..dc2c39b084e 100644
--- a/base/system/winlogon/lang/uk-UA.rc
+++ b/base/system/winlogon/lang/uk-UA.rc
@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Перезавантаження", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc
index 16683df9ed9..346dc27fc22 100644
--- a/base/system/winlogon/lang/zh-CN.rc
+++ b/base/system/winlogon/lang/zh-CN.rc
@@ -23,15 +23,17 @@ BEGIN
     DEFPUSHBUTTON "重新启动(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc
index 1b6a15dfee6..580707a5c3c 100644
--- a/base/system/winlogon/lang/zh-TW.rc
+++ b/base/system/winlogon/lang/zh-TW.rc
@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "重新啟動(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE
diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h
index ac5150876ce..41037647d12 100644
--- a/base/system/winlogon/resource.h
+++ b/base/system/winlogon/resource.h
@@ -1,25 +1,22 @@
 #pragma once
 
-/* Dialogs */
-#define IDD_SYSSHUTDOWN      500
-#define IDD_GINALOADFAILED   400
-#define IDD_SHUTDOWNCOMPUTER 300
-
 /* Icons */
 #define IDI_WINLOGON 4
 
-/* Controls */
-#define IDC_SYSSHUTDOWNMSG   501
-#define IDC_SHUTDOWNTIMELEFT 502
-#define IDC_SHUTDOWNCOMMENT  503
-#define IDC_SYSSHUTDOWNICON  504
+/* Dialogs */
+#define IDD_SHUTDOWNCOMPUTER      300
+#define IDC_SHTDOWNICON           301
+#define IDC_SHUTDOWNCOMPUTER      302
+#define IDC_BTNSHTDOWNCOMPUTER    303
 
+#define IDD_GINALOADFAILED        400
 #define IDC_GINALOADFAILED        401
 #define IDC_GINALOADFAILEDCONTACT 402
 
-#define IDC_SHUTDOWNCOMPUTER   302
-#define IDC_BTNSHTDOWNCOMPUTER 305
-#define IDC_SHTDOWNICON        102
+#define IDD_SYSSHUTDOWN           500
+#define IDC_SYSSHUTDOWNICON       501
+#define IDC_SYSSHUTDOWNTIMELEFT   502
+#define IDC_SYSSHUTDOWNMESSAGE    503
 
 /* Strings */
 #define IDS_PREPARENETWORKCONNECTIONS    1675
diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c
index 8a8a0c9fbd9..d09368664aa 100644
--- a/base/system/winlogon/shutdown.c
+++ b/base/system/winlogon/shutdown.c
@@ -56,7 +56,7 @@ OnTimer(
     iSeconds -= iMinutes * 60;
 
     swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds);
-    SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, szBuffer);
+    SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer);
 
     if (pShutdownParams->dwTimeout == 0)
     {
@@ -94,7 +94,7 @@ ShutdownDialogProc(
             if (pShutdownParams->pszMessage)
             {
                 SetDlgItemTextW(hwndDlg,
-                                IDC_SHUTDOWNCOMMENT,
+                                IDC_SYSSHUTDOWNMESSAGE,
                                 pShutdownParams->pszMessage);
             }