Index: Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php
===================================================================
--- Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php	(revision 3359)
+++ Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php	(working copy)
@@ -128,19 +128,8 @@
 				'</li>';
 		}
 
-			// frontend preview toggle
-		$frontendPreviewActiveIcon = $stateUncheckedIcon;
-		if (!$GLOBALS['BE_USER']->user['workspace_preview']) {
-			$frontendPreviewActiveIcon = $stateCheckedIcon;
-		}
-
-		$workspaceMenu[] = '<li class="divider">' . $frontendPreviewActiveIcon .
-			'<a href="backend.php?changeWorkspacePreview=' .
-			($GLOBALS['BE_USER']->user['workspace_preview'] ? '0' : '1') .
-			'" id="frontendPreviewToggle">' . $GLOBALS['LANG']->getLL('bookmark_workspaceComparisonView', true) . '</a></li>';
-
 			// go to workspace module link
-		$workspaceMenu[] = '<li>' . $stateUncheckedIcon . ' ' .
+		$workspaceMenu[] = '<li class="divider">' . $stateUncheckedIcon . ' ' .
 			'<a href="javascript:top.goToModule(\'web_WorkspacesWorkspaces\');" target="content" id="goToWsModule">' .
 			' '. $GLOBALS['LANG']->getLL('bookmark_workspace', true) . '</a></li>';
 
Index: Classes/Service/Befunc.php
===================================================================
--- Classes/Service/Befunc.php	(revision 3359)
+++ Classes/Service/Befunc.php	(working copy)
@@ -45,7 +45,7 @@
 	 * @return void
 	 */
 	public function preProcess($pageUid, $backPath, $rootLine, $anchorSection, &$viewScript, $additionalGetVars, $switchFocus) {
-		if ($GLOBALS['BE_USER']->workspace !== 0 && !$GLOBALS['BE_USER']->user['workspace_preview']) {
+		if ($GLOBALS['BE_USER']->workspace !== 0) {
 			$ctrl = t3lib_div::makeInstance('Tx_Workspaces_Controller_PreviewController', FALSE);
 			$uriBuilder = t3lib_div::makeInstance('Tx_Extbase_MVC_Web_Routing_UriBuilder');
 			/**