diff --git a/reactos/dll/win32/syssetup/install.c b/reactos/dll/win32/syssetup/install.c
index 6b3c4a7e3f6..df3ebc3da41 100644
--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -741,6 +741,7 @@ CreateShortcuts(VOID)
 
     /* Create desktop shortcuts */
     CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE);
+    CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, FALSE);
 
     /* Create program startmenu shortcuts */
     CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE);
@@ -756,7 +757,6 @@ CreateShortcuts(VOID)
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, FALSE);
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE);
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, FALSE);
-        CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE);
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE);
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE);
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, FALSE);
@@ -766,6 +766,8 @@ CreateShortcuts(VOID)
     if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0])))
     {
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE);
+        CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, FALSE);
+        CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE);
     }
 
     /* Creacte Accessibility subfolder and fill if the exe is available */
diff --git a/reactos/dll/win32/syssetup/lang/bg-BG.rc b/reactos/dll/win32/syssetup/lang/bg-BG.rc
index 0097add389a..d08835d0b95 100644
--- a/reactos/dll/win32/syssetup/lang/bg-BG.rc
+++ b/reactos/dll/win32/syssetup/lang/bg-BG.rc
@@ -224,6 +224,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Ситемни средства"
 	IDS_CMT_CHARMAP      "Знакова таблица"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -262,6 +263,7 @@ BEGIN
     IDS_SHORT_CHARMAP    "Знакова таблица.lnk"
     IDS_SHORT_MAGNIFY    "Лупа.lnk"
     IDS_SHORT_RDESKTOP   "Далечна работна площ.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 
diff --git a/reactos/dll/win32/syssetup/lang/cs-CZ.rc b/reactos/dll/win32/syssetup/lang/cs-CZ.rc
index a6864d907cf..ed188c28a23 100644
--- a/reactos/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/reactos/dll/win32/syssetup/lang/cs-CZ.rc
@@ -218,6 +218,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "CharMap"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -257,6 +258,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/de-DE.rc b/reactos/dll/win32/syssetup/lang/de-DE.rc
index ca67cdfebe4..1c6d2f7690e 100644
--- a/reactos/dll/win32/syssetup/lang/de-DE.rc
+++ b/reactos/dll/win32/syssetup/lang/de-DE.rc
@@ -219,6 +219,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Systemprogramme"
 	IDS_CMT_CHARMAP      "Zeichentabelle"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -258,6 +259,7 @@ BEGIN
     IDS_SHORT_CHARMAP    "Zeichentabelle.lnk"
     IDS_SHORT_MAGNIFY    "Bildschirmlupe.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/el-GR.rc b/reactos/dll/win32/syssetup/lang/el-GR.rc
index e922eb9086d..2cd186d0938 100644
--- a/reactos/dll/win32/syssetup/lang/el-GR.rc
+++ b/reactos/dll/win32/syssetup/lang/el-GR.rc
@@ -220,6 +220,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "ЕсгблеЯб УхуфЮмбфпт"
 	IDS_CMT_CHARMAP      "РЯнбкбт ЧбсбкфЮсщн"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -259,6 +260,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "РЯнбкбт ЧбсбкфЮсщн.lnk"
 	IDS_SHORT_MAGNIFY    "Мегеихнфйкьт цбкьт.lnk"
     IDS_SHORT_RDESKTOP   "Уэндеуз брпмбксхумЭнзт ерйцЬнейбт есгбуЯбт.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/en-US.rc b/reactos/dll/win32/syssetup/lang/en-US.rc
index d8980f19fc2..f2b0bb211a0 100644
--- a/reactos/dll/win32/syssetup/lang/en-US.rc
+++ b/reactos/dll/win32/syssetup/lang/en-US.rc
@@ -220,6 +220,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "Character Map"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -258,6 +259,7 @@ BEGIN
     IDS_SHORT_CHARMAP    "Character Map.lnk"
     IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/es-ES.rc b/reactos/dll/win32/syssetup/lang/es-ES.rc
index 5b44e2153d7..9a31c62734d 100644
--- a/reactos/dll/win32/syssetup/lang/es-ES.rc
+++ b/reactos/dll/win32/syssetup/lang/es-ES.rc
@@ -228,6 +228,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Herramientas del sistema"
 	IDS_CMT_CHARMAP      "Mapa de caracteres"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -267,6 +268,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "Mapa de caracteres.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Escritorio Remoto.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/fr-FR.rc b/reactos/dll/win32/syssetup/lang/fr-FR.rc
index 41ab06c4e0b..4f29be82283 100644
--- a/reactos/dll/win32/syssetup/lang/fr-FR.rc
+++ b/reactos/dll/win32/syssetup/lang/fr-FR.rc
@@ -220,6 +220,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Outils systиme"
 	IDS_CMT_CHARMAP      "Table des Caractиres"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -258,6 +259,7 @@ BEGIN
     IDS_SHORT_CHARMAP    "Table des Caractиres.lnk"
     IDS_SHORT_MAGNIFY    "Loupe.lnk"
     IDS_SHORT_RDESKTOP   "Bureau Distant.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/hu-HU.rc b/reactos/dll/win32/syssetup/lang/hu-HU.rc
index 79018abcf93..226ce76ff2d 100644
--- a/reactos/dll/win32/syssetup/lang/hu-HU.rc
+++ b/reactos/dll/win32/syssetup/lang/hu-HU.rc
@@ -232,6 +232,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "CharMap"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -271,6 +272,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/id-ID.rc b/reactos/dll/win32/syssetup/lang/id-ID.rc
index 1cd17c4ad30..8502065daff 100644
--- a/reactos/dll/win32/syssetup/lang/id-ID.rc
+++ b/reactos/dll/win32/syssetup/lang/id-ID.rc
@@ -218,6 +218,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "CharMap"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -256,6 +257,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/it-IT.rc b/reactos/dll/win32/syssetup/lang/it-IT.rc
index 93b2fe74b3e..0c88d6e2871 100644
--- a/reactos/dll/win32/syssetup/lang/it-IT.rc
+++ b/reactos/dll/win32/syssetup/lang/it-IT.rc
@@ -211,6 +211,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Strumenti di sistema"
 	IDS_CMT_CHARMAP      "Mappa dei caratteri"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -249,6 +250,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/ja-JP.rc b/reactos/dll/win32/syssetup/lang/ja-JP.rc
index d014f49ba6a..9ca521639d3 100644
--- a/reactos/dll/win32/syssetup/lang/ja-JP.rc
+++ b/reactos/dll/win32/syssetup/lang/ja-JP.rc
@@ -220,6 +220,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "CharMap"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -258,6 +259,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/nb-NO.rc b/reactos/dll/win32/syssetup/lang/nb-NO.rc
index 7a817b83c9e..9b8e21b6750 100644
--- a/reactos/dll/win32/syssetup/lang/nb-NO.rc
+++ b/reactos/dll/win32/syssetup/lang/nb-NO.rc
@@ -223,6 +223,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "CharMap"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -261,6 +262,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/nl-NL.rc b/reactos/dll/win32/syssetup/lang/nl-NL.rc
index 8cfe783c58e..cb5d04515c1 100644
--- a/reactos/dll/win32/syssetup/lang/nl-NL.rc
+++ b/reactos/dll/win32/syssetup/lang/nl-NL.rc
@@ -220,6 +220,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "CharMap"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 STRINGTABLE
@@ -258,6 +259,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/pl-PL.rc b/reactos/dll/win32/syssetup/lang/pl-PL.rc
index c7f121cac8b..1f79b29963c 100644
--- a/reactos/dll/win32/syssetup/lang/pl-PL.rc
+++ b/reactos/dll/win32/syssetup/lang/pl-PL.rc
@@ -224,6 +224,13 @@ BEGIN
 	IDS_CMT_MAGNIFY      	     "Lupa"
 END
 
+STRINGTABLE
+BEGIN
+	IDS_SYS_TOOLS        "System Tools"
+	IDS_CMT_CHARMAP      "Character Map"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
+END
+
 STRINGTABLE
 BEGIN
    IDS_GAMES           "Gry"
@@ -260,6 +267,7 @@ BEGIN
     IDS_SHORT_WINEMINE   "Saper.lnk"
 	IDS_SHORT_MAGNIFY    "Lupa.lnk"
     IDS_SHORT_RDESKTOP   "Dostкp zdalny.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/ru-RU.rc b/reactos/dll/win32/syssetup/lang/ru-RU.rc
index 6d07e5024ca..52beca3840a 100644
--- a/reactos/dll/win32/syssetup/lang/ru-RU.rc
+++ b/reactos/dll/win32/syssetup/lang/ru-RU.rc
@@ -202,6 +202,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Служебные"
 	IDS_CMT_CHARMAP      "Таблица символов"
+	IDS_CMT_KBSWITCH     "Переключатель раскладки клавиатуры"
 END
 
 
@@ -241,6 +242,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "Таблица символов.lnk"
 	IDS_SHORT_MAGNIFY    "Экранная лупа.lnk"
     IDS_SHORT_RDESKTOP   "Удаленный рабочий стол.lnk"
+	IDS_SHORT_KBSWITCH   "Переключатель раскладки клавиатуры.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/sk-SK.rc b/reactos/dll/win32/syssetup/lang/sk-SK.rc
index 02a2e190668..a657aea30bf 100644
--- a/reactos/dll/win32/syssetup/lang/sk-SK.rc
+++ b/reactos/dll/win32/syssetup/lang/sk-SK.rc
@@ -204,6 +204,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Systйmovй nбstroje"
 	IDS_CMT_CHARMAP      "Mapa znakov"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -243,6 +244,7 @@ BEGIN
     IDS_SHORT_CHARMAP    "Mapa znakov.lnk"
     IDS_SHORT_MAGNIFY    "Lupa.lnk"
     IDS_SHORT_RDESKTOP   "Vzdialenб pracovnб plocha.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/uk-UA.rc b/reactos/dll/win32/syssetup/lang/uk-UA.rc
index d6ffb6c5847..fe9a45f0908 100644
--- a/reactos/dll/win32/syssetup/lang/uk-UA.rc
+++ b/reactos/dll/win32/syssetup/lang/uk-UA.rc
@@ -209,6 +209,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "Службові"
 	IDS_CMT_CHARMAP      "Таблиця символів"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -248,6 +249,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/lang/zh-CN.rc b/reactos/dll/win32/syssetup/lang/zh-CN.rc
index 2c0dce9d3d8..7c4cf1f16a6 100644
--- a/reactos/dll/win32/syssetup/lang/zh-CN.rc
+++ b/reactos/dll/win32/syssetup/lang/zh-CN.rc
@@ -208,6 +208,7 @@ STRINGTABLE
 BEGIN
 	IDS_SYS_TOOLS        "System Tools"
 	IDS_CMT_CHARMAP      "CharMap"
+	IDS_CMT_KBSWITCH     "Keyboard Layout Switcher"
 END
 
 
@@ -246,6 +247,7 @@ BEGIN
 	IDS_SHORT_CHARMAP    "CharMap.lnk"
 	IDS_SHORT_MAGNIFY    "Magnify.lnk"
     IDS_SHORT_RDESKTOP   "Remote Desktop.lnk"
+	IDS_SHORT_KBSWITCH   "Keyboard Layout Switcher.lnk"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/syssetup/resource.h b/reactos/dll/win32/syssetup/resource.h
index d80eeef5493..2b7b8012b02 100644
--- a/reactos/dll/win32/syssetup/resource.h
+++ b/reactos/dll/win32/syssetup/resource.h
@@ -107,6 +107,7 @@
 #define IDS_CMT_CHARMAP         3224
 #define IDS_CMT_MAGNIFY			3225
 #define IDS_CMT_RDESKTOP		3226
+#define IDS_CMT_KBSWITCH        3227
 
 #define IDS_REACTOS_SETUP		3300
 #define IDS_UNKNOWN_ERROR		3301
@@ -133,6 +134,7 @@
 #define IDS_SHORT_CHARMAP    3413
 #define IDS_SHORT_MAGNIFY	 3414
 #define IDS_SHORT_RDESKTOP	 3415
+#define IDS_SHORT_KBSWITCH   3416
 
 #define IDS_WZD_NAME         3450
 #define IDS_WZD_SETCOMPUTERNAME  3451