diff --git a/Build/Resources/Public/Less/TYPO3/_deprecated.less b/Build/Resources/Public/Less/TYPO3/_deprecated.less
index 79c647e8198ab2cd490836d61dd305761b02bd92..a6d966fea769d9e1a0debc5051e9911a579cc77e 100644
--- a/Build/Resources/Public/Less/TYPO3/_deprecated.less
+++ b/Build/Resources/Public/Less/TYPO3/_deprecated.less
@@ -1,16 +1,3 @@
-//
-// Deprecated
-//
-.t3-row-header {
-	background-color: #666;
-	padding: 6px;
-	a,
-	a:hover {
-		color: #fff;
-	}
-}
-
-
 //
 // Docheader
 //
diff --git a/Build/Resources/Public/Less/TYPO3/_element_csh.less b/Build/Resources/Public/Less/TYPO3/_element_csh.less
index 74d1e56b20a0efef5a7b35d2c98a61ce0a11a74c..ba54e7305715f3d454047885cf5dcfec0ae731ac 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_csh.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_csh.less
@@ -24,10 +24,7 @@ a.typo3-csh-link .typo3-csh-inline.show-right {
 	right: 10px;
 }
 
-table.typo3-csh-inline a.typo3-csh-link,
-table.typo3-csh-inline span.t3-row-header,
-span.typo3-csh-inline span.t3-row-header,
-a.typo3-csh-link span.typo3-csh-inline span.t3-row-header {
+table.typo3-csh-inline a.typo3-csh-link {
 	display: block;
 }
 
@@ -35,11 +32,6 @@ a.typo3-csh-link:hover .typo3-csh-inline {
 	display: block;
 }
 
-.typo3-csh-inline h2.t3-row-header {
-	margin: 0;
-	height: auto;
-}
-
 table.typo3-csh-inline {
 	a.typo3-csh-link {
 		height: 16px;
@@ -143,10 +135,7 @@ table.t3-help-inline {
 	}
 }
 
-table.t3-help-inline a.t3-help-link,
-table.t3-help-inline span.t3-row-header,
-span.t3-help-inline span.t3-row-header,
-a.t3-help-link span.t3-help-inline span.t3-row-header {
+table.t3-help-inline a.t3-help-link {
 	display: block;
 }
 
@@ -170,11 +159,6 @@ a.t3-help-link:hover .t3-help-inline {
 	display: block;
 }
 
-.t3-help-inline h2.t3-row-header {
-	margin: 0;
-	height: auto;
-}
-
 table.t3-help-inline span.paragraph,
 a.t3-help-link span.t3-help-inline span.paragraph {
 	display: block;
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index 044382dc1fba38ce4c751e3967674455f38cd35b..38edb6660cd654bed2c55d8b07274cca20fbd5e0 100755
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -2477,7 +2477,7 @@ class BackendUtility
         $arrow = '';
         // Put header before the rest of the text
         if ($helpTextArray['title'] !== null) {
-            $output .= '<h2 class="t3-row-header">' . $helpTextArray['title'] . '</h2>';
+            $output .= '<h2>' . $helpTextArray['title'] . '</h2>';
         }
         // Add see also arrow if we have more info
         if ($helpTextArray['moreInfo']) {
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index c362082286c938cfe9707687ecf0b35dd5909665..28f6a33dbe78b6e164a4a2854f38bc247f6ed34f 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -971,7 +971,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
         $theData = $this->headerFields($this->fieldArray, $table, $theData);
         // Title row
         $localizedTableTitle = $this->getLanguageService()->sL($GLOBALS['TCA'][$table]['ctrl']['title'], true);
-        $out .= '<tr class="t3-row-header">' . '<th class="col-icon"></th>'
+        $out .= '<tr><th class="col-icon"></th>'
             . '<th colspan="' . (count($theData) - 2) . '"><span class="c-table">'
             . $localizedTableTitle . '</span> (' . $dbCount . ')</td>' . '<td class="col-icon"></td>'
             . '</tr>';
@@ -1034,7 +1034,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 			<!--
 				Standard list of table "' . $table . '"
 			-->
-			<div class="table-fit"><table class="table table-striped">
+			<div class="table-fit"><table class="table table-hover table-striped">
 				' . $out . '
 			</table></div>';
         return $out;
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
index 00e0524117f5a87bd5517d92ee7efe7fa1e21f9c..a3349094d3e3565b60b8bdabaf47ed973594e76f 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
@@ -68,7 +68,7 @@
 				<h2><f:translate key="distribution.dependency.headline" /></h2>
 				<table class="table table-striped table-hover">
 					<thead>
-						<tr class="t3-row-header">
+						<tr>
 							<td><f:translate key="distribution.dependency.identifier" /></td>
 							<td><f:translate key="distribution.dependency.type" /></td>
 							<td><f:translate key="distribution.dependency.version" /></td>
diff --git a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
index 48568a5c69f254eaf0ba79aeaddb74820bf986ce..d1113adbc67a1696e23ccd4cdf7eaaa5f3675c8b 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
@@ -250,7 +250,7 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
         $folderIcon = $this->iconFactory->getIconForResource($folder, Icon::SIZE_SMALL);
 
         $lines[] = '
-			<tr class="t3-row-header">
+			<tr>
 				<th class="col-title" nowrap="nowrap">' . $folderIcon . ' ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($folder->getIdentifier(), $titleLen)) . '</th>
 				<th class="col-control" nowrap="nowrap"></th>
 				<th class="col-clipboard" nowrap="nowrap">
diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
index 0aecd4b9dca0654572021c013f18e074a3b6fc6c..3875a35ba854d2464a24c24787a9b567c196dc54 100644
--- a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
+++ b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
@@ -314,7 +314,7 @@ class AddImageHandler implements LinkParameterProviderInterface, LinkHandlerInte
         $folderIcon = $this->iconFactory->getIconForResource($folder, Icon::SIZE_SMALL);
 
         $lines[] = '
-			<tr class="t3-row-header">
+			<tr>
 				<th class="col-title" nowrap="nowrap">' . $folderIcon . ' ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($folder->getIdentifier(), $titleLen)) . '</th>
 				<th class="col-control" nowrap="nowrap"></th>
 				<th class="col-clipboard" nowrap="nowrap">
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
index cd4445aa84a85e845b29c3d0fb18d58ca87970fa..87b11d4389bfa1ed74f1c967974e359c90a26337 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
@@ -8532,14 +8532,6 @@ button.close {
             transform: rotate(360deg);
   }
 }
-.t3-row-header {
-  background-color: #666;
-  padding: 6px;
-}
-.t3-row-header a,
-.t3-row-header a:hover {
-  color: #fff;
-}
 div#typo3-docbody {
   bottom: 0;
   overflow: auto;
@@ -8672,19 +8664,12 @@ a.typo3-csh-link .typo3-csh-inline {
 a.typo3-csh-link .typo3-csh-inline.show-right {
   right: 10px;
 }
-table.typo3-csh-inline a.typo3-csh-link,
-table.typo3-csh-inline span.t3-row-header,
-span.typo3-csh-inline span.t3-row-header,
-a.typo3-csh-link span.typo3-csh-inline span.t3-row-header {
+table.typo3-csh-inline a.typo3-csh-link {
   display: block;
 }
 a.typo3-csh-link:hover .typo3-csh-inline {
   display: block;
 }
-.typo3-csh-inline h2.t3-row-header {
-  margin: 0;
-  height: auto;
-}
 table.typo3-csh-inline a.typo3-csh-link {
   height: 16px;
 }
@@ -8764,10 +8749,7 @@ table.t3-help-inline tr td h4 {
   margin-top: 0;
   margin-bottom: 0;
 }
-table.t3-help-inline a.t3-help-link,
-table.t3-help-inline span.t3-row-header,
-span.t3-help-inline span.t3-row-header,
-a.t3-help-link span.t3-help-inline span.t3-row-header {
+table.t3-help-inline a.t3-help-link {
   display: block;
 }
 a.t3-help-link .t3-help-inline {
@@ -8785,10 +8767,6 @@ a.t3-help-link .t3-help-inline.show-right {
 a.t3-help-link:hover .t3-help-inline {
   display: block;
 }
-.t3-help-inline h2.t3-row-header {
-  margin: 0;
-  height: auto;
-}
 table.t3-help-inline span.paragraph,
 a.t3-help-link span.t3-help-inline span.paragraph {
   display: block;