diff --git a/reactos/dll/cpl/appwiz/Cz.rc b/reactos/dll/cpl/appwiz/Cz.rc
index d4122e70e82..f26a61e392b 100644
--- a/reactos/dll/cpl/appwiz/Cz.rc
+++ b/reactos/dll/cpl/appwiz/Cz.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "N�sleduj�c� aplikace mohou b�t automaticky odstran�ny. K odstran�n� aplikace nebo k nastaven� jej�ch komponent, ji vyberte ze seznamu a klepn�te na tla��tko P�idat/Odebrat.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "P�idat/&Odebrat", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "P�idat/&Odebrat", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/De.rc b/reactos/dll/cpl/appwiz/De.rc
index 22e7fe77d61..25c2ce7464c 100644
--- a/reactos/dll/cpl/appwiz/De.rc
+++ b/reactos/dll/cpl/appwiz/De.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Updates anzeigen",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "Die folgende Software kann automatisch entfernt werden. Um ein Programm zu entfernen oder die installierten Programmpakete zu �ndern, w�hlen Sie das Programm in der Liste und klicken auf �ndern/Entfernen.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "�ndern/Entfe&rnen", IDC_ADDREMOVE, PROPSHEETWIDTH-(82), 205, 70, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "�ndern/Entfe&rnen", IDC_ADDREMOVE, PROPSHEETWIDTH-(82), 200, 70, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Dk.rc b/reactos/dll/cpl/appwiz/Dk.rc
index 258a9a74a6f..d56a8bde7db 100644
--- a/reactos/dll/cpl/appwiz/Dk.rc
+++ b/reactos/dll/cpl/appwiz/Dk.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "F�lgende Software kan automatisk blive Fjernet. For at fjerne programmer eller �ndre hvilken typer komponeter der skal v�re installeret, v�lg fra listen og klik p� Tilf�j/Fjern.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "Tilf�j/&Fjern", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Tilf�j/&Fjern", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/En.rc b/reactos/dll/cpl/appwiz/En.rc
index 9a3c677c122..b77559805f9 100644
--- a/reactos/dll/cpl/appwiz/En.rc
+++ b/reactos/dll/cpl/appwiz/En.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Es.rc b/reactos/dll/cpl/appwiz/Es.rc
index fcf505c67ef..f084c3253f3 100644
--- a/reactos/dll/cpl/appwiz/Es.rc
+++ b/reactos/dll/cpl/appwiz/Es.rc
@@ -19,8 +19,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "El siguiente software puede ser removido automaticamente. Para remover un programa o modificar sus componentes instalados, seleccionalo en la lista y pulsa A�adir/Remover.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "A�adir/&Remover", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "A�adir/&Remover", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Fr.rc b/reactos/dll/cpl/appwiz/Fr.rc
index ce92ff09139..669c30f5759 100644
--- a/reactos/dll/cpl/appwiz/Fr.rc
+++ b/reactos/dll/cpl/appwiz/Fr.rc
@@ -15,8 +15,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "Les logiciels suivant peuvent �tre supprim�s automatiquement. Pour supprimer un programme ou modifier ses composantes install�es, s�lectionnez-le dans la liste et cliquez sur Ajouter/Supprimer.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Gr.rc b/reactos/dll/cpl/appwiz/Gr.rc
index 5eec6f6440d..73e6ab7dbb3 100644
--- a/reactos/dll/cpl/appwiz/Gr.rc
+++ b/reactos/dll/cpl/appwiz/Gr.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "�� �������� ��������� ������ �� �������������� ���������. ��� �� ��������������� ��� ��������� � �� �������� �� ������������� ��� ������, �������� �� ��� �� ����� ��� ����� ���� ��� ��������/��������.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "��������/&��������", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "��������/&��������", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Hu.rc b/reactos/dll/cpl/appwiz/Hu.rc
index a1935cae59f..c72c2199e84 100644
--- a/reactos/dll/cpl/appwiz/Hu.rc
+++ b/reactos/dll/cpl/appwiz/Hu.rc
@@ -14,8 +14,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "A k�vetkez� szoftvereket lehet elt�vol�tani. A szoftver t�rl�s�hez vagy �sszetev�inek modos�t�s�hoz kattints a szoftverre a list�ban, majd kattints a Hozz�ad�s/elt�vol�t�s gombra.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "Hozz�ad�s/elt�vol�t�s", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Hozz�ad�s/elt�vol�t�s", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Ja.rc b/reactos/dll/cpl/appwiz/Ja.rc
index eb296e05db3..1d61e9f82fc 100644
--- a/reactos/dll/cpl/appwiz/Ja.rc
+++ b/reactos/dll/cpl/appwiz/Ja.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "�����̃v���O�����͎����ō폜���邱�Ƃ��ł��܂��B�v���O������ύX������A�R���s���[�^����폜�����肷��ɂ́A�ꗗ����ړI�̃v���O������I�����A[�ύX�ƍ폜] ���N���b�N���Ă��������B",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "�ύX�ƍ폜(&R)", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "�ύX�ƍ폜(&R)", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Nl.rc b/reactos/dll/cpl/appwiz/Nl.rc
index 02dfcd74137..19690364af3 100644
--- a/reactos/dll/cpl/appwiz/Nl.rc
+++ b/reactos/dll/cpl/appwiz/Nl.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "&De volgende software kan automatisch worden verwijderd. U verwijdert een programma of wijzigt de ge�nstalleerde onderdelen door het programma te selecteren en op Toevoegen/verwijderen te klikken.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "Toe&voegen/verwijderen", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Toe&voegen/verwijderen", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Pl.rc b/reactos/dll/cpl/appwiz/Pl.rc
index 9f8bcfaef50..82bfca2446c 100644
--- a/reactos/dll/cpl/appwiz/Pl.rc
+++ b/reactos/dll/cpl/appwiz/Pl.rc
@@ -15,8 +15,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "Nast�puj�ce oprogramowanie mo�e by� automatycznie usuni�te. �eby usun�c program, albo zmodyfikowa� zainstalowane komponenty, wybierz program z listy i kliknij Dodaj/Usu�.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "Dodaj/&Usu�", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Dodaj/&Usu�", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/Ru.rc b/reactos/dll/cpl/appwiz/Ru.rc
index a62fd279a57..c7b52c9fc05 100644
--- a/reactos/dll/cpl/appwiz/Ru.rc
+++ b/reactos/dll/cpl/appwiz/Ru.rc
@@ -13,8 +13,8 @@ BEGIN
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
   CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
   LTEXT "����� ���������� ��������� ��� �������� � ������������� ����������, �������� � � ������ � ������� ""��������/�������"".",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP
-  PUSHBUTTON "&��������/�������", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 198, 85, 14
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "&��������/�������", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 200, 85, 14
 END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/dll/cpl/appwiz/resource.h b/reactos/dll/cpl/appwiz/resource.h
index f6361914f55..90e5b5b1e44 100644
--- a/reactos/dll/cpl/appwiz/resource.h
+++ b/reactos/dll/cpl/appwiz/resource.h
@@ -13,7 +13,7 @@
 
 /* ids */
 
-#define IDI_CPLSYSTEM	100
+#define IDI_CPLSYSTEM	1500
 
 #define IDD_PROPPAGEINSTALL	100
 #define IDD_PROPPAGEROSSETUP	101
diff --git a/reactos/dll/cpl/appwiz/resources/applet.ico b/reactos/dll/cpl/appwiz/resources/applet.ico
index b98d20fc122..b81d7fdf353 100644
Binary files a/reactos/dll/cpl/appwiz/resources/applet.ico and b/reactos/dll/cpl/appwiz/resources/applet.ico differ