diff --git a/typo3/sysext/backend/Classes/Form/FormEngine.php b/typo3/sysext/backend/Classes/Form/FormEngine.php
index d081f018196cc60b64cae0580c4fc3981d86cee0..21febee6b208872e26f4021fc3c154f4db588732 100644
--- a/typo3/sysext/backend/Classes/Form/FormEngine.php
+++ b/typo3/sysext/backend/Classes/Form/FormEngine.php
@@ -2221,7 +2221,7 @@ class FormEngine {
 					$fileInformation = pathinfo($imgPath);
 					$fileIcon = IconUtility::getSpriteIconForFile($imgPath, array('title' => htmlspecialchars($fileInformation['basename'] . ($absFilePath && @is_file($absFilePath) ? ' (' . GeneralUtility::formatSize(filesize($absFilePath)) . 'bytes)' : ' - FILE NOT FOUND!'))));
 					$imgs[] =
-						'<span class="nobr">' .
+						'<span class="text-nowrap">' .
 							BackendUtility::thumbCode(
 								$rowCopy,
 								$table,
diff --git a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
index c993ea53db63a334bd835025336191be06a4e1b7..3edc4a8030d0000e0711e33b3cd0b462403f3643 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
@@ -163,7 +163,7 @@ class PagePositionMap {
 				if ($prev_dat['row']['uid'] == $id) {
 					// 1) It must be allowed to create a new page and 2) If there are subpages there is no need to render a subpage icon here - it'll be done over the subpages...
 					if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($id) && !($prev_dat['invertedDepth'] > $t3lib_pageTree->tree[$cc]['invertedDepth'])) {
-						$code .= '<span class="nobr">' . $this->insertQuadLines($dat['blankLineCode']) . '<img src="clear.gif" width="18" height="8" align="top" alt="" />' . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($id, $id, 1)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
+						$code .= '<span class="text-nowrap">' . $this->insertQuadLines($dat['blankLineCode']) . '<img src="clear.gif" width="18" height="8" align="top" alt="" />' . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($id, $id, 1)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
 					}
 				}
 				// If going down
@@ -174,7 +174,7 @@ class PagePositionMap {
 					// First of all the previous level should have an icon:
 					if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($prev_dat['row']['pid'])) {
 						$prevPid = -$prev_dat['row']['uid'];
-						$code .= '<span class="nobr">' . $this->insertQuadLines($dat['blankLineCode']) . '<img src="clear.gif" width="18" height="1" align="top" alt="" />' . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $prev_dat['row']['pid'], 2)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgAfter' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgAfter' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgAfter' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
+						$code .= '<span class="text-nowrap">' . $this->insertQuadLines($dat['blankLineCode']) . '<img src="clear.gif" width="18" height="1" align="top" alt="" />' . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $prev_dat['row']['pid'], 2)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgAfter' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgAfter' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgAfter' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
 					}
 					// Then set the current prevPid
 					$prevPid = -$prev_dat['row']['pid'];
@@ -187,24 +187,24 @@ class PagePositionMap {
 				$prevPid = $dat['row']['pid'];
 			}
 			if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($dat['row']['pid'])) {
-				$code .= '<span class="nobr">' . $this->insertQuadLines($dat['blankLineCode']) . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 3)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImg' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImg' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImg' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
+				$code .= '<span class="text-nowrap">' . $this->insertQuadLines($dat['blankLineCode']) . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 3)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImg' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImg' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImg' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
 			}
 			// The line with the icon and title:
-			$t_code = '<span class="nobr">' . $dat['HTML'] . $this->linkPageTitle($this->boldTitle(htmlspecialchars(GeneralUtility::fixed_lgd_cs($dat['row']['title'], $GLOBALS['BE_USER']->uc['titleLen'])), $dat, $id), $dat['row']) . '</span><br />';
+			$t_code = '<span class="text-nowrap">' . $dat['HTML'] . $this->linkPageTitle($this->boldTitle(htmlspecialchars(GeneralUtility::fixed_lgd_cs($dat['row']['title'], $GLOBALS['BE_USER']->uc['titleLen'])), $dat, $id), $dat['row']) . '</span><br />';
 			$code .= $t_code;
 		}
 		// If the current page was the last in the tree:
 		$prev_dat = end($t3lib_pageTree->tree);
 		if ($prev_dat['row']['uid'] == $id) {
 			if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($id)) {
-				$code .= '<span class="nobr">' . $this->insertQuadLines($saveLatestUid[$latestInvDepth]['blankLineCode'], 1) . '<img src="clear.gif" width="18" height="8" align="top" alt="" />' . '<a href="#" onclick="' . $this->onClickEvent($id, $id, 4) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
+				$code .= '<span class="text-nowrap">' . $this->insertQuadLines($saveLatestUid[$latestInvDepth]['blankLineCode'], 1) . '<img src="clear.gif" width="18" height="8" align="top" alt="" />' . '<a href="#" onclick="' . $this->onClickEvent($id, $id, 4) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgSubpage' . $cc . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgSubpage' . $cc . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
 			}
 		}
 		for ($a = $latestInvDepth; $a <= $this->depth; $a++) {
 			$dat = $saveLatestUid[$a];
 			$prevPid = -$dat['row']['uid'];
 			if (!$this->dontPrintPageInsertIcons && $this->checkNewPageInPid($dat['row']['pid'])) {
-				$code .= '<span class="nobr">' . $this->insertQuadLines($dat['blankLineCode'], 1) . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 5)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgEnd' . $a . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgEnd' . $a . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgEnd' . $a . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
+				$code .= '<span class="text-nowrap">' . $this->insertQuadLines($dat['blankLineCode'], 1) . '<a href="#" onclick="' . htmlspecialchars($this->onClickEvent($prevPid, $dat['row']['pid'], 5)) . '" onmouseover="' . htmlspecialchars(('changeImg(\'mImgEnd' . $a . '\',0);')) . '" onmouseout="' . htmlspecialchars(('changeImg(\'mImgEnd' . $a . '\',1);')) . '">' . '<img' . IconUtility::skinImg($this->backPath, 'gfx/newrecord_marker_d.gif', 'width="281" height="8"') . ' name="mImgEnd' . $a . '" border="0" align="top" title="' . $this->insertlabel() . '" alt="" />' . '</a></span><br />';
 			}
 		}
 		return $code;
diff --git a/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php b/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php
index 8e0b1a3a0dd2e7c1feb0186c334f003a4506ad04..1647efa332779afee64d9d046e3b056760bd59be 100644
--- a/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php
+++ b/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php
@@ -78,7 +78,7 @@ class WebFunctionWizardsBaseController extends \TYPO3\CMS\Backend\Module\Abstrac
 		$content = '';
 		if (!empty($menu)) {
 			$menu = $GLOBALS['LANG']->getLL('wiz_lWizards', TRUE) . ': ' . $menu;
-			$content = $this->pObj->doc->section('', '<span class="nobr">' . $menu . '</span>');
+			$content = $this->pObj->doc->section('', '<span class="text-nowrap">' . $menu . '</span>');
 			$content .= $this->pObj->doc->spacer(20);
 		}
 
diff --git a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
index 6eb7324565c52d164ef6b4be80d8f39244eb3390..03ef3299b3c984dd27439a54fd6ae3e484eea3d0 100644
--- a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
@@ -135,7 +135,7 @@ class DatabaseIntegrityCheck {
 			$newID = $row['uid'];
 			// Build HTML output:
 			if ($this->genTree_makeHTML) {
-				$this->genTree_HTML .= LF . '<div><span class="nobr">';
+				$this->genTree_HTML .= LF . '<div><span class="text-nowrap">';
 				$PM = 'join';
 				$LN = $a == $c ? 'blank' : 'line';
 				$BTM = $a == $c ? 'bottom' : '';
@@ -214,7 +214,7 @@ class DatabaseIntegrityCheck {
 			$newID = $row['uid'];
 			// Build HTML output:
 			if ($this->genTree_makeHTML) {
-				$this->genTree_HTML .= LF . '<div><span class="nobr">';
+				$this->genTree_HTML .= LF . '<div><span class="text-nowrap">';
 				$PM = 'join';
 				$LN = $a == $c ? 'blank' : 'line';
 				$BTM = $a == $c ? 'bottom' : '';
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index 91451c78632bcc8e8ab62a25d599fef8d5911e50..71f62aaf773b370983c64f617bee5c7ca02e2a92 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -4138,7 +4138,7 @@ class ImportExport {
 			} else {
 				$output = 'Match';
 			}
-			return '<strong class="nobr">[' . htmlspecialchars(($table . ':' . $importRecord['uid'] . ' => ' . $databaseRecord['uid'])) . ']:</strong> ' . $output;
+			return '<strong class="text-nowrap">[' . htmlspecialchars(($table . ':' . $importRecord['uid'] . ' => ' . $databaseRecord['uid'])) . ']:</strong> ' . $output;
 		}
 		return 'ERROR: One of the inputs were not an array!';
 	}
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html
index f48db36fce4dbd5a53432ff41e302f7662a735cc..435009b5877fccd3f791e044a071260fdc73cfc9 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Relations.html
@@ -4,7 +4,7 @@
 <f:if condition="{files.noReferences}">
 	<f:then>
 		<f:for each="{files.noReferences}" as="item">
-			<nobr>{item.0}/<strong>{item.1}</strong></nobr>
+			<span class="text-nowrap">{item.0}/<strong>{item.1}</strong></span>
 			<br>
 		</f:for>
 	</f:then>
@@ -17,8 +17,7 @@
 <f:if condition="{files.moreReferences}">
 	<f:then>
 		<f:for each="{files.moreReferences}" as="item">
-			<nobr>{item.0}/<strong>{item.1}</strong>: {item.2} {f:translate(key:'references')}
-			</nobr>
+			<span class="text-nowrap">{item.0}/<strong>{item.1}</strong>: {item.2} {f:translate(key:'references')}</span>
 			<br>{item.3}<br><br>
 		</f:for>
 	</f:then>
@@ -31,8 +30,7 @@
 <f:if condition="{files.noFile}">
 	<f:then>
 		<f:for each="{files.noFile}" as="item">
-			<nobr>{item.0}/<strong>{item.1}</strong> {f:translate(key:'isMissing')}
-			</nobr>
+			<span class="text-nowrap">{item.0}/<strong>{item.1}</strong> {f:translate(key:'isMissing')}</span>
 			<br>{f:translate(key:'referencedFrom')} {item.2}<br><br>
 		</f:for>
 	</f:then>
diff --git a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_deprecated.less b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_deprecated.less
index c220b74732be03716935169f37f1e8b80a0f2085..ddcc26622fa2ba08a2c180e7b7e3681cf1438de8 100644
--- a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_deprecated.less
+++ b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_deprecated.less
@@ -33,10 +33,6 @@
 	padding: 5px;
 }
 
-.nobr {
-	.text-nowrap;
-}
-
 //
 // Background color classes
 //
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
index 8e7450682c6c851c76258f6bfde304b1d9f5f2cc..34ba9897a41e2a57d30693cba1dc93dd7704be5d 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
@@ -7288,9 +7288,6 @@ button.close {
   vertical-align: middle;
   padding: 5px;
 }
-.nobr {
-  white-space: nowrap;
-}
 .bgColor-20 {
   background-color: #e3dfdb;
 }
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
index 822c2b796319a1281bae0e10b90fb608301bd25c..2e0b9efff160a64258f63dcaf03fd851fe3a2800 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
@@ -157,7 +157,7 @@ class TypoScriptTemplateConstantEditorModuleFunctionController extends AbstractF
 			$theOutput .= $this->pObj->doc->spacer(10);
 			if (count($this->pObj->MOD_MENU['constant_editor_cat'])) {
 				$menu = BackendUtility::getFuncMenu($this->pObj->id, 'SET[constant_editor_cat]', $this->pObj->MOD_SETTINGS['constant_editor_cat'], $this->pObj->MOD_MENU['constant_editor_cat']);
-				$theOutput .= $this->pObj->doc->section($lang->getLL('category', TRUE), '<NOBR>' . $menu . '</NOBR>', FALSE);
+				$theOutput .= $this->pObj->doc->section($lang->getLL('category', TRUE), '<span class="text-nowrap">' . $menu . '</span>', FALSE);
 			} else {
 				$theOutput .= $this->pObj->doc->section($lang->getLL('noConstants', TRUE), $lang->getLL('noConstantsDescription', TRUE), FALSE, FALSE, 1);
 			}
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
index 28886fb449604f7c86e693e1035a66527d72f275..0a53498398ffe4b68e659438e3db8a3645e378ae 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
@@ -334,8 +334,8 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu
 				$out .= '<input class="btn btn-default" type="submit" name="update_value" value="' . $lang->getLL('updateButton') . '" />';
 				$theOutput .= $this->pObj->doc->section($lang->getLL('editProperty'), $out, 0, 0);
 				// Property
-				$out = '<nobr>' . htmlspecialchars($this->pObj->sObj) . '.';
-				$out .= '<input type="text" name="data[' . htmlspecialchars($this->pObj->sObj) . '][name]"' . $documentTemplate->formWidth(20) . ' /> = </nobr><br />';
+				$out = '<span class="text-nowrap">' . htmlspecialchars($this->pObj->sObj) . '.';
+				$out .= '<input type="text" name="data[' . htmlspecialchars($this->pObj->sObj) . '][name]"' . $documentTemplate->formWidth(20) . ' /> = </span><br />';
 				$out .= '<input type="text" name="data[' . htmlspecialchars($this->pObj->sObj) . '][propertyValue]"' . $documentTemplate->formWidth(40) . ' />';
 				$out .= '<input class="btn btn-default" type="submit" name="add_property" value="' . $lang->getLL('addButton') . '" />';
 				$theOutput .= $this->pObj->doc->spacer(20);
@@ -466,7 +466,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu
 				$menu .= BackendUtility::getFuncMenu($this->pObj->id, 'SET[ts_browser_const]', $this->pObj->MOD_SETTINGS['ts_browser_const'], $this->pObj->MOD_MENU['ts_browser_const']);
 			}
 			$menu .= '</div>';
-			$theOutput .= $this->pObj->doc->section($lang->getLL('displayOptions'), '<nobr>' . $menu . '</nobr>', 0, 1);
+			$theOutput .= $this->pObj->doc->section($lang->getLL('displayOptions'), '<span class="text-nowrap">' . $menu . '</span>', 0, 1);
 			// Conditions:
 			if (is_array($templateService->sections) && !empty($templateService->sections)) {
 				$theOutput .= $this->pObj->doc->section($lang->getLL('conditions'), '', 0, 1);
diff --git a/typo3/sysext/version/Classes/View/VersionView.php b/typo3/sysext/version/Classes/View/VersionView.php
index a812f15ba535667e499eab49271c6d59d30e6f42..d5be92a619e24b76b6afe9020cd0cb84a53ff941 100644
--- a/typo3/sysext/version/Classes/View/VersionView.php
+++ b/typo3/sysext/version/Classes/View/VersionView.php
@@ -62,7 +62,7 @@ class VersionView {
 				if ($id == $onlineId) {
 					$controls .= '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_left.gif', 'width="5" height="9"') . ' class="absmiddle" alt="" /> <strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.online', TRUE) . '</strong>';
 				} elseif (!$noAction) {
-					$controls .= '<a href="' . $GLOBALS['TBE_TEMPLATE']->issueCommand(('&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id . '&cmd[pages][' . $onlineId . '][version][action]=swap'), \TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $onlineId))) . '" class="nobr">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-version-swap-version', array(
+					$controls .= '<a href="' . $GLOBALS['TBE_TEMPLATE']->issueCommand(('&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id . '&cmd[pages][' . $onlineId . '][version][action]=swap'), \TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $onlineId))) . '" class="text-nowrap">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-version-swap-version', array(
 						'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.swapPage', TRUE),
 						'style' => 'margin-left:5px;vertical-align:bottom;'
 					)) . '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.swap', TRUE) . '</strong></a>';
diff --git a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
index 6a9cdc256987a14c57e3be269ec6e4ec4918fa14..db4ca25d42051584dd2365d5835522e779dfd017 100644
--- a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
+++ b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
@@ -119,7 +119,7 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
 				foreach ($menuItems as $record) {
 					BackendUtility::workspaceOL('pages', $record);
 					if (is_array($record)) {
-						$lines[] = '<nobr>' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $record, array('title' => BackendUtility::titleAttribForPages($record, '', FALSE))) . htmlspecialchars(GeneralUtility::fixed_lgd_cs($record['title'], $this->getBackendUser()->uc['titleLen'])) . '</nobr>';
+						$lines[] = '<span class="text-nowrap">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $record, array('title' => BackendUtility::titleAttribForPages($record, '', FALSE))) . htmlspecialchars(GeneralUtility::fixed_lgd_cs($record['title'], $this->getBackendUser()->uc['titleLen'])) . '</span>';
 					}
 				}
 				$theCode .= '<h4>' . $this->getLanguageService()->getLL('wiz_newPages_currentMenu') . '</h4>' . implode('<br />', $lines);