Index: typo3/sysext/lang/locallang_core.xml
===================================================================
--- typo3/sysext/lang/locallang_core.xml	(revision 7895)
+++ typo3/sysext/lang/locallang_core.xml	(working copy)
@@ -105,11 +105,16 @@
  			<label index="labels.findRecord">Find records</label>
  			<label index="labels.noRecordFound">No record found</label>
 			<label index="alttext.suggestSearching">Searching...</label>
+			<label index="ver.selectLabel">Versions of this page:</label>
 			<label index="ver.online">ONLINE</label>
+			<label index="ver.live">LIVE version</label>
 			<label index="ver.mgm">Version Management</label>
 			<label index="ver.selVer">Select version:</label>
 			<label index="ver.swap">Swap/Publish</label>
+			<label index="ver.publish">Publish page</label>
 			<label index="ver.swapPage">Publish this version of the page including content</label>
+			<label index="ver.inBranch">Inside branch, no further versioning possible</label>
+			<label index="ver.versionsFound">Versions found on page, no "Page" versioning possible</label>
 			<label index="TYPO3_Element_Browser">TYPO3 Element Browser</label>
 			<label index="labels.referencesToRecord">(There are %s reference(s) to this record!)</label>
 			<label index="labels.translationsOfRecord">(This record has %s translation(s) which will be deleted, too!)</label>
Index: typo3/sysext/t3skin/stylesheets/structure/module_web_list.css
===================================================================
--- typo3/sysext/t3skin/stylesheets/structure/module_web_list.css	(revision 7895)
+++ typo3/sysext/t3skin/stylesheets/structure/module_web_list.css	(working copy)
@@ -126,6 +126,7 @@
 table#typo3-versionSelector {
 	margin-bottom: 5px;
 	margin-top: 5px;
+	padding: 5px;
 }
 
 table#typo3-versionSelector td {
Index: typo3/sysext/t3skin/stylesheets/visual/element_version.css
===================================================================
--- typo3/sysext/t3skin/stylesheets/visual/element_version.css	(revision 7895)
+++ typo3/sysext/t3skin/stylesheets/visual/element_version.css	(working copy)
@@ -10,9 +10,7 @@
 
 table#typo3-versionSelector {
 	background-color: #ffec97;
-	/*background-image: url('../../icons/gfx/alt_menu_mainitem_bg.gif');
-	background-repeat: repeat-x;
-	border: 1px solid #a2aab8;*/
+	border: 1px solid #a2aab8;
 }
 
 .ver-element,
Index: typo3/template.php
===================================================================
--- typo3/template.php	(revision 7895)
+++ typo3/template.php	(working copy)
@@ -1833,29 +1833,42 @@
 
 					// If more than one was found...:
 				if (count($versions)>1)	{
+					$selectorLabel = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.selectLabel') . '</strong>';
 
 						// Create selector box entries:
 					$opt = array();
 					foreach($versions as $vRow)	{
-						$opt[] = '<option value="'.htmlspecialchars(t3lib_div::linkThisScript(array('id'=>$vRow['uid']))).'"'.($id==$vRow['uid']?' selected="selected"':'').'>'.
-								htmlspecialchars($vRow['t3ver_label'].' [v#'.$vRow['t3ver_id'].', WS:'.$vRow['t3ver_wsid'].']'.($vRow['uid']==$onlineId ? ' =>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online').'<=':'')).
-								'</option>';
+						if ($vRow['uid'] == $onlineId) {
+								//Live version
+							$label = '[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.live') . ']';
+						} else {
+							$label = $vRow['t3ver_label'] . ' (ID: ' . $vRow['t3ver_id'] .
+								($vRow['t3ver_wsid'] != 0 ? ' Workspace-Id: ' . $vRow['t3ver_wsid'] : '') . ')';
+						}
+
+						$opt[] = '<option value="' . htmlspecialchars(t3lib_div::linkThisScript(array('id' => $vRow['uid']))) . '"' .
+							($id==$vRow['uid']?' selected="selected"':'').'>' .
+							htmlspecialchars($label) . '</option>';
 					}
 
 						// Add management link:
-					$opt[] = '<option value="'.htmlspecialchars(t3lib_div::linkThisScript(array('id'=>$id))).'">---</option>';
-					$opt[] = '<option value="'.htmlspecialchars($this->backPath.t3lib_extMgm::extRelPath('version').'cm1/index.php?table=pages&uid='.$onlineId).'">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm',1).'</option>';
-
+					$management = '<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm',1) . '" onclick="window.location.href=\'' .
+							htmlspecialchars($this->backPath . t3lib_extMgm::extRelPath('version') . 'cm1/index.php?table=pages&uid=' . $onlineId) . '\';" />';
 						// Create onchange handler:
 					$onChange = "window.location.href=this.options[this.selectedIndex].value;";
 
 						// Controls:
-					if ($id==$onlineId)	{
-						$controls = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/blinkarrow_left.gif','width="5" height="9"').' class="absmiddle" alt="" /> <strong>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online',1).'</strong>';
+					if ($id == $onlineId) {
+						$controls .= '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/blinkarrow_left.gif','width="5" height="9"') .
+							' class="absmiddle" alt="" /> <strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online', 1) .
+							'</strong>';
 					} elseif (!$noAction) {
-						$controls = '<a href="'.$this->issueCommand('&cmd[pages]['.$onlineId.'][version][swapWith]='.$id.'&cmd[pages]['.$onlineId.'][version][action]=swap',t3lib_div::linkThisScript(array('id'=>$onlineId))).'" class="nobr">'.
-								'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/insert1.gif','width="14" height="14"').' style="margin-right: 2px;" class="absmiddle" alt="" title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swapPage',1).'" />'.
-								'<strong>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap',1).'</strong></a>';
+						$controls .= '<a href="' . $this->issueCommand('&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id .
+							'&cmd[pages][' . $onlineId . '][version][action]=swap', t3lib_div::linkThisScript(array('id' => $onlineId))) .
+							'" class="nobr">' . t3lib_iconWorks::getSpriteIcon('actions-version-swap-version', array(
+								'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swapPage', 1),
+								'style' => 'margin-left:5px;vertical-align:bottom;'
+							)) . '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap',1) . '</strong></a>';
 					}
 
 						// Write out HTML code:
@@ -1866,12 +1879,13 @@
 						-->
 						<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
 							<tr>
-								<td>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.selVer',1).'</td>
+								<td>' . $selectorLabel . '</td>
 								<td>
 									<select onchange="'.htmlspecialchars($onChange).'">
 										'.implode('',$opt).'
 									</select></td>
-								<td>'.$controls.'</td>
+								<td>' . $controls . '</td>
+								<td>' . $management . '</td>
 							</tr>
 						</table>
 					';
@@ -1899,8 +1913,9 @@
 						-->
 						<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
 							<tr>
-								<td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
-								<td><em>Inside branch, no further versioning possible</em></td>
+								<td>' . $selectorLabel . '</td>
+								<td>Workspace: "' . htmlspecialchars($wsTitle) . '"</td>
+								<td><em>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.inBranch', 1) . '</em></td>
 							</tr>
 						</table>
 					';
@@ -1927,9 +1942,10 @@
 									-->
 									<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
 										<tr>
-											<td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
+											<td>' . $selectorLabel . '</td>
+											<td>Workspace: "' . htmlspecialchars($wsTitle) . '"</td>
 											<td>
-												<input type="submit" value="New version of page" name="_" onclick="'.htmlspecialchars($onClick).'" /></td>
+												<input type="button" value="New version of page" name="_" onclick="'.htmlspecialchars($onClick).'" /></td>
 										</tr>
 									</table>
 								';
@@ -1942,8 +1958,9 @@
 								-->
 								<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
 									<tr>
-										<td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
-										<td><em>Versions found on page, no "Page" versioning possible</em></td>
+										<td>' . $selectorLabel . '</td>
+										<td>Workspace: "' . htmlspecialchars($wsTitle) . '"</td>
+										<td><em>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.versionsFound', 1) . '</em></td>
 									</tr>
 								</table>
 							';
@@ -1960,9 +1977,11 @@
 							-->
 							<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
 								<tr>
-									<td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
+									<td>' . $selectorLabel . '</td>
+									<td>Workspace: "' . htmlspecialchars($wsTitle) . '"</td>
 									<td>
-										<input type="submit" value="Publish page" name="_" onclick="'.htmlspecialchars($onClick).'" /></td>
+										<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.publish', 1) .
+											'" onclick="' . htmlspecialchars($onClick) . '" /></td>
 								</tr>
 							</table>
 						';