Index: dll/win32/shell32/dialogs/dialogs.cpp
===================================================================
--- dll/win32/shell32/dialogs/dialogs.cpp	(revision 71635)
+++ dll/win32/shell32/dialogs/dialogs.cpp	(working copy)
@@ -758,7 +758,41 @@
     return 0;
 }
 
+/*************************************************************************
+ * LogOffDialogProc
+ *
+ * NOTES: Used to make the Log Off dialog work
+ *     
+ */
+INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+    switch(Message)
+    {
+        case WM_INITDIALOG:
+        {
+            return TRUE;
+        }
+        case WM_CLOSE:
+            EndDialog(hwnd, IDCANCEL);
+            break;
+        case WM_COMMAND:
+            switch(LOWORD(wParam))
+            {
+                case IDOK:
+                    ExitWindowsEx(EWX_LOGOFF, 0);
+                break;
+                case IDCANCEL:
+                    EndDialog(hwnd, IDCANCEL);
+                break;
+            }
+        break;
+        default:
+            return FALSE;
+    }
+    return TRUE;
+}
 
+
 /*************************************************************************
  * LogoffWindowsDialog  [SHELL32.54]
  */
@@ -765,9 +799,7 @@
 
 EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner)
 {
-    if (ConfirmDialog(hWndOwner, IDS_LOGOFF_PROMPT, IDS_LOGOFF_TITLE))
-        ExitWindowsEx(EWX_LOGOFF, 0);
-
+    DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), hWndOwner, LogOffDialogProc);
     return 0;
 }
 
Index: dll/win32/shell32/lang/bg-BG.rc
===================================================================
--- dll/win32/shell32/lang/bg-BG.rc	(revision 71635)
+++ dll/win32/shell32/lang/bg-BG.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Излизане от РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
     LTEXT "Сигурни ли сте, че искате да излезете?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Излизане", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Отказ", IDCANCEL, 122, 40, 60, 14
+    DEFPUSHBUTTON "&Излизане", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Отказ", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Искате ли да презапуснете системата?"
     IDS_SHUTDOWN_TITLE "Изключване"
     IDS_SHUTDOWN_PROMPT "Искате ли да изключите компютъра?"
-    IDS_LOGOFF_TITLE "Излизане"
-    IDS_LOGOFF_PROMPT "Искате ли да излезете?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/ca-ES.rc
===================================================================
--- dll/win32/shell32/lang/ca-ES.rc	(revision 71635)
+++ dll/win32/shell32/lang/ca-ES.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "Shutdown"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/cs-CZ.rc
===================================================================
--- dll/win32/shell32/lang/cs-CZ.rc	(revision 71635)
+++ dll/win32/shell32/lang/cs-CZ.rc	(working copy)
@@ -481,15 +481,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Odhlásit se ze systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Opravdu se chcete odhlásit?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Odhlásit", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Storno", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Opravdu se chcete odhlásit?", -1, 35, 16, 146, 8
+    DEFPUSHBUTTON "&Odhlásit", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "Storno", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -715,8 +715,6 @@
     IDS_RESTART_PROMPT "Opravdu chcete restartovat systém?"
     IDS_SHUTDOWN_TITLE "Vypnout"
     IDS_SHUTDOWN_PROMPT "Opravdu chcete vypnout počítač?"
-    IDS_LOGOFF_TITLE "Odhlásit se"
-    IDS_LOGOFF_PROMPT "Opravdu se chcete odhlásit?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Nelze zobrazit dialog Spustit soubor (interní chyba)"
Index: dll/win32/shell32/lang/da-DK.rc
===================================================================
--- dll/win32/shell32/lang/da-DK.rc	(revision 71635)
+++ dll/win32/shell32/lang/da-DK.rc	(working copy)
@@ -481,15 +481,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -715,8 +715,6 @@
     IDS_RESTART_PROMPT "Ønsker du at Genstarte Systemet?"
     IDS_SHUTDOWN_TITLE "Luk Ned"
     IDS_SHUTDOWN_PROMPT "Ønsker du at Lukke Ned?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/de-DE.rc
===================================================================
--- dll/win32/shell32/lang/de-DE.rc	(revision 71635)
+++ dll/win32/shell32/lang/de-DE.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Abmelden"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Abmelden", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Abbrechen", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20
+    LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 35, 16, 146, 8
+    DEFPUSHBUTTON "&Abmelden", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "Abbrechen", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -710,8 +710,6 @@
     IDS_RESTART_PROMPT "Möchten Sie das System neu starten?"
     IDS_SHUTDOWN_TITLE "Herunterfahren"
     IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?"
-    IDS_LOGOFF_TITLE "Ausloggen"
-    IDS_LOGOFF_PROMPT "Möchten Sie sich ausloggen?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Anzeigen der Datei Ausführen Dialogbox nicht möglich (interner Fehler)"
Index: dll/win32/shell32/lang/el-GR.rc
===================================================================
--- dll/win32/shell32/lang/el-GR.rc	(revision 71635)
+++ dll/win32/shell32/lang/el-GR.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Είστε σίγουροι ότι θέλετε να επανεκκινήσετε τον υπολογιστή σας;"
     IDS_SHUTDOWN_TITLE "Απενεργοποίηση"
     IDS_SHUTDOWN_PROMPT "Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε τον υπολογιστή σας;"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/en-GB.rc
===================================================================
--- dll/win32/shell32/lang/en-GB.rc	(revision 71635)
+++ dll/win32/shell32/lang/en-GB.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "Shutdown"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/en-US.rc
===================================================================
--- dll/win32/shell32/lang/en-US.rc	(revision 71635)
+++ dll/win32/shell32/lang/en-US.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "Shutdown"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/es-ES.rc
===================================================================
--- dll/win32/shell32/lang/es-ES.rc	(revision 71635)
+++ dll/win32/shell32/lang/es-ES.rc	(working copy)
@@ -477,15 +477,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Cerrar sesión de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Cerrar sesión", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20
+    LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 35, 16, 146, 8
+    DEFPUSHBUTTON "&Cerrar sesión", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -711,8 +711,6 @@
     IDS_RESTART_PROMPT "¿Desea reiniciar el equipo?"
     IDS_SHUTDOWN_TITLE "Apagar"
     IDS_SHUTDOWN_PROMPT "¿Desea apagar el equipo?"
-    IDS_LOGOFF_TITLE "Cerrar sesión"
-    IDS_LOGOFF_PROMPT "¿Desea cerrar la sesión?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "No se pudo mostrar el diálogo Ejecutar (error interno)"
Index: dll/win32/shell32/lang/fi-FI.rc
===================================================================
--- dll/win32/shell32/lang/fi-FI.rc	(revision 71635)
+++ dll/win32/shell32/lang/fi-FI.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkäynnistämistä?"
     IDS_SHUTDOWN_TITLE "Sammuta"
     IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/fr-FR.rc
===================================================================
--- dll/win32/shell32/lang/fr-FR.rc	(revision 71635)
+++ dll/win32/shell32/lang/fr-FR.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Fermer ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "Fermer", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Annuler", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20
+    LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 35, 16, 146, 8
+    DEFPUSHBUTTON "Fermer", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "Annuler", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur ?"
     IDS_SHUTDOWN_TITLE "Arrêter"
     IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?"
-    IDS_LOGOFF_TITLE "Se déconnecter"
-    IDS_LOGOFF_PROMPT "Voulez-vous vous déconnecter ?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Impossible d'afficher la boîte de dialogue pour l'exécution d'un fichier (erreur interne)"
Index: dll/win32/shell32/lang/he-IL.rc
===================================================================
--- dll/win32/shell32/lang/he-IL.rc	(revision 71635)
+++ dll/win32/shell32/lang/he-IL.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "האם ברצונך להפעיל מחדש את המערכת?"
     IDS_SHUTDOWN_TITLE "כיבוי"
     IDS_SHUTDOWN_PROMPT "האם ברצונך לכבות את המחשב?"
-    IDS_LOGOFF_TITLE "התנתקות"
-    IDS_LOGOFF_PROMPT "האם ברצונך להתנתק?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/hu-HU.rc
===================================================================
--- dll/win32/shell32/lang/hu-HU.rc	(revision 71635)
+++ dll/win32/shell32/lang/hu-HU.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Újra szeretnéd indítani a rendszert?"
     IDS_SHUTDOWN_TITLE "Kikapcsolás"
     IDS_SHUTDOWN_PROMPT "Kiakarod kapcsolni számítógépét?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/it-IT.rc
===================================================================
--- dll/win32/shell32/lang/it-IT.rc	(revision 71635)
+++ dll/win32/shell32/lang/it-IT.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Chiudi sessione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Chiudi sessione", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Annulla", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20
+    LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 35, 16, 146, 8
+    DEFPUSHBUTTON "&Chiudi sessione", IDOK, 35, 39, 55, 14
+    PUSHBUTTON "Annulla", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Volete riavviare il sistema?"
     IDS_SHUTDOWN_TITLE "Arresta sistema"
     IDS_SHUTDOWN_PROMPT "Volete arrestare il sistema?"
-    IDS_LOGOFF_TITLE "Disconnetti"
-    IDS_LOGOFF_PROMPT "Volete disconnettervi?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Impossibile mostrare il dialogo Eseguire (errore interno)"
Index: dll/win32/shell32/lang/ja-JP.rc
===================================================================
--- dll/win32/shell32/lang/ja-JP.rc	(revision 71635)
+++ dll/win32/shell32/lang/ja-JP.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "ReactOSのログオフ"
 FONT 9, "MS UI Gothic"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
     LTEXT "ログオフしてもよろしいですか?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "ログオフ(&L)", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "キャンセル", IDCANCEL, 122, 40, 60, 14
+    DEFPUSHBUTTON "ログオフ(&L)", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "システムを再起動しますか?"
     IDS_SHUTDOWN_TITLE "シャットダウン"
     IDS_SHUTDOWN_PROMPT "シャットダウンしますか?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/ko-KR.rc
===================================================================
--- dll/win32/shell32/lang/ko-KR.rc	(revision 71635)
+++ dll/win32/shell32/lang/ko-KR.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
-FONT 9, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "Shutdown"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/nl-NL.rc
===================================================================
--- dll/win32/shell32/lang/nl-NL.rc	(revision 71635)
+++ dll/win32/shell32/lang/nl-NL.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "Shutdown"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/no-NO.rc
===================================================================
--- dll/win32/shell32/lang/no-NO.rc	(revision 71635)
+++ dll/win32/shell32/lang/no-NO.rc	(working copy)
@@ -475,12 +475,12 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Logg av ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
     LTEXT "Er du sikker på at du vil logge av?", -1, 43, 11, 140, 22
     DEFPUSHBUTTON "&Logg av", IDOK, 57, 40, 60, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 122, 40, 60, 14
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Vil du starte datamaskinen på nytt?"
     IDS_SHUTDOWN_TITLE "Avslutt"
     IDS_SHUTDOWN_PROMPT "Vil du slå av datamaskinen?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/pl-PL.rc
===================================================================
--- dll/win32/shell32/lang/pl-PL.rc	(revision 71635)
+++ dll/win32/shell32/lang/pl-PL.rc	(working copy)
@@ -479,15 +479,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Wyloguj się z ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Czy na pewno chcesz się wylogować?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Wyloguj", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Anuluj", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Czy na pewno chcesz się wylogować?", -1, 35, 16, 146, 8
+    DEFPUSHBUTTON "&Wyloguj", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "Anuluj", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -713,8 +713,6 @@
     IDS_RESTART_PROMPT "Czy chcesz zrestartować system?"
     IDS_SHUTDOWN_TITLE "Wyłącz"
     IDS_SHUTDOWN_PROMPT "Czy chcesz wyłączyć system?"
-    IDS_LOGOFF_TITLE "Wyloguj"
-    IDS_LOGOFF_PROMPT "Czy chcesz się wylogować z systemu?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Nie mogę wyświetlić okna Uruchom (błąd wewnętrzny)"
Index: dll/win32/shell32/lang/pt-BR.rc
===================================================================
--- dll/win32/shell32/lang/pt-BR.rc	(revision 71635)
+++ dll/win32/shell32/lang/pt-BR.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Você tem certeza que desejar realizar log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Você tem certeza que desejar realizar log off?", -1, 35, 15, 148, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Você quer simular a reinicialização do Windows?"
     IDS_SHUTDOWN_TITLE "Desligar"
     IDS_SHUTDOWN_PROMPT "Você quer finalizar a sessão?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Você quer realizar log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/pt-PT.rc
===================================================================
--- dll/win32/shell32/lang/pt-PT.rc	(revision 71635)
+++ dll/win32/shell32/lang/pt-PT.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Terminar sessão ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Tem a certeza que quer terminar a sessão?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Terminar a sessão", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Tem a certeza que quer terminar a sessão?", -1, 30, 15, 131, 8
+    DEFPUSHBUTTON "&Terminar a sessão", IDOK, 30, 38, 64, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Deseja simular a reinicialização do Windows?"
     IDS_SHUTDOWN_TITLE "Desligar"
     IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessão do ReactOS?"
-    IDS_LOGOFF_TITLE "Terminar a sessão"
-    IDS_LOGOFF_PROMPT "Pretende terminar a sessão?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/ro-RO.rc
===================================================================
--- dll/win32/shell32/lang/ro-RO.rc	(revision 71635)
+++ dll/win32/shell32/lang/ro-RO.rc	(working copy)
@@ -477,15 +477,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Deautentificare"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Sigur doriți să vă deautentificați?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Deautentifică", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Sigur doriți să vă deautentificați?", IDC_STATIC, 35, 16, 146, 8
+    PUSHBUTTON "D&a", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "N&u", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -711,8 +711,6 @@
     IDS_RESTART_PROMPT "Doriți să reporniți sistemul?"
     IDS_SHUTDOWN_TITLE "Închidere"
     IDS_SHUTDOWN_PROMPT "Doriți să închideți calculatorul?"
-    IDS_LOGOFF_TITLE "Deautentificare"
-    IDS_LOGOFF_PROMPT "Doriți să vă deautentificați?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Nu se poate deschide Executare fișier (eroare internă)"
Index: dll/win32/shell32/lang/ru-RU.rc
===================================================================
--- dll/win32/shell32/lang/ru-RU.rc	(revision 71635)
+++ dll/win32/shell32/lang/ru-RU.rc	(working copy)
@@ -477,15 +477,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Выход из ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Вы действительно хотите выйти из системы?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "В&ыход", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Отмена", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Вы уверены, что хотите выйти?", -1, 35, 16, 146, 8
+    PUSHBUTTON "Да", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "Нет", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -711,8 +711,6 @@
     IDS_RESTART_PROMPT "Вы действительно хотите перезагрузить ReactOS?"
     IDS_SHUTDOWN_TITLE "Завершение работы"
     IDS_SHUTDOWN_PROMPT "Вы действительно хотите завершить работу ReactOS?"
-    IDS_LOGOFF_TITLE "Завершение сеанса"
-    IDS_LOGOFF_PROMPT "Вы действительно хотите выйти из системы?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Невозможно отобразить диалоговое окно Выполнить (внутренняя ошибка)"
Index: dll/win32/shell32/lang/sk-SK.rc
===================================================================
--- dll/win32/shell32/lang/sk-SK.rc	(revision 71635)
+++ dll/win32/shell32/lang/sk-SK.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Odhlásiť ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "O&dhlásiť", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Zrušiť", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "O&dhlásiť", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Zrušiť", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Naozaj chcete reštartovať systém?"
     IDS_SHUTDOWN_TITLE "Vypnúť"
     IDS_SHUTDOWN_PROMPT "Naozaj chcete vypnúť počítač?"
-    IDS_LOGOFF_TITLE "Odhlásiť"
-    IDS_LOGOFF_PROMPT "Naozaj sa chcete odhlásiť?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Nemožno zobraziť dialogové okno Spustiť súbor (vnútorná chyba)"
Index: dll/win32/shell32/lang/sl-SI.rc
===================================================================
--- dll/win32/shell32/lang/sl-SI.rc	(revision 71635)
+++ dll/win32/shell32/lang/sl-SI.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "Shutdown"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/sq-AL.rc
===================================================================
--- dll/win32/shell32/lang/sq-AL.rc	(revision 71635)
+++ dll/win32/shell32/lang/sq-AL.rc	(working copy)
@@ -479,15 +479,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Dil nga ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Jeni te sigurte qe doni të dilni?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Dil", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Anulo", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Jeni te sigurte qe doni të dilni?", -1, 35, 16, 146, 8
+    DEFPUSHBUTTON "&Dil", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -713,8 +713,6 @@
     IDS_RESTART_PROMPT "Doni të rifilloni sistemin?"
     IDS_SHUTDOWN_TITLE "Fike"
     IDS_SHUTDOWN_PROMPT "Doni ta filkni sistemin?"
-    IDS_LOGOFF_TITLE "Dilni"
-    IDS_LOGOFF_PROMPT "Doni të dilni nga sistemi?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Në pamundësi për të shfaqur kutinë dialogut ekzekuto (gabim i brendshëm)"
Index: dll/win32/shell32/lang/sv-SE.rc
===================================================================
--- dll/win32/shell32/lang/sv-SE.rc	(revision 71635)
+++ dll/win32/shell32/lang/sv-SE.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "Shutdown"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "Log Off"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/lang/tr-TR.rc
===================================================================
--- dll/win32/shell32/lang/tr-TR.rc	(revision 71635)
+++ dll/win32/shell32/lang/tr-TR.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "ReactOS Oturumunu Kapat"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Oturumu kapatmayı gerçekten istiyor musunuz?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "Oturumu &Kapat", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "İptal", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20
+    LTEXT "Oturumu kapatmayı gerçekten istiyor musunuz?", -1, 33, 16, 151, 8
+    DEFPUSHBUTTON "Oturumu &Kapat", IDOK, 30, 39, 60, 14
+    PUSHBUTTON "İptal", IDCANCEL, 95, 39, 60, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Oturumunuzu sonlandırır, ReactOS'ı kapatır, ve ReactOS'ı yeniden başlatır."
     IDS_SHUTDOWN_TITLE "Bilgisayarı Kapat"
     IDS_SHUTDOWN_PROMPT "Oturumunuzu sonlandırır ve ReactOS'ı kapatır, böylece bilgisayarınızın gücünü kesebilirsiniz."
-    IDS_LOGOFF_TITLE "Oturumu Kapat"
-    IDS_LOGOFF_PROMPT "Bilgisayarı tam güç açık bırakarak oturumunuzu kapatır."
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Çalıştır kutusu açılamıyor (dahili hata)"
Index: dll/win32/shell32/lang/uk-UA.rc
===================================================================
--- dll/win32/shell32/lang/uk-UA.rc	(revision 71635)
+++ dll/win32/shell32/lang/uk-UA.rc	(working copy)
@@ -475,15 +475,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Вихід із ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "В&ихід", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Скасувати", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "В&ихід", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Скасувати", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -709,8 +709,6 @@
     IDS_RESTART_PROMPT "Ви хочете перезавантажити систему?"
     IDS_SHUTDOWN_TITLE "Вимкнути"
     IDS_SHUTDOWN_PROMPT "Ви хочете вимкнути комп'ютер?"
-    IDS_LOGOFF_TITLE "Вихід з системи"
-    IDS_LOGOFF_PROMPT "Ви хочете вийти з системи?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Неможливо відобразити Діалог Запуску Файлу (внутрішня помилка)"
Index: dll/win32/shell32/lang/zh-CN.rc
===================================================================
--- dll/win32/shell32/lang/zh-CN.rc	(revision 71635)
+++ dll/win32/shell32/lang/zh-CN.rc	(working copy)
@@ -484,15 +484,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "注销 ReactOS"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "确信你想要注销吗?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "注销(&L)", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "取消", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "你确定你想要注销?", -1, 35, 16, 146, 8
+    PUSHBUTTON "是", IDOK, 41, 39, 50, 14
+    PUSHBUTTON "否", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -716,8 +716,6 @@
     IDS_RESTART_PROMPT "是否重新启动系统?"
     IDS_SHUTDOWN_TITLE "关机"
     IDS_SHUTDOWN_PROMPT "是否关闭系统?"
-    IDS_LOGOFF_TITLE "注销"
-    IDS_LOGOFF_PROMPT "你想要注销吗？"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "无法显示运行文件对话框 （内部错误）"
Index: dll/win32/shell32/lang/zh-TW.rc
===================================================================
--- dll/win32/shell32/lang/zh-TW.rc	(revision 71635)
+++ dll/win32/shell32/lang/zh-TW.rc	(working copy)
@@ -483,15 +483,15 @@
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
-IDD_LOG_OFF DIALOGEX 0, 0, 190, 60
+IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Log Off ReactOS"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
-    DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
+    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 190, 60
@@ -717,8 +717,6 @@
     IDS_RESTART_PROMPT "Do you want to restart the system?"
     IDS_SHUTDOWN_TITLE "關機"
     IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-    IDS_LOGOFF_TITLE "登出"
-    IDS_LOGOFF_PROMPT "Do you want to log off?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
Index: dll/win32/shell32/shresdef.h
===================================================================
--- dll/win32/shell32/shresdef.h	(revision 71635)
+++ dll/win32/shell32/shresdef.h	(working copy)
@@ -111,9 +111,6 @@
 #define IDS_DRIVE_REMOVABLE      76
 #define IDS_FS_UNKNOWN           77
 
-#define IDS_LOGOFF_TITLE  78
-#define IDS_LOGOFF_PROMPT 79
-
 #define IDS_CREATEFOLDER_DENIED   128
 #define IDS_CREATEFOLDER_CAPTION  129
 #define IDS_DELETEITEM_CAPTION    130