diff --git a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
index de8e3d85f08125e678a5cd12a80eac545ff9ae18..3b529b860974c509042ce73ba05db276dc5c30f5 100644
--- a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
@@ -195,6 +195,7 @@ class ReviewController extends ActionController
             $showButton = $buttonBar->makeLinkButton()
                 ->setHref('#')
                 ->setClasses('t3js-preview-link')
+                ->setShowLabelText(true)
                 ->setTitle($this->getLanguageService()->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:tooltip.generatePagePreview'))
                 ->setIcon($iconFactory->getIcon('module-workspaces-action-preview-link', Icon::SIZE_SMALL));
             $buttonBar->addButton($showButton);
diff --git a/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html b/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
index f19fb1cca74bb94615ff252a17bd59ec8c0b3c7d..d002d096298fa52df128e98aa36d8f80c70cef1d 100644
--- a/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
+++ b/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
@@ -57,14 +57,13 @@
 					<table class="table table-striped">
 						<thead>
 						<tr>
+							<th><button type="button" class="btn btn-default t3js-toggle-all"><core:icon identifier="actions-document-select" /></span></button></th>
 							<th><f:translate key="column.wsTitle" /></th>
 							<th><f:translate key="column.liveTitle" /></th>
 							<th><f:translate key="column.stage" /></th>
 							<th><f:translate key="column.integrity" /></th>
 							<th><core:icon identifier="flags-multiple" size="small" /></th>
-							<th class="text-right">
-								<button type="button" class="btn btn-default t3js-toggle-all"><core:icon identifier="actions-document-select" /></span></button>
-							</th>
+							<th></th>
 						</tr>
 						</thead>
 						<tbody>
diff --git a/typo3/sysext/workspaces/Resources/Public/JavaScript/Backend.js b/typo3/sysext/workspaces/Resources/Public/JavaScript/Backend.js
index 505d51050240cd01e38a48866bcc261b054fa588..5ed8c2bc1cb72bb537952dddbb9eee8c52523e8c 100644
--- a/typo3/sysext/workspaces/Resources/Public/JavaScript/Backend.js
+++ b/typo3/sysext/workspaces/Resources/Public/JavaScript/Backend.js
@@ -513,11 +513,7 @@ define([
           'data-toggle': 'tooltip',
           title: TYPO3.lang['tooltip.openPage']
         }).append(Backend.getPreRenderedIcon('actions-version-page-open')),
-        Backend.getAction(item.allowedAction_delete, 'remove', 'actions-version-document-remove').attr('title', TYPO3.lang['tooltip.discardVersion']),
-        $('<label />', {class: 'btn btn-default btn-checkbox'}).append(
-          $('<input />', {type: 'checkbox'}),
-          $('<span />', {class: 't3-icon fa'})
-        )
+        Backend.getAction(item.allowedAction_delete, 'remove', 'actions-version-document-remove').attr('title', TYPO3.lang['tooltip.discardVersion'])
       );
 
       if (item.integrity.messages !== '') {
@@ -533,10 +529,15 @@ define([
         Backend.latestPath = item.path_Workspace;
         Backend.elements.$tableBody.append(
           $('<tr />').append(
+            $('<th />'),
             $('<th />', {colspan: 6}).text(Backend.latestPath)
           )
         );
       }
+      var $checkbox = $('<label />', {class: 'btn btn-default btn-checkbox'}).append(
+        $('<input />', {type: 'checkbox'}),
+        $('<span />', {class: 't3-icon fa'})
+      );
 
       var rowConfiguration = {
         'data-uid': item.uid,
@@ -556,6 +557,7 @@ define([
 
       Backend.elements.$tableBody.append(
         $('<tr />', rowConfiguration).append(
+          $('<td />').html($checkbox),
           $('<td />', {
             class: 't3js-title-workspace',
             style: item.Workspaces_CollectionLevel > 0 ? 'padding-left: ' + Backend.indentationPadding * item.Workspaces_CollectionLevel + 'px' : ''
@@ -771,12 +773,14 @@ define([
         }
       });
 
-      Modal.show(
-        TYPO3.lang['window.recordInformation'].replace('{0}', $.trim($tr.find('.t3js-title-live').text())),
-        $content,
-        Severity.info,
-        modalButtons
-      );
+      Modal.advanced({
+        type: Modal.default,
+        title: TYPO3.lang['window.recordInformation'].replace('{0}', $.trim($tr.find('.t3js-title-live').text())),
+        content: $content,
+        severity: Severity.info,
+        buttons: modalButtons,
+        size: 'medium'
+      });
     });
   };