diff --git a/reactos/base/shell/explorer/globals.h b/reactos/base/shell/explorer/globals.h
index 67c1dc48765..37428f2d4d8 100644
--- a/reactos/base/shell/explorer/globals.h
+++ b/reactos/base/shell/explorer/globals.h
@@ -235,7 +235,7 @@ typedef Desktop DesktopRef;
 #endif
 
 
-#define	DESKTOP_COUNT	4
+#define	DESKTOP_COUNT	2
 
 struct Desktops : public vector<DesktopRef>
 {
diff --git a/reactos/base/shell/explorer/res/startmenu.ico b/reactos/base/shell/explorer/res/startmenu.ico
index 0ce1dd360f3..492e388a939 100644
Binary files a/reactos/base/shell/explorer/res/startmenu.ico and b/reactos/base/shell/explorer/res/startmenu.ico differ
diff --git a/reactos/base/shell/explorer/taskbar/desktopbar.cpp b/reactos/base/shell/explorer/taskbar/desktopbar.cpp
index ded1b193975..d5eacd87e3f 100644
--- a/reactos/base/shell/explorer/taskbar/desktopbar.cpp
+++ b/reactos/base/shell/explorer/taskbar/desktopbar.cpp
@@ -427,9 +427,7 @@ int DesktopBar::Command(int id, int code)
 		break;
 
 	  case ID_SWITCH_DESKTOP_1:
-	  case ID_SWITCH_DESKTOP_1+1:
-	  case ID_SWITCH_DESKTOP_1+2:
-	  case ID_SWITCH_DESKTOP_1+3: {
+	  case ID_SWITCH_DESKTOP_1+1: {
 		int desktop_idx = id - ID_SWITCH_DESKTOP_1;
 
 		g_Globals._desktops.SwitchToDesktop(desktop_idx);
diff --git a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
index 2504a9db694..ee973c764bd 100644
--- a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
+++ b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
@@ -150,7 +150,7 @@ void QuickLaunchBar::AddShortcuts()
 
 		SelectBitmap(hdc, hbmp_old);
 
-		AddButton(ID_SWITCH_DESKTOP_1+i, hbmp, FmtString(desktop_fmt, i+1), NULL, cur_desktop==i?TBSTATE_ENABLED|TBSTATE_CHECKED:TBSTATE_ENABLED);
+		AddButton(ID_SWITCH_DESKTOP_1+i, hbmp, FmtString(desktop_fmt, i+1), NULL, cur_desktop==i?TBSTATE_ENABLED|TBSTATE_PRESSED:TBSTATE_ENABLED);
 	}
 	DeleteDC(hdc);
 
@@ -199,7 +199,7 @@ void QuickLaunchBar::AddButton(int id, HBITMAP hbmp, LPCTSTR name, Entry* entry,
 void QuickLaunchBar::UpdateDesktopButtons(int desktop_idx)
 {
 	for(int i=0; i<DESKTOP_COUNT; ++i) {
-		TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, desktop_idx==i? TBSTATE_ENABLED|TBSTATE_CHECKED: TBSTATE_ENABLED};
+		TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, desktop_idx==i? TBSTATE_ENABLED|TBSTATE_PRESSED: TBSTATE_ENABLED};
 
 		SendMessage(_hwnd, TB_SETBUTTONINFO, ID_SWITCH_DESKTOP_1+i, (LPARAM)&tbi);
 	}