From 331edab98da163e74a3a3f07415b826ede6b4709 Mon Sep 17 00:00:00 2001
From: Luzifr <szekely@woltlab.com>
Date: Tue, 6 Sep 2011 19:07:59 +0200
Subject: [PATCH] Deleted obsolete worker-templates, updated table-CSS to work
 without "emptyHead"-class, updated templates (fixed invalid HTML5
 table-markup), further CSS code-formatting.

---
 wcfsetup/install/files/acp/style/testing.css  | 132 +++++++++---------
 .../files/acp/templates/acpSessionLog.tpl     |  14 +-
 .../files/acp/templates/acpSessionLogList.tpl |  14 +-
 .../install/files/acp/templates/cacheList.tpl |   8 +-
 .../files/acp/templates/cronjobList.tpl       |  16 +--
 .../files/acp/templates/cronjobLogList.tpl    |   8 +-
 .../templates/packageInstallationConfirm.tpl  |   4 +-
 .../files/acp/templates/packageList.tpl       |  10 +-
 .../acp/templates/packageStartInstall.tpl     |   2 +-
 .../packageUninstallationDependencies.tpl     |  10 +-
 .../files/acp/templates/packageView.tpl       |  12 +-
 .../files/acp/templates/updateServerList.tpl  |  12 +-
 .../files/acp/templates/userGroupList.tpl     |   6 +-
 .../install/files/acp/templates/userList.tpl  |   8 +-
 .../install/files/acp/templates/worker.tpl    |  70 ----------
 .../files/acp/templates/workerException.tpl   |  14 --
 .../files/acp/templates/workerFinish.tpl      |  22 ---
 .../files/acp/templates/workerNext.tpl        |  21 ---
 18 files changed, 129 insertions(+), 254 deletions(-)
 delete mode 100644 wcfsetup/install/files/acp/templates/worker.tpl
 delete mode 100644 wcfsetup/install/files/acp/templates/workerException.tpl
 delete mode 100644 wcfsetup/install/files/acp/templates/workerFinish.tpl
 delete mode 100644 wcfsetup/install/files/acp/templates/workerNext.tpl

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 596628e41d..90cb5306d2 100644
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -39,8 +39,8 @@ a {
 }
 
 a:hover {
-	color: #036;
 	text-decoration: underline;
+	color: #036;
 }
 
 a.externalURL {
@@ -104,8 +104,8 @@ header.pageHeader nav.topMenu > div {
 
 header.pageHeader nav.topMenu ul li,
 header.pageHeader nav.topMenu ul li a {
-	color: #69c;
 	text-shadow: 0 -1px 0 #000;
+	color: #69c;
 }
 
 header.pageHeader nav.topMenu ul li a:hover {
@@ -121,16 +121,16 @@ header.pageHeader div#logo {
 }
 
 header.pageHeader div#logo h1 {
-	color: #d8e7f5;
 	font-size: 150%;
 	text-shadow: 0 -1px 0 #000;
+	color: #d8e7f5;
 	position: relative;
 	top: 70px;
 }
 
 header.pageHeader div#logo a:hover {
-	color: #d8e7f5;
 	text-decoration: none !important;
+	color: #d8e7f5;
 }
 
 header.pageHeader div#logo img {
@@ -170,10 +170,10 @@ nav.mainMenu ul {
 }
 
 nav.mainMenu ul li {
-	color: #69c;
 	font-size: 123%;
 	font-weight: normal;
 	text-shadow: 0 -1px 0 #000;
+	color: #69c;
 	cursor: pointer;
 	border-top-left-radius: 5px;
 	border-top-right-radius: 5px;
@@ -214,14 +214,14 @@ nav.mainMenu ul li:hover {
 }
 
 nav.mainMenu ul li.activeMenuItem {
-	color: #369;
 	text-shadow: 0 1px 0 #fff;
 	font-size: 150%;
 	font-weight: bold;
+	color: #369;
 	
 	background-color: #e7f2fd;
 	background-image: -webkit-linear-gradient(#fff, #e7f2fd);
-	background-image: -moz-linear-gradient(0% 0% 270deg, #fff, #e7f2fd);
+	background-image: -moz-linear-gradient(#fff, #e7f2fd);
 	background-image: -ms-linear-gradient(#fff, #e7f2fd);
 	background-image: -o-linear-gradient(#fff, #e7f2fd);
 	background-image: linear-gradient(#fff, #e7f2fd);
@@ -340,21 +340,21 @@ nav.sidebarMenu {
 }
 
 nav.sidebarMenu > div {
-	color: #69c;
 	text-shadow: 0 1px 0 #fff;
+	color: #69c;
 	position: relative;
 }
 
 nav.sidebarMenu > div a:hover {
-	color: #369;
 	text-decoration: none !important;
+	color: #369;
 }
 
 nav.sidebarMenu > div h1 {
-	color: #369;
 	cursor: pointer;
 	font-size: 130%;
 	font-weight: bold;
+	color: #369;
 	background-image: url("../../icon/closed.svg");
 	background-position: 15px center;
 	background-size: 16px;
@@ -373,8 +373,8 @@ nav.sidebarMenu > div ul li {
 }
 
 nav.sidebarMenu > div ul li a {
-	color: #69c;
 	text-shadow: 0 1px 0 #fff;
+	color: #69c;
 	padding: 5px 25px 7px 35px;
 	display: block;
 }
@@ -392,8 +392,8 @@ nav.sidebarMenu > div ul li.activeMenuItem {
 }
 
 nav.sidebarMenu > div ul li.activeMenuItem a {
-	color: #369;
 	font-weight: bold;
+	color: #369;
 }
 
 
@@ -440,8 +440,8 @@ footer.pageFooter .copyright a {
 }
 
 footer.pageFooter .copyright a:hover {
-	color: #69c;
 	text-decoration: none;
+	color: #69c;
 }
 
 /* Footer Navigation */
@@ -485,18 +485,18 @@ footer.pageFooter nav.footerNavigation ul li {
 }
 
 .mainHeading > hgroup h1 {
-	color: #666;
 	font-size: 175%;
 	font-weight: bold;
 	text-shadow: 0 1px 0 #fff;
+	color: #666;
 	border-bottom: 1px solid #999;
 	padding-bottom: 10px;
 }
 
 .mainHeading > hgroup h2 {
-	color: #999;
 	font-size: 100%;
 	font-weight: normal;
+	color: #999;
 	padding-top: 5px;
 }
 
@@ -507,9 +507,9 @@ footer.pageFooter nav.footerNavigation ul li {
 /* Sub Heading */
 
 .subHeading h1 {
-	color: #999;
 	font-size: 150%;
 	text-shadow: 0 1px 0 #fff;
+	color: #999;
 	border-bottom: 1px solid #ccc;
 	margin: 10px 0;
 	padding: 10px 0;
@@ -548,8 +548,8 @@ fieldset legend ~ p {
 }
 
 fieldset p.description {
-	color: #999;
 	font-size: 90%;
+	color: #999;
 }
 
 fieldset > ul {
@@ -573,8 +573,8 @@ dl {
 }
 
 dl > dt {
-	color: #69c;
 	text-align: right;
+	color: #69c;
 	margin-top: 5px; /* not so nice */
 	float: left;
 	width: 230px;
@@ -595,8 +595,8 @@ dl > dd {
 }
 
 dl > dd > small {
-	color: #999;
 	font-size: 85%;
+	color: #999;
 	margin: 3px 0 7px;
 	display: block;
 }
@@ -795,10 +795,10 @@ textarea {
 input[type='reset'],
 input[type='submit'],
 .largeButtons ul li a {
-	color: #999;
 	font-size: 100%;
 	font-weight: bold;
 	text-shadow: 0 1px 0 #fff;
+	color: #999;
 	border: 1px solid #999;
 	border-radius: 30px;
 	
@@ -817,8 +817,8 @@ input[type='submit'],
 input[type='reset']:hover,
 input[type='submit']:hover,
 .largeButtons ul li a:hover {
-	color: #666;
 	text-decoration: none;
+	color: #666;
 	border: 1px solid #666;
 	
 	-webkit-transition: all .1s linear;
@@ -835,8 +835,8 @@ input[type='submit']:focus,
 input[type='reset']:active,
 input[type='submit']:active,
 .largeButtons ul li a:active{
-	color: #333;
 	text-decoration: none;
+	color: #333;
 	
 	background-color: #fefefe;
 	background-image: -webkit-linear-gradient(#eee, #fefefe);
@@ -932,8 +932,8 @@ input[type='submit']:focus,
 .largeButtons ul li.default a:focus,
 input[type='submit']:active,
 .largeButtons ul li.default a:active{
-	color: #036;
 	text-decoration: none;
+	color: #036;
 	
 	background-color: #d8e7f5;
 	background-image: -webkit-linear-gradient(#d8e7f5, #fff);
@@ -980,14 +980,14 @@ input[type='submit']:active,
 }
 
 .boxTitle > hgroup {
-	color: #fff;
 	text-shadow: 0 -1px 0 #000;
+	color: #fff;
 	padding: 7px;
 }
 
 .boxTitle > hgroup a, .boxTitle > a {
-	color: #fff;
 	text-decoration: none;
+	color: #fff;
 }
 
 .boxTitle > hgroup h1 {
@@ -1033,9 +1033,9 @@ input[type='submit']:active,
 }
 
 .tabMenu li a {
-	color: #999;
 	font-size: 110%;
 	text-decoration: none;
+	color: #999;
 	cursor: pointer;
 	padding: 10px 15px 7px;
 	border-width: 1px 1px 0 1px;
@@ -1054,7 +1054,7 @@ input[type='submit']:active,
 	color: #666;
 	border-width: 1px;
 	border-style: solid;
-	border-color: #fa2 #fa2 #ccc #fa2;
+	border-color: #fa2 #fa2 #ccc;
 	background-color: #fff9f4;
 }
 
@@ -1063,15 +1063,15 @@ input[type='submit']:active,
 .tabMenu li:not(.ui-state-active) a:focus {
 	border-width: 1px;
 	border-style: solid;
-	border-color: #fa2 #fa2 #ccc #fa2;
+	border-color: #fa2 #fa2 #ccc;
 	background-color: #fff;
 }
 */
 
 .tabMenu li.ui-state-active a {
-	color: #333 !important;
 	font-size: 130%;
 	font-weight: bold;
+	color: #333 !important;
 	border-width: 1px;
 	border-style: solid;
 	border-color: #ccc;
@@ -1146,10 +1146,10 @@ input[type='submit']:active,
 }
 
 .menu ul li a {
-	color: #999;
 	font-size: 85%;
 	text-shadow: 0 1px 0 #fff;
 	text-decoration: none;
+	color: #999;
 	border: 1px solid rgba(0, 0, 0, .2);
 	border-radius: 13px;
 	background-color: rgba(255, 255, 255, .5);
@@ -1177,9 +1177,9 @@ input[type='submit']:active,
 }
 
 .menu ul li.ui-state-active a {
-	color: #fff;
 	font-weight: bold;
 	text-shadow: 0 1px 0 #000;
+	color: #fff;
 	cursor: default;
 	border: 1px solid rgba(0, 0, 0, .2);
 	background-color: rgba(0, 0, 0, .5);
@@ -1199,10 +1199,10 @@ input[type='submit']:active,
 }
 
 .boxTitle > .menu ul li a {
-	color: #eee !important;
 	font-size: 85%;
 	text-decoration: none;
 	text-shadow: 0 -1px 0 #000;
+	color: #eee !important;
 	border: 1px solid rgba(0, 0, 0, .3);
 	border-radius: 13px;
 	background-color: rgba(0, 0, 0, .1);
@@ -1262,11 +1262,10 @@ thead th:last-child {
 	border-top-right-radius: 5px;	
 }
 
-thead th p a,
-thead th p.emptyHead {
-	color: #69c !important;
+thead th {
 	text-shadow: 0 -1px 0 #000;
-	text-decoration: none !important;
+	color: #69c;
+	border-right: 1px solid rgba(0, 0, 0, .2);
 	
 	background-color: rgba(0, 0, 0, .3);
 	background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .4));
@@ -1276,49 +1275,52 @@ thead th p.emptyHead {
 	background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .4));
 	
 	padding: 7px;
-	display: block;
 }
 
-thead th p a {
-	border-right: 1px solid rgba(0, 0, 0, .3);
+thead th a {
+	text-shadow: 0 -1px 0 #000;
+	text-decoration: none !important;
+	color: #69c;
+	margin: -7px;
+	padding: 7px;
+	display: block;
 }
 
-thead th:last-child p a {
+thead th:last-child a {
 	border-right-width: 0;
 }
 
-thead th:hover p a {
-	color: #fff !important;
-	background-color: rgba(0, 0, 0, .4);
+thead th:hover a {
+	color: #fff;
+	background-color: rgba(0, 0, 0, .2);
 }
 
-thead th.active p a {
-	color: #fff !important;
+thead th.active a {
 	font-weight: bold;
-	background-color: rgba(0, 0, 0, .4);
+	color: #fff;
+	background-color: rgba(0, 0, 0, .1);
 	
-	-webkit-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
-	-moz-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
-	-ms-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
-	-o-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
-	box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
+	-webkit-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .4);
+	-moz-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .4);
+	-ms-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .4);
+	-o-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .4);
+	box-shadow: inset 0 5px 15px rgba(0, 0, 0, .4);
 }
 
-thead th.active:hover p a {
-	background-color: rgba(0, 0, 0, .5);
+thead th.active:hover a {
+	background-color: rgba(0, 0, 0, .3);
 }
 
-thead th.columnMark p.emptyHead {
+thead th.columnMark {
 	background-color: transparent;
 	background-image: none;
 	padding: 0 !important;
-	display: block;
 	width: 30px;
 }
 
-thead th p a img {
+thead th a img {
 	margin-top: -5px !important;
-	margin-bottom: -3px !important;
+	margin-bottom: -5px !important;
 }
 
 /* Table Body */
@@ -1449,9 +1451,9 @@ tbody tr .columnIcon img {
 }
 
 .pageNavigation ul li a {
-	color: #999;
 	text-shadow: 0 1px 0 #fff;
 	text-decoration: none;
+	color: #999;
 	display: inline-block;
 }
 
@@ -1467,8 +1469,8 @@ tbody tr .columnIcon img {
 
 .pageNavigation ul li.active,
 .pageNavigation ul li.active:hover {
-	color: #fff;
 	text-shadow: 0 1px 0 #000;
+	color: #fff;
 	border: 1px solid rgba(0, 0, 0, .3);
 	
 	background-color: rgba(0, 0, 0, .5);
@@ -1483,8 +1485,8 @@ tbody tr .columnIcon img {
 
 .pageNavigation ul li:active a,
 .pageNavigation ul li:focus a {
-	color: #fff;
 	text-shadow: 0 1px 0 #000;
+	color: #fff;
 }
 
 .pageNavigation ul li.children,
@@ -1665,8 +1667,8 @@ div.ui-dialog-titlebar {
 }
 
 span.ui-dialog-title {
-	color: #fff;
 	text-shadow: 5px 0 0 #000;
+	color: #fff;
 }
 
 a.ui-dialog-titlebar-close {
@@ -1727,9 +1729,9 @@ div.ui-widget-overlay {
 /* Globals */
 
 .badge {
-	color: #369;
 	font-size: 85%;
 	text-shadow: none;
+	color: #369;
 	border-radius: 13px;
 	background-color: #fff;
 	margin-right: -3px;
@@ -1769,9 +1771,9 @@ div.ui-widget-overlay {
 /* Buttons */
 
 .badgeButton {
-	color: #999;
-	text-shadow: 0 1px 0 #fff;
 	text-decoration: none !important;
+	text-shadow: 0 1px 0 #fff;
+	color: #999;
 	border: 1px solid #999;
 	
 	background-color: #fff;
@@ -1815,8 +1817,8 @@ div.ui-widget-overlay {
 /* Balloon Tooltips */
 
 #balloonTooltip {
-	color: #fff;
 	font-size: .85em;
+	color: #fff;
 	border: 1px solid rgba(255, 255, 255, .7) !important;
 	border-radius: 5px;
 	background-color: rgba(0, 0, 0, .7);
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index 404c92a16b..4501188c81 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -22,13 +22,13 @@
 		<table>
 			<thead>
 				<tr>
-					<th class="columnSessionAccessLogID{if $sortField == 'sessionAccessLogID'} active{/if}"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=sessionAccessLogID&amp;sortOrder={if $sortField == 'sessionAccessLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionAccessLogID{/lang}{if $sortField == 'sessionAccessLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnTime{if $sortField == 'time'} active{/if}"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnPackageName{if $sortField == 'packageName'} active{/if}"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnClassName{if $sortField == 'className'} active{/if}"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnRequestURI{if $sortField == 'requestURI'} active{/if}"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestURI&amp;sortOrder={if $sortField == 'requestURI' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnRequestMethod{if $sortField == 'requestMethod'} active{/if}"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestMethod&amp;sortOrder={if $sortField == 'requestMethod' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th class="columnSessionAccessLogID{if $sortField == 'sessionAccessLogID'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=sessionAccessLogID&amp;sortOrder={if $sortField == 'sessionAccessLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionAccessLogID{/lang}{if $sortField == 'sessionAccessLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnTime{if $sortField == 'time'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnPackageName{if $sortField == 'packageName'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnClassName{if $sortField == 'className'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th class="columnRequestURI{if $sortField == 'requestURI'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestURI&amp;sortOrder={if $sortField == 'requestURI' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnRequestMethod{if $sortField == 'requestMethod'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestMethod&amp;sortOrder={if $sortField == 'requestMethod' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					
 					{if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index 2449112c94..ff3190afd2 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -22,13 +22,13 @@
 		<table>
 			<thead>
 				<tr>
-					<th class="columnSessionLogID{if $sortField == 'sessionLogID'} active{/if}"><p><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=sessionLogID&amp;sortOrder={if $sortField == 'sessionLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionLogID{/lang}{if $sortField == 'sessionLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnUsername{if $sortField == 'username'} active{/if}"><p><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><p><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnUserAgent{if $sortField == 'userAgent'} active{/if}"><p><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=userAgent&amp;sortOrder={if $sortField == 'userAgent' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.userAgent{/lang}{if $sortField == 'userAgent'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnTime{if $sortField == 'time'} active{/if}"><p><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnLastActivityTime{if $sortField == 'lastActivityTime'} active{/if}"><p><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=lastActivityTime&amp;sortOrder={if $sortField == 'lastActivityTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnAccesses{if $sortField == 'accesses'} active{/if}"><p><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=accesses&amp;sortOrder={if $sortField == 'accesses' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th class="columnSessionLogID{if $sortField == 'sessionLogID'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=sessionLogID&amp;sortOrder={if $sortField == 'sessionLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionLogID{/lang}{if $sortField == 'sessionLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnUsername{if $sortField == 'username'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnUserAgent{if $sortField == 'userAgent'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=userAgent&amp;sortOrder={if $sortField == 'userAgent' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.userAgent{/lang}{if $sortField == 'userAgent'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnTime{if $sortField == 'time'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnLastActivityTime{if $sortField == 'lastActivityTime'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=lastActivityTime&amp;sortOrder={if $sortField == 'lastActivityTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnAccesses{if $sortField == 'accesses'} active{/if}"><a href="index.php?page=ACPSessionLogList&amp;pageNo={@$pageNo}&amp;sortField=accesses&amp;sortOrder={if $sortField == 'accesses' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					
 					{if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 795fd10ea2..da1b4cdd90 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -69,11 +69,11 @@
 			<table id="cache{@$cacheIndex}">
 				<thead>
 					<tr>
-						<th><p class="emptyHead">{lang}wcf.acp.cache.list.name{/lang}</p></th>
-						<th><p class="emptyHead">{lang}wcf.acp.cache.list.size{/lang}</p></th>
-						<th><p class="emptyHead">{lang}wcf.acp.cache.list.mtime{/lang}</p></th>
+						<th>{lang}wcf.acp.cache.list.name{/lang}</th>
+						<th>{lang}wcf.acp.cache.list.size{/lang}</th>
+						<th>{lang}wcf.acp.cache.list.mtime{/lang}</th>
 						{if $files.0.perm|isset}
-							<th><p class="emptyHead">{lang}wcf.acp.cache.list.perm{/lang}</p></th>
+							<th>{lang}wcf.acp.cache.list.perm{/lang}</th>
 						{/if}
 					</tr>
 				</thead>
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 61237eb4dd..003d33dea1 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -61,14 +61,14 @@
 		<table>
 			<thead>
 				<tr>
-					<th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}" colspan="2"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnStartMinute{if $sortField == 'startMinute'} active{/if}" title="{lang}wcf.acp.cronjob.startMinute{/lang}"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMinute&amp;sortOrder={if $sortField == 'startMinute' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnStartHour{if $sortField == 'startHour'} active{/if}" title="{lang}wcf.acp.cronjob.startHour{/lang}"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startHour&amp;sortOrder={if $sortField == 'startHour' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnStartDom{if $sortField == 'startDom'} active{/if}" title="{lang}wcf.acp.cronjob.startDom{/lang}"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDom&amp;sortOrder={if $sortField == 'startDom' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnStartMonth{if $sortField == 'startMonth'} active{/if}" title="{lang}wcf.acp.cronjob.startMonth{/lang}"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMonth&amp;sortOrder={if $sortField == 'startMonth' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnStartDow{if $sortField == 'startDow'} active{/if}" title="{lang}wcf.acp.cronjob.startDow{/lang}"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDow&amp;sortOrder={if $sortField == 'startDow' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnDescription{if $sortField == 'description'} active{/if}"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnNextExec{if $sortField == 'nextExec'} active{/if}"><p><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=nextExec&amp;sortOrder={if $sortField == 'nextExec' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}" colspan="2"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnStartMinute{if $sortField == 'startMinute'} active{/if}" title="{lang}wcf.acp.cronjob.startMinute{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMinute&amp;sortOrder={if $sortField == 'startMinute' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnStartHour{if $sortField == 'startHour'} active{/if}" title="{lang}wcf.acp.cronjob.startHour{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startHour&amp;sortOrder={if $sortField == 'startHour' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnStartDom{if $sortField == 'startDom'} active{/if}" title="{lang}wcf.acp.cronjob.startDom{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDom&amp;sortOrder={if $sortField == 'startDom' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnStartMonth{if $sortField == 'startMonth'} active{/if}" title="{lang}wcf.acp.cronjob.startMonth{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMonth&amp;sortOrder={if $sortField == 'startMonth' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnStartDow{if $sortField == 'startDow'} active{/if}" title="{lang}wcf.acp.cronjob.startDow{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDow&amp;sortOrder={if $sortField == 'startDow' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnDescription{if $sortField == 'description'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnNextExec{if $sortField == 'nextExec'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=nextExec&amp;sortOrder={if $sortField == 'nextExec' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 4499cdc5f7..45b234d5fe 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -24,10 +24,10 @@
 			<table>
 				<thead>
 					<tr>
-						<th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-						<th class="columnClassName{if $sortField == 'className'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-						<th class="columnDescription{if $sortField == 'description'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-						<th class="columnExecTime{if $sortField == 'execTime'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=execTime&amp;sortOrder={if $sortField == 'execTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+						<th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+						<th class="columnClassName{if $sortField == 'className'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+						<th class="columnDescription{if $sortField == 'description'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+						<th class="columnExecTime{if $sortField == 'execTime'} active{/if}"><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=execTime&amp;sortOrder={if $sortField == 'execTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 						
 						{if $additionalColumns|isset}{@$additionalColumns}{/if}
 					</tr>
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 4c14b5598c..26bf74c60c 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -113,8 +113,8 @@
 	<table>
 		<thead>
 			<tr>
-				<th><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
-				<th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
+				<th>{lang}wcf.acp.package.list.name{/lang}</th>
+				<th>{lang}wcf.acp.package.list.version{/lang}</th>
 			</tr>
 		</thead>
 		
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 0b81477c0d..aae3fc6230 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -40,11 +40,11 @@
 		<table>
 			<thead>
 				<tr>
-					<th colspan="2"{if $sortField == 'packageID'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageID&amp;sortOrder={if $sortField == 'packageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th colspan="2"{if $sortField == 'packageName'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th{if $sortField == 'author'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=author&amp;sortOrder={if $sortField == 'author' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th{if $sortField == 'packageVersion'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageVersion&amp;sortOrder={if $sortField == 'packageVersion' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th{if $sortField == 'updateDate'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=updateDate&amp;sortOrder={if $sortField == 'updateDate' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th colspan="2"{if $sortField == 'packageID'} class="active"{/if}><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageID&amp;sortOrder={if $sortField == 'packageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th colspan="2"{if $sortField == 'packageName'} class="active"{/if}><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th{if $sortField == 'author'} class="active"{/if}><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=author&amp;sortOrder={if $sortField == 'author' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th{if $sortField == 'packageVersion'} class="active"{/if}><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageVersion&amp;sortOrder={if $sortField == 'packageVersion' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th{if $sortField == 'updateDate'} class="active"{/if}><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=updateDate&amp;sortOrder={if $sortField == 'updateDate' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 18106aec46..2e18b67e16 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -2,7 +2,7 @@
 
 <header class="mainHeading">
 	{if $packageID == 0}
-		<img src="{@RELATIVE_WCF_DIR}icon/packageStandaloneAdd1.svg" alt="" />
+		<img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" />
 		<hgroup class="headlineContainer">
 			<h1>{lang}wcf.acp.package.startInstall{/lang}</h1>
 		</hgroup>
diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index 77f3011a7a..d4a87c9a70 100644
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -78,11 +78,11 @@
 		<table>
 			<thead>
 				<tr>
-					<th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</p></th>
-					<th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</p></th>
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</p></th>
+					<th colspan="2">{lang}wcf.acp.package.list.id{/lang}</th>
+					<th colspan="2">{lang}wcf.acp.package.list.name{/lang}</th>
+					<th>{lang}wcf.acp.package.list.author{/lang}</th>
+					<th>{lang}wcf.acp.package.list.version{/lang}</th>
+					<th>{lang}wcf.acp.package.list.date{/lang}</th>
 					
 					{if $additionalColumns|isset}{@$additionalColumns}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 3ba756fb15..75886aa84e 100644
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
 <header class="mainHeading">
-	<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" />
+	<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" /><!-- ToDo: Add possibility to show a custom app icon if given! -->
 	<hgroup>
 		<h1>{$package->getName()}</h1>
 		<h2>{$package->packageDescription}</h2>
@@ -172,11 +172,11 @@
 		<table id="dependentPackages">
 			<thead>
 				<tr class="tableHead">
-					<th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</p></th>
-					<th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</p></th>
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</p></th>
+					<th colspan="2">{lang}wcf.acp.package.list.id{/lang}</th>
+					<th colspan="2">{lang}wcf.acp.package.list.name{/lang}</th>
+					<th>{lang}wcf.acp.package.list.author{/lang}</th>
+					<th>{lang}wcf.acp.package.list.version{/lang}</th>
+					<th>{lang}wcf.acp.package.list.date{/lang}</th>
 					
 					{if $additionalColumns|isset}{@$additionalColumns}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index a5075d8a3e..987428dd1a 100644
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -39,12 +39,12 @@
 		<table>
 			<thead>
 				<tr>
-					<th class="columnPackageUpdateServerID{if $sortField == 'packageUpdateServerID'} active{/if}" colspan="2"><p><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packageUpdateServerID&amp;sortOrder={if $sortField == 'packageUpdateServerID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packageUpdateServerID{/lang}{if $sortField == 'packageUpdateServerID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnServer{if $sortField == 'serverURL'} active{/if}"><p><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=serverURL&amp;sortOrder={if $sortField == 'serverURL' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnPackages{if $sortField == 'packages'} active{/if}"><p><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packages&amp;sortOrder={if $sortField == 'packages' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnStatus{if $sortField == 'status'} active{/if}"><p><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=status&amp;sortOrder={if $sortField == 'status' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.status{/lang}{if $sortField == 'status'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnErrorText{if $sortField == 'errorMessage'} active{/if}"><p><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=errorMessage&amp;sortOrder={if $sortField == 'errorMessage' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnTimestamp{if $sortField == 'lastUpdateTime'} active{/if}"><p><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=lastUpdateTime&amp;sortOrder={if $sortField == 'lastUpdateTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th class="columnPackageUpdateServerID{if $sortField == 'packageUpdateServerID'} active{/if}" colspan="2"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packageUpdateServerID&amp;sortOrder={if $sortField == 'packageUpdateServerID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packageUpdateServerID{/lang}{if $sortField == 'packageUpdateServerID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnServer{if $sortField == 'serverURL'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=serverURL&amp;sortOrder={if $sortField == 'serverURL' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnPackages{if $sortField == 'packages'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packages&amp;sortOrder={if $sortField == 'packages' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnStatus{if $sortField == 'status'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=status&amp;sortOrder={if $sortField == 'status' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.status{/lang}{if $sortField == 'status'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnErrorText{if $sortField == 'errorMessage'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=errorMessage&amp;sortOrder={if $sortField == 'errorMessage' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnTimestamp{if $sortField == 'lastUpdateTime'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=lastUpdateTime&amp;sortOrder={if $sortField == 'lastUpdateTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 856231ad38..aed5bc4f10 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -46,9 +46,9 @@
 		<table>
 			<thead>
 				<tr class="tableHead">
-					<th class="columnGroupID{if $sortField == 'groupID'} active{/if}" colspan="2"><p><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupID&amp;sortOrder={if $sortField == 'groupID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnGroupName{if $sortField == 'groupName'} active{/if}"><p><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupName&amp;sortOrder={if $sortField == 'groupName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnMembers{if $sortField == 'members'} active{/if}"><p><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=members&amp;sortOrder={if $sortField == 'members' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th class="columnGroupID{if $sortField == 'groupID'} active{/if}" colspan="2"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupID&amp;sortOrder={if $sortField == 'groupID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnGroupName{if $sortField == 'groupName'} active{/if}"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupName&amp;sortOrder={if $sortField == 'groupName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnMembers{if $sortField == 'members'} active{/if}"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=members&amp;sortOrder={if $sortField == 'members' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index a659fe3191..178ee8d91f 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -75,12 +75,12 @@
 		<table>
 			<thead>
 				<tr class="tableHead">
-					<th class="columnMark"><p class="emptyHead"><label><input type="checkbox" name="userMarkAll" /></label></p></th>
-					<th class="columnUserID{if $sortField == 'userID'} active{/if}" colspan="2"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=userID&amp;sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-					<th class="columnUsername{if $sortField == 'username'} active{/if}"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+					<th class="columnMark"><label><input type="checkbox" name="userMarkAll" /></label></th>
+					<th class="columnUserID{if $sortField == 'userID'} active{/if}" colspan="2"><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=userID&amp;sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+					<th class="columnUsername{if $sortField == 'username'} active{/if}"><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					
 					{foreach from=$columnHeads key=column item=columnLanguageVariable}
-						<th class="column{$column|ucfirst}{if $sortField == $column} active{/if}"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField={$column}&amp;sortOrder={if $sortField == $column && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+						<th class="column{$column|ucfirst}{if $sortField == $column} active{/if}"><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField={$column}&amp;sortOrder={if $sortField == $column && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
 					{/foreach}
 					
 					{if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl
deleted file mode 100644
index aca8632f97..0000000000
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{if !$progress|isset}{assign var="progress" value=0}{/if}
-{assign var="actionTitle" value=$pageTitle}
-{capture assign="pageTitle"}{lang}wcf.acp.worker.progressBar{/lang} - {@$pageTitle}{/capture}
-{include file='setupHeader'}
-
-<script type="text/javascript">
-	//<![CDATA[
-	function showWindow(show) {
-		if (show) {
-			document.getElementById('iframe').style.visibility = 'visible';
-			window.focus();
-		} else {
-			xHeight('iframe', 0);
-			document.getElementById('iframe').style.visibility = 'hidden';
-		}
-	}
-	
-	function setCurrentStep(title) {
-		document.getElementById('currentStep').innerHTML = title;
-	}
-	
-	function setProgress(progress) {
-		document.getElementById('progressBar').style.width = Math.round(300 * progress / 100) + 'px';
-		{literal}
-		document.getElementById('progressText').innerHTML = document.getElementById('progressText').innerHTML.replace(/\d{1,3}%/, progress + '%');
-		document.title = document.title.replace(/\d{1,3}%/, progress + '%');
-		{/literal}
-	}
-	
-	onloadEvents.push(function() {
-		document.getElementById('workerIcon').onclick = function(event) {
-			if (!event) event = window.event;
-			
-			if (event.altKey) {
-				showWindow(true);
-				if (!xHeight('iframe')) {
-					xHeight('iframe', 300);
-				}
-			}
-		}
-	});
-	//]]>
-</script>
-
-<img src="{@RELATIVE_WCF_DIR}icon/worker1.svg" id="workerIcon" alt="" />
-
-<h1><b>{lang}wcf.global.pageTitle{/lang}</b><br />{@$actionTitle}</h1>
-
-<div class="progress">
-	<div id="progressBar" class="progressBar" style="width: {@300*$progress/100|round:0}px"></div>
-	<div id="progressText" class="progressText">{lang}wcf.acp.worker.progressBar{/lang}</div>
-</div>
-
-<hr />
-
-<h2>{lang}wcf.acp.worker.title{/lang}</h2>
-
-<p>{lang}wcf.acp.worker.description{/lang}</p>
-
-<fieldset>
-	<legend>{lang}wcf.acp.worker.currentStep{/lang}</legend>
-	
-	<div class="inner">
-		<p><span id="currentStep"></span></p>
-		
-		<iframe src="{$url}" id="iframe" frameborder="0"></iframe>
-	</div>
-</fieldset>
-
-{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/workerException.tpl b/wcfsetup/install/files/acp/templates/workerException.tpl
deleted file mode 100644
index 975ebc91a4..0000000000
--- a/wcfsetup/install/files/acp/templates/workerException.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{include file='setupWindowHeader'}
-
-<script type="text/javascript">
-	//<![CDATA[
-	window.onload = function() {
-	changeHeight();	
-};
-	parent.showWindow(true);
-	//]]>
-</script>
-
-{$e->show()}
-
-{include file='setupWindowFooter'}
diff --git a/wcfsetup/install/files/acp/templates/workerFinish.tpl b/wcfsetup/install/files/acp/templates/workerFinish.tpl
deleted file mode 100644
index 79835c503c..0000000000
--- a/wcfsetup/install/files/acp/templates/workerFinish.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{include file='setupWindowHeader'}
-
-<div class="nextButton">
-	<input type="button" value="{lang}wcf.global.button.next{/lang}" onclick="parent.location.href='{if $url|isset}{$url}{else}index.php{@SID_ARG_1ST}{/if}'; parent.stopAnimating();" />
-</div>
-
-<script type="text/javascript">
-	//<![CDATA[
-	window.onload = function() {
-	changeHeight();	
-};
-	parent.setProgress(100);
-	parent.showWindow(true);
-	parent.setCurrentStep('{@$stepTitle}');
-	//]]>
-</script>
-
-{if $message|isset}
-	{@$message}
-{/if}
-
-{include file='setupWindowFooter'}
diff --git a/wcfsetup/install/files/acp/templates/workerNext.tpl b/wcfsetup/install/files/acp/templates/workerNext.tpl
deleted file mode 100644
index ac80d0b056..0000000000
--- a/wcfsetup/install/files/acp/templates/workerNext.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{include file='setupWindowHeader'}
-
-<h2>Step: {@$stepTitle}</h2>
-
-<form method="post" action="{$url}">
-	<input type="submit" value="Go" onclick="parent.stopAnimating()" />
-</form>
-
-<script type="text/javascript">
-	//<![CDATA[
-	{if $progress|isset}parent.setProgress({@$progress});{/if}
-	parent.showWindow(false);
-	parent.setCurrentStep('{@$stepTitle}');
-	
-	window.onload = function() {
-		document.forms[0].submit();
-	}
-	//]]>
-</script>
-
-{include file='setupWindowFooter'}
-- 
2.20.1