diff --git a/reactos/dll/win32/shell32/drvdefext.cpp b/reactos/dll/win32/shell32/drvdefext.cpp
index 29af18ec0d6..fe2e449ede3 100644
--- a/reactos/dll/win32/shell32/drvdefext.cpp
+++ b/reactos/dll/win32/shell32/drvdefext.cpp
@@ -19,7 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define _USE_MATH_DEFINES
 #include <precomp.h>
+#include <math.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
@@ -204,30 +206,55 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem)
     }
     else if (pDrawItem->CtlID == 14015)
     {
-        HBRUSH hBlueBrush;
-        HBRUSH hMagBrush;
-        RECT rect;
-        LONG horzsize;
-        LONGLONG Result;
-        WCHAR szBuffer[20];
+        HBRUSH hBlueBrush = CreateSolidBrush(RGB(0, 0, 255));
+        HBRUSH hMagBrush = CreateSolidBrush(RGB(255, 0, 255));
+        HPEN hDarkBluePen = CreatePen(PS_SOLID, 1, RGB(0, 0, 128));
+        HPEN hDarkMagPen = CreatePen(PS_SOLID, 1, RGB(128, 0, 128));
 
-        hBlueBrush = CreateSolidBrush(RGB(0, 0, 255));
-        hMagBrush = CreateSolidBrush(RGB(255, 0, 255));
+        WCHAR wszBuf[20];
+        GetDlgItemTextW(hwndDlg, 14006, wszBuf, _countof(wszBuf));
+        UINT cFreeSpace = _wtoi(wszBuf);
 
-        GetDlgItemTextW(hwndDlg, 14006, szBuffer, 20);
-        Result = _wtoi(szBuffer);
+        INT xCenter = (pDrawItem->rcItem.left + pDrawItem->rcItem.right)/2;
+        INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 10)/2;
+        INT cx = pDrawItem->rcItem.right - pDrawItem->rcItem.left;
+        INT cy = pDrawItem->rcItem.bottom - pDrawItem->rcItem.top - 10;
+        TRACE("cFreeSpace %d a %f cx %d\n", cFreeSpace, M_PI+cFreeSpace/100.0f*M_PI*2.0f, cx);
 
-        CopyRect(&rect, &pDrawItem->rcItem);
-        horzsize = rect.right - rect.left;
-        Result = (Result * horzsize) / 100;
+        HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush);
+        INT xRadial = xCenter + (INT)(cosf(M_PI+cFreeSpace/100.0f*M_PI*2.0f)*cx/2);
+        INT yRadial = yCenter - (INT)(sinf(M_PI+cFreeSpace/100.0f*M_PI*2.0f)*cy/2);
+        Pie(pDrawItem->hDC,
+            pDrawItem->rcItem.left, pDrawItem->rcItem.top,
+            pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10,
+            pDrawItem->rcItem.left, yCenter,
+            xRadial, yRadial);
+
+        SelectObject(pDrawItem->hDC, hBlueBrush);
+        Pie(pDrawItem->hDC,
+            pDrawItem->rcItem.left, pDrawItem->rcItem.top,
+            pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10,
+            xRadial, yRadial,
+            pDrawItem->rcItem.left, yCenter);
+        SelectObject(pDrawItem->hDC, hbrOld);
+
+        HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkBluePen);
+        for (INT x = pDrawItem->rcItem.left; x < pDrawItem->rcItem.right; ++x)
+        {
+            if (cFreeSpace < 50 && x == xRadial)
+                SelectObject(pDrawItem->hDC, hDarkMagPen);
+
+            float cos_val = (x - xCenter)*2.0f/cx;
+            INT y = yCenter+sinf(acosf(cos_val))*cy/2;
+            MoveToEx(pDrawItem->hDC, x, y, NULL);
+            LineTo(pDrawItem->hDC, x, y + 10);
+        }
+        SelectObject(pDrawItem->hDC, hOldPen);
 
-        rect.right = pDrawItem->rcItem.right - Result;
-        FillRect(pDrawItem->hDC, &rect, hBlueBrush);
-        rect.left = rect.right;
-        rect.right = pDrawItem->rcItem.right;
-        FillRect(pDrawItem->hDC, &rect, hMagBrush);
         DeleteObject(hBlueBrush);
         DeleteObject(hMagBrush);
+        DeleteObject(hDarkBluePen);
+        DeleteObject(hDarkMagPen);
     }
 }
 
@@ -298,11 +325,24 @@ CDrvDefExt::InitGeneralPage(HWND hwndDlg)
             }
         }
     }
-    /* set drive description */
+
+    /* Set drive description */
     WCHAR wszFormat[50];
     GetDlgItemTextW(hwndDlg, 14009, wszFormat, _countof(wszFormat));
-    swprintf(wszBuf, wszFormat, m_wszDrive);
+    swprintf(wszBuf, wszFormat, m_wszDrive[0]);
     SetDlgItemTextW(hwndDlg, 14009, wszBuf);
+
+    /* Set drive icon */
+    UINT IconId;
+    switch (DriveType)
+    {
+        case DRIVE_CDROM: IconId = IDI_SHELL_CDROM; break;
+        case DRIVE_REMOVABLE: IconId = IDI_SHELL_FLOPPY; break;
+        case DRIVE_RAMDISK: IconId = IDI_SHELL_RAMDISK; break;
+        default: IconId = IDI_SHELL_DRIVE;
+    }
+    HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IconId), IMAGE_ICON, 32, 32, LR_SHARED);
+    SendDlgItemMessageW(hwndDlg, 14016, STM_SETICON, (WPARAM)hIcon, 0);
 }
 
 INT_PTR CALLBACK
@@ -336,7 +376,8 @@ CDrvDefExt::GeneralPageProc(
             }
             break;
         }
-
+        case WM_PAINT:
+            break;
         case WM_COMMAND:
             if (LOWORD(wParam) == 14010) /* Disk Cleanup */
             {
diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc
index 4ac340ca423..c66f9115dad 100644
--- a/reactos/dll/win32/shell32/lang/bg-BG.rc
+++ b/reactos/dll/win32/shell32/lang/bg-BG.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Вид на файла:", 14004, 8, 35, 50, 10
 	LTEXT "Папка", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Вид файл:", 14004, 8, 35, 50, 10
 	LTEXT "Файл", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Вид:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Устройство %s", 14009, 100, 170, 40, 10
+	LTEXT "Устройство %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Почистване на диска", 14010, 150, 175, 80, 15, WS_TABSTOP
 	CHECKBOX "Уплътняване на устройството за спестяване на място", 14011, 1, 205, 238, 10, WS_DISABLED
 	CHECKBOX "Индексиращата услуга да индексира диска за по- бързо търсене", 14012, 1, 220, 238, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc
index f2d13897065..41b60b1923c 100644
--- a/reactos/dll/win32/shell32/lang/ca-ES.rc
+++ b/reactos/dll/win32/shell32/lang/ca-ES.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc
index e4cc714ed44..7b018c0b09a 100644
--- a/reactos/dll/win32/shell32/lang/cs-CZ.rc
+++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc
@@ -198,7 +198,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Typ souboru:", 14004, 8, 35, 50, 10
 	LTEXT "Složka", 14005, 68, 35, 160, 10
@@ -219,7 +219,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Typ souboru:", 14004, 8, 35, 50, 10
 	LTEXT "Soubor", 14005, 68, 35, 160, 10
@@ -266,7 +266,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Typ:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -287,9 +289,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Disk %s", 14009, 100, 170, 40, 10
+	LTEXT "Disk %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Vyčištění disku", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Šetřit místo na disku jeho kompresí", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Povolit indexování disku pro rychlejší vyhledávání", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc
index 1b3f6d2e66c..5a92b9a6313 100644
--- a/reactos/dll/win32/shell32/lang/da-DK.rc
+++ b/reactos/dll/win32/shell32/lang/da-DK.rc
@@ -198,7 +198,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -220,7 +220,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -267,7 +267,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -288,9 +290,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc
index 0e04e162791..5f09697ab03 100644
--- a/reactos/dll/win32/shell32/lang/de-DE.rc
+++ b/reactos/dll/win32/shell32/lang/de-DE.rc
@@ -212,7 +212,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Typ:", 14004, 8, 35, 50, 10
 	LTEXT "Dateiordner", 14005, 68, 35, 160, 10
@@ -234,7 +234,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Dateityp:", 14004, 8, 35, 50, 10
 	LTEXT "Datei", 14005, 68, 35, 160, 10
@@ -281,7 +281,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Typ:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -302,9 +304,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Laufwerk %s", 14009, 100, 170, 50, 10
+	LTEXT "Laufwerk %c", 14009, 100, 170, 50, 10
 	PUSHBUTTON "Bereinigen", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc
index 6fc527f3509..ee3cba39074 100644
--- a/reactos/dll/win32/shell32/lang/el-GR.rc
+++ b/reactos/dll/win32/shell32/lang/el-GR.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Γενικά"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -299,9 +299,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Δίσκος %s", 14009, 100, 170, 40, 10
+	LTEXT "Δίσκος %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Εκκαθάριση δίσκου", 14010, 160, 175, 70, 15, WS_TABSTOP
 	CHECKBOX "Συμπίεση δίσκου για εξοικονόμηση χώρου", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Δημιουργία ευρετηρίου για γρηγορότερη αναζήτηση", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc
index 43b890ef33a..303a8ac6484 100644
--- a/reactos/dll/win32/shell32/lang/en-GB.rc
+++ b/reactos/dll/win32/shell32/lang/en-GB.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc
index d7f712975b2..0057848883a 100644
--- a/reactos/dll/win32/shell32/lang/en-US.rc
+++ b/reactos/dll/win32/shell32/lang/en-US.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -281,19 +281,21 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
 	LTEXT "File system:", -1, 15, 70, 100, 10
 	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
+	CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
 	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
+	CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
 	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
@@ -302,9 +304,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc
index ef2f53b91e8..fd7eda4370f 100644
--- a/reactos/dll/win32/shell32/lang/es-ES.rc
+++ b/reactos/dll/win32/shell32/lang/es-ES.rc
@@ -213,7 +213,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Tipo:", 14004, 8, 35, 50, 10
 	LTEXT "Carpeta de archivos", 14005, 68, 35, 160, 10
@@ -234,7 +234,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Tipo de archivo:", 14004, 8, 35, 55, 10
 	LTEXT "Archivo", 14005, 68, 35, 160, 10
@@ -281,7 +281,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Tipo:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -302,9 +304,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Unidad %s", 14009, 100, 170, 40, 10
+	LTEXT "Unidad %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Liberar espacio en disco", 14010, 160, 175, 80, 15, WS_TABSTOP
 	CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 5, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Permitir a Index Server indizar el disco para acelerar la búsqueda", 14012, 5, 220, 220, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc
index 6b8ea166075..2472e5ba370 100644
--- a/reactos/dll/win32/shell32/lang/fi-FI.rc
+++ b/reactos/dll/win32/shell32/lang/fi-FI.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc
index 80e8d5039e0..a0508a915f9 100644
--- a/reactos/dll/win32/shell32/lang/fr-FR.rc
+++ b/reactos/dll/win32/shell32/lang/fr-FR.rc
@@ -214,7 +214,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type de fichier :", 14004, 8, 35, 50, 10
 	LTEXT "Dossier", 14005, 68, 35, 160, 10
@@ -235,7 +235,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type de fichier :", 14004, 8, 35, 50, 10
 	LTEXT "Fichier", 14005, 68, 35, 160, 10
@@ -282,7 +282,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type :", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -303,9 +305,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Lecteur %s", 14009, 100, 170, 40, 10
+	LTEXT "Lecteur %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Nettoyage de disque", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Autoriser le service d'indexation à indexer ce disque pour une recherche rapide de fichiers", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc
index c05d528b390..399459d2056 100644
--- a/reactos/dll/win32/shell32/lang/hu-HU.rc
+++ b/reactos/dll/win32/shell32/lang/hu-HU.rc
@@ -213,7 +213,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -234,7 +234,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -281,7 +281,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -302,9 +304,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc
index de872c8820c..98d6fdf3c26 100644
--- a/reactos/dll/win32/shell32/lang/it-IT.rc
+++ b/reactos/dll/win32/shell32/lang/it-IT.rc
@@ -211,7 +211,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Tipo del file:", 14004, 8, 35, 50, 10
 	LTEXT "Cartella", 14005, 68, 35, 160, 10
@@ -232,7 +232,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Tipo di file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -279,7 +279,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Tipo:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -300,9 +302,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Disco %s", 14009, 100, 170, 40, 10
+	LTEXT "Disco %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Pulitura disco", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc
index 8e9ac553997..ac31002ea1e 100644
--- a/reactos/dll/win32/shell32/lang/ja-JP.rc
+++ b/reactos/dll/win32/shell32/lang/ja-JP.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "全般"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "ファイルの種類:", 14004, 8, 35, 50, 10
 	LTEXT "フォルダ", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "全般"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "ファイルの種類:", 14004, 8, 35, 50, 10
 	LTEXT "ファ・Cル", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "全般"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "種類:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "ドライブ %s", 14009, 100, 170, 40, 10
+	LTEXT "ドライブ %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "ディスクのクリーンアップ", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "ドライブを圧縮してディスク領域を確保する", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "このディスクにインデックスを付けてファイル検索を速くする。", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc
index e3f855ef94e..017518b4731 100644
--- a/reactos/dll/win32/shell32/lang/ko-KR.rc
+++ b/reactos/dll/win32/shell32/lang/ko-KR.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc
index 104ac94c381..8cffb4fae7a 100644
--- a/reactos/dll/win32/shell32/lang/nl-NL.rc
+++ b/reactos/dll/win32/shell32/lang/nl-NL.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/no-NO.rc b/reactos/dll/win32/shell32/lang/no-NO.rc
index 8c4a0a6b99a..cc7b3489115 100644
--- a/reactos/dll/win32/shell32/lang/no-NO.rc
+++ b/reactos/dll/win32/shell32/lang/no-NO.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generielt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Filtype:", 14004, 8, 35, 50, 10
 	LTEXT "Mappe", 14005, 68, 35, 160, 10
@@ -232,7 +232,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generielt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Filtype:", 14004, 8, 35, 50, 10
 	LTEXT "Fil", 14005, 68, 35, 160, 10
@@ -279,7 +279,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generielt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -300,9 +302,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Stasjon %s", 14009, 100, 170, 40, 10
+	LTEXT "Stasjon %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Diskoppryding", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Indekser denne stasjonen for raskere søking", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc
index 10bf6a556c2..d1d31094a05 100644
--- a/reactos/dll/win32/shell32/lang/pl-PL.rc
+++ b/reactos/dll/win32/shell32/lang/pl-PL.rc
@@ -218,7 +218,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ogólne"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Rozszerzenie:", 14004, 8, 35, 50, 10
 	LTEXT "Katalog", 14005, 68, 35, 160, 10
@@ -239,7 +239,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ogólne"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Typ pliku:", 14004, 8, 35, 50, 10
 	LTEXT "Plik", 14005, 68, 35, 160, 10
@@ -286,7 +286,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ogólne"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Typ:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -307,9 +309,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Napęd %s", 14009, 100, 170, 40, 10
+	LTEXT "Napęd %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Czyszczenie dysku", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Kompresja danych na dysku", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Zezwól Usłudze Indeksowania na zaindeksowanie tego dysku (szybkie przeszukiwanie plików)", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc
index e599ce8925f..43b355ebc86 100644
--- a/reactos/dll/win32/shell32/lang/pt-BR.rc
+++ b/reactos/dll/win32/shell32/lang/pt-BR.rc
@@ -212,7 +212,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -233,7 +233,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -280,7 +280,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -301,9 +303,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc
index cd15945034b..e218c53ebad 100644
--- a/reactos/dll/win32/shell32/lang/pt-PT.rc
+++ b/reactos/dll/win32/shell32/lang/pt-PT.rc
@@ -213,7 +213,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Geral"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Tipo de ficheiro:", 14004, 8, 35, 50, 10
 	LTEXT "Pasta", 14005, 68, 35, 160, 10
@@ -234,7 +234,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "geral"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Tipo de Ficheiro:", 14004, 8, 35, 50, 10
 	LTEXT "Ficheiro", 14005, 68, 35, 160, 10
@@ -281,7 +281,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Geral"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Tipo:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -302,9 +304,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Disco %s", 14009, 100, 170, 40, 10
+	LTEXT "Disco %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Limpeza do Disco", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Comprimir unidade para libertar espaço no disco", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "permitir indexar este disco para acelerar a procura de ficheiros", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/ro-RO.rc b/reactos/dll/win32/shell32/lang/ro-RO.rc
index 0523e1f8bb3..d758c1f1cee 100644
--- a/reactos/dll/win32/shell32/lang/ro-RO.rc
+++ b/reactos/dll/win32/shell32/lang/ro-RO.rc
@@ -304,7 +304,7 @@ BEGIN
 
 	CONTROL   "",           14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
 
-	LTEXT       "Partiție %s",     14009, 100, 170, 40, 10
+	LTEXT       "Partiție %c",     14009, 100, 170, 40, 10
 	PUSHBUTTON  "Curățare disc…",  14010, 165, 175, 65, 15, WS_TABSTOP
 	CHECKBOX    "Comprimă pentru a economisi spațiu", 14011, 15, 200, 180, 10, WS_DISABLED
 	CHECKBOX    "Permite „Serviciu de indexare”, pentru accelerarea căutărilor", 14012, 15, 215, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc
index 80bfc6a9f82..15308ecdaaf 100644
--- a/reactos/dll/win32/shell32/lang/ru-RU.rc
+++ b/reactos/dll/win32/shell32/lang/ru-RU.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общие"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Тип файла:", 14004, 8, 35, 50, 10
 	LTEXT "Папка", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общие"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Тип файла:", 14004, 8, 35, 50, 10
 	LTEXT "файл", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общие"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Тип:", -1, 15, 49, 40, 10
 	EDITTEXT 14001, 110, 49, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -301,7 +303,7 @@ BEGIN
 
 	CONTROL "", 14015, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 20, 140, 200, 20
 
-	LTEXT "Диск %s", 14009, 100, 170, 52, 10
+	LTEXT "Диск %c", 14009, 100, 170, 52, 10
 	PUSHBUTTON "Очистка диска", 14010, 166, 175, 64, 15, WS_TABSTOP
 	CHECKBOX "&Сжимать для экономии места", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Разрешить &индексирование диска для быстрого поиска", 14012, 15, 220, 216, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc
index 72fc10f64e6..4b3591a7b54 100644
--- a/reactos/dll/win32/shell32/lang/sk-SK.rc
+++ b/reactos/dll/win32/shell32/lang/sk-SK.rc
@@ -216,7 +216,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Všeobecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Typ:", 14004, 8, 35, 50, 10
 	LTEXT "Priečinok", 14005, 68, 35, 160, 10
@@ -237,7 +237,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Všeobecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Typ súboru:", 14004, 8, 35, 50, 10
 	LTEXT "Súbor", 14005, 68, 35, 160, 10
@@ -284,7 +284,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Všeobecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Typ:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -305,9 +307,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Jednotka %s", 14009, 100, 170, 45, 10
+	LTEXT "Jednotka %c", 14009, 100, 170, 45, 10
 	PUSHBUTTON "&Čistenie disku", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Ušetriť miesto na disku &kompresiou jednotky", 14011, 10, 205, 180, 10, WS_DISABLED
 	CHECKBOX "&Povoliť indexovanie pre tento disk, a zrýchliť tak hľadanie súborov", 14012, 10, 220, 225, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc
index 2d0cf5c39b1..80b7d43947e 100644
--- a/reactos/dll/win32/shell32/lang/sl-SI.rc
+++ b/reactos/dll/win32/shell32/lang/sl-SI.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc
index 3744c72e8a5..8128f8238d7 100644
--- a/reactos/dll/win32/shell32/lang/sv-SE.rc
+++ b/reactos/dll/win32/shell32/lang/sv-SE.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc
index 0386ecbf6c5..fa4bedd4840 100644
--- a/reactos/dll/win32/shell32/lang/tr-TR.rc
+++ b/reactos/dll/win32/shell32/lang/tr-TR.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc
index 01aa69b37d9..bcdb10b0ac7 100644
--- a/reactos/dll/win32/shell32/lang/uk-UA.rc
+++ b/reactos/dll/win32/shell32/lang/uk-UA.rc
@@ -212,7 +212,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Загальні"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Тип файлу:", 14004, 8, 35, 50, 10
 	LTEXT "Тека", 14005, 68, 35, 160, 10
@@ -233,7 +233,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Загальні"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Тип файлу:", 14004, 8, 35, 50, 10
 	LTEXT "Файл", 14005, 68, 35, 160, 10
@@ -280,7 +280,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Загальні"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Тип:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -301,9 +303,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Диск %s", 14009, 100, 170, 40, 10
+	LTEXT "Диск %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Очищення диску", 14010, 178, 175, 60, 15, WS_TABSTOP
 	CHECKBOX "Стискати диск для заощадження місця", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Дозволити індексування диску для прискорення пошуку", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc
index 4999cc1e5c7..7ae264f8f68 100644
--- a/reactos/dll/win32/shell32/lang/zh-CN.rc
+++ b/reactos/dll/win32/shell32/lang/zh-CN.rc
@@ -199,7 +199,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -220,7 +220,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -267,7 +267,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -288,9 +290,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED
diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc
index 45831a55ccb..5f3627f0cb8 100644
--- a/reactos/dll/win32/shell32/lang/zh-TW.rc
+++ b/reactos/dll/win32/shell32/lang/zh-TW.rc
@@ -210,7 +210,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
@@ -231,7 +231,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+	ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
@@ -278,7 +278,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+	ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
+
 	LTEXT "Type:", -1, 15, 55, 40, 10
 	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
@@ -299,9 +301,9 @@ BEGIN
 	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 
-	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
+	CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30
 
-	LTEXT "Drive %s", 14009, 100, 170, 40, 10
+	LTEXT "Drive %c", 14009, 100, 170, 40, 10
 	PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP
 	CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED
 	CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED