diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 0ba8581201..9ce9fb5f13 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -224,7 +224,7 @@
 		<fieldset class="tabulated">
 		<legend>{L_TITLE}</legend>
 
-		<table cellspacing="1">
+		<table class="table1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<thead>
 		<tr>
@@ -291,7 +291,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="row1" /><col class="row1" /><col class="row2" />
 	<thead>
 	<tr>
@@ -331,7 +331,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
@@ -389,7 +389,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 5939af24ae..c22ed395e7 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -56,7 +56,7 @@
 	
 	<br />
 
-	<table cellspacing="1" id="down">
+	<table class="table1" id="down">
 	<thead>
 	<tr>
 		<th colspan="2">{L_TOKENS}</th>
@@ -90,7 +90,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_BBCODES}</legend>
 
-	<table cellspacing="1" id="down">
+	<table class="table1" id="down">
 	<thead>
 	<tr>
 		<th>{L_BBCODE_TAG}</th>
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index cdd0fd4a93..eeda13303d 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -62,7 +62,7 @@
 
 	<form id="acp_bots" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_BOT_NAME}</th>
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 53de0b4d12..390b3e79f0 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,7 +6,7 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
 		<tr>
@@ -24,11 +24,11 @@
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
-			<td><strong>{enabled.META_DISPLAY_NAME}</strong></a></td>
+			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}" alt="{enabled.actions.L_ACTION}">{enabled.actions.L_ACTION}</a>
+					<a href="{enabled.actions.U_ACTION}" title="{enabled.actions.L_ACTION}">{enabled.actions.L_ACTION}</a>
 					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>
@@ -42,13 +42,13 @@
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
-			<td><strong>{disabled.META_DISPLAY_NAME}</strong></a></td>
+			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
 			</td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}" alt="{disabled.actions.L_ACTION}">{disabled.actions.L_ACTION}</a>
+					<a href="{disabled.actions.U_ACTION}" title="{disabled.actions.L_ACTION}">{disabled.actions.L_ACTION}</a>
 					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 04c6ecde3a..e8b20007dc 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -440,7 +440,7 @@
 	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF -->]<!-- ENDIF --></strong></p>
 
 	<!-- IF .forums -->
-		<table cellspacing="1" class="forums">
+		<table class="table1 forums">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN forums -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 2953e85bd9..a77010b636 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -150,7 +150,7 @@
 		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
 	</fieldset>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
@@ -261,7 +261,7 @@
 
 	<form id="acp_groups" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
@@ -295,7 +295,7 @@
 
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index a32dd1e3a7..b1df6b6162 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -27,7 +27,7 @@
 
 	<p>{L_LEGEND_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
@@ -106,7 +106,7 @@
 
 	<!-- IF S_TEAMPAGE_CATEGORY and CURRENT_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CURRENT_CATEGORY_NAME}</strong></p><!-- ENDIF -->
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 1187b7b775..bfe4878ba5 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -74,7 +74,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1" id="smilies">
+	<table class="table1" id="smilies">
 	<thead>
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -218,7 +218,7 @@
 
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_TITLE}</th>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 68a168a5d6..0302007861 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -16,7 +16,7 @@
 </div>
 <!-- ENDIF -->
 
-<table cellspacing="1">
+<table class="table1">
 <thead>
 <tr>
 	<th>{L_USERNAME}</th>
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index c400437049..d4fd572376 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -75,7 +75,7 @@
 
 		<form id="missing" method="post" action="{U_MISSING_ACTION}">
 
-		<table cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th>{L_LANGUAGE_KEY}</th>
@@ -129,7 +129,7 @@
 	</style>
 	<![endif]-->
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<!-- IF S_EMAIL_FILE -->
 		<tr>
@@ -211,7 +211,7 @@
 
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_LANGUAGE_PACK_NAME}</th>
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index e13196f65d..f22eb67a72 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -22,7 +22,7 @@
 <div><br style="clear: both;" /></div>
 
 <!-- IF .log -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index b6d520130a..bb39ffe050 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -78,7 +78,7 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-	<table cellspacing="1" class="two-columns no-header" data-no-responsive-header="true">
+	<table class="table1 two-columns no-header" data-no-responsive-header="true">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
@@ -216,7 +216,7 @@
 
 		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
 
-		<table cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
@@ -249,7 +249,7 @@
 
 		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
 
-		<table cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index f8be80bc57..8870c815af 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -132,7 +132,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<table cellspacing="1">
+	<table class="table1">
 	<tbody>
 	<tr>
 		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td>
@@ -141,7 +141,7 @@
 	</table>
 
 	<!-- IF .modules -->
-		<table cellspacing="1">
+		<table class="table1">
 			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN modules -->
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index d4f7bbdf36..b8fdaeb837 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -91,7 +91,7 @@
 			<!-- BEGIN auth -->
 			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1" class="not-responsive">
+					<table id="table00{auth.S_ROW_COUNT}" class="table1 not-responsive">
 					<colgroup>
 						<col class="permissions-name" />
 						<col class="permissions-yes" />
@@ -142,7 +142,7 @@
 
 	<form id="acp_roles" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 13be669f70..3546873f6c 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -185,7 +185,7 @@
 		</div>
 	<!-- ENDIF -->
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FIELD_IDENT}</th>
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 67cdaa784a..1be9689cc7 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -8,7 +8,7 @@
 
 	<p>{L_PRUNE_SUCCESS}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FORUM}</th>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 4b2e52536f..a1409b15ef 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -65,7 +65,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_MANAGE_RANKS}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_RANK_IMAGE}</th>
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
index 2f39f64614..ca3aebb338 100644
--- a/phpBB/adm/style/acp_reasons.html
+++ b/phpBB/adm/style/acp_reasons.html
@@ -68,7 +68,7 @@
 	<legend>{L_ACP_REASONS}</legend>
 
 	<!-- IF .reasons -->
-		<table cellspacing="1">
+		<table class="table1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<thead>
 		<tr>
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index bf353d62f2..496a8b2675 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -112,7 +112,7 @@
 
 				<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
 
-				<table cellspacing="1">
+				<table class="table1">
 					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
 					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 				<thead>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 55904253a9..b5c691b36b 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -79,7 +79,7 @@
 <!-- ENDIF -->
 
 <!-- IF .styles_list -->
-	<table cellspacing="1" class="styles">
+	<table class="table1 styles">
 	<thead>
 	<tr>
 		<th>{L_STYLE_NAME}</th>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 96c9de6ebb..b213587def 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -125,7 +125,7 @@
 
 	<form id="user_groups" method="post" action="{U_ACTION}">
 
-	<table cellspacing="1">
+	<table class="table1">
 	<tbody>
 	<!-- BEGIN group -->
 		<!-- IF group.S_NEW_GROUP_TYPE -->
@@ -164,7 +164,7 @@
 	</div>
 
 	<!-- IF .attach -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
index d1a4f59445..95892f2822 100644
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -7,7 +7,7 @@
 	</div>
 
 	<!-- IF .log -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html
index d27f3800fc..9d082eda6d 100644
--- a/phpBB/adm/style/acp_users_warnings.html
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -1,7 +1,7 @@
 	<form id="list" method="post" action="{U_ACTION}">
 
 	<!-- IF .warn -->
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
index 4acd75f933..7e91bc4367 100644
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -47,7 +47,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
 	</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_WORD}</th>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index a3b794aaf2..eae4f42641 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -732,6 +732,11 @@ td {
 	text-align: right;
 }
 
+.table1 {
+	border-collapse: separate;
+	border-spacing: 1px;
+}
+
 table.type2 {
 	border: none;
 	background: none;
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
index 99f3f24f70..4ff7c328fc 100644
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -14,7 +14,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_QUESTIONS}</legend>
 
-	<table cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th colspan="3">{L_QUESTIONS}</th>
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index e731620bd3..e692a8bd91 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -11,8 +11,15 @@
 		color: #fff;
 	}
 
+	table {
+		border-collapse: separate;
+		border-spacing: 0;
+		border: 0;
+	}
+
 	td {
-		border: solid 1px #333; 
+		border: solid 1px #333;
+		padding: 1px;
 	}
 
 	.over { 
@@ -44,7 +51,7 @@
 	numberList[4] = 'CC';
 	numberList[5] = 'FF';
 
-	document.writeln('<table cellspacing="0" cellpadding="0" border="0">');
+	document.writeln('<table>');
 
 	for (r = 0; r < 6; r++)
 	{
@@ -56,7 +63,7 @@
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
 				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
-				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>');
+				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="13" height="10" alt="#' + color + '" title="#' + color + '" \/><\/a>');
 				document.writeln('<\/td>');
 			}
 		}
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
index 5fec8c4789..7e22404f56 100644
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
@@ -22,7 +22,7 @@
 	<!-- ENDIF -->
 
 	<!-- IF S_LIST -->
-		<table cellspacing="1">
+		<table class="table1">
 			<caption>{L_AVAILABLE_CONVERTORS}</caption>
 			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 		<thead>
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 57e2c8ffea..d746226753 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -395,7 +395,7 @@
 
 	<p>{L_MAPPING_FILE_STRUCTURE}</p>
 
-	<table cellspacing="1">
+	<table class="table1">
 		<col class="row1" /><col class="row2" /><col class="row1" />
 	<thead>
 	<tr>
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 003e8369ca..7b5c071693 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -76,7 +76,7 @@
 	<!-- BEGIN category -->
 		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 			<div class="tablewrap">
-				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1" class="not-responsive">
+				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" class="table1 not-responsive">
 				<colgroup>
 					<col class="permissions-name" />
 					<col class="permissions-yes" />
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
index 42a7fc3e4e..3a14e65004 100644
--- a/phpBB/adm/style/permission_roles_mask.html
+++ b/phpBB/adm/style/permission_roles_mask.html
@@ -1,7 +1,7 @@
 
 <!-- BEGIN role_mask -->
 
-	<table cellspacing="1">
+	<table class="table1">
 		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}{L_COLON} <!-- ENDIF -->{role_mask.NAME}</caption>
 	<tbody>
 	<tr>
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
index 744ad3293e..7330ffee41 100644
--- a/phpBB/adm/style/permission_trace.html
+++ b/phpBB/adm/style/permission_trace.html
@@ -8,7 +8,7 @@
 
 	<br />
 
-	<table cellspacing="1" class="type1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_TRACE_WHO}</th>
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 0adaff10c8..369397ead2 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -39,7 +39,7 @@ $lang = array_merge($lang, array(
 	'EXTENSIONS'				=> 'Extensions',
 	'EXTENSIONS_ADMIN'			=> 'Extensions Manager',
 	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
-	'EXTENSION_INVALID_LIST'	=> 'The "%s" extension is not valid.<br /><p>%s</p>',
+	'EXTENSION_INVALID_LIST'	=> 'The "%s" extension is not valid.<br />%s<br /><br />',
 	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
 
 	'DETAILS'				=> 'Details',
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 4090d979b2..6ca176a4aa 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -98,7 +98,8 @@
 		<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 	</fieldset>
 
 	<hr />
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 6826b0af52..44295611cf 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -147,7 +147,7 @@
 
 		<h3>{L_LATEST_LOGS}</h3>
 
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th class="name">{L_ACTION}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index 492c8cf201..b930bbbcc6 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -21,7 +21,7 @@
 		</li>
 	</ul>
 
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index eb954fd11d..9b6c9b2667 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -64,7 +64,7 @@
 		</li>
 	</ul>
 
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 25464085a0..2b4ebec5c8 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -264,7 +264,7 @@
 				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
 			<!-- ENDIF --></p>
 
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_OTHER_USERS}</th>
@@ -285,7 +285,7 @@
 			</tbody>
 			</table>
 
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_IPS_POSTED_FROM}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html
index c8ac765777..668a0d81a8 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_front.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_front.html
@@ -33,7 +33,7 @@
 	<h3>{L_MOST_WARNINGS}</h3>
 
 	<!-- IF .highest -->
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
@@ -67,7 +67,7 @@
 	<h3>{L_LATEST_WARNINGS}</h3>
 
 	<!-- IF .latest -->
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
index cdf2aecc0e..731c945fe6 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -21,7 +21,7 @@
 			</li>
 		</ul>
 		
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index cec566f846..606314f9d0 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -55,7 +55,7 @@
 	<div class="forumbg forumbg-table">
 		<div class="inner">
 
-		<table class="table1" cellspacing="1" id="memberlist">
+		<table class="table1" id="memberlist">
 		<thead>
 		<tr>
 			<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}<!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF -->"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
@@ -85,7 +85,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 	<!-- IF not S_LEADERS_SET -->
@@ -143,7 +143,8 @@
 	<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 	<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label>
-	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select> <input type="submit" name="sort" value="{L_SUBMIT}" class="button2" /></label>
+	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
+	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2" />
 </fieldset>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html
index c2c1644375..fd2ba564d3 100644
--- a/phpBB/styles/prosilver/template/memberlist_leaders.html
+++ b/phpBB/styles/prosilver/template/memberlist_leaders.html
@@ -8,7 +8,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}{L_USERNAME}"><span class="rank-img">{L_RANK}&nbsp;</span><!-- IF group.U_GROUP --><a href="{group.U_GROUP}">{group.GROUP_NAME}</a><!-- ELSE -->{group.GROUP_NAME}<!-- ENDIF --></th>
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html
index 7229e5a5dc..2f15830eb1 100644
--- a/phpBB/styles/prosilver/template/search_body.html
+++ b/phpBB/styles/prosilver/template/search_body.html
@@ -95,7 +95,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th colspan="2" class="name">{L_RECENT_SEARCHES}</th>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 52163aeb0a..c5b2b990c8 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -160,7 +160,8 @@
 		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->
 			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --> <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --></label>
+			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<!-- ENDIF -->
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 3053330f61..019b5aa3e1 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -77,7 +77,7 @@
 <!-- ELSEIF S_LIST -->
 
 	<!-- IF .leader -->
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th class="name">{L_GROUP_LEAD}</th>
@@ -103,7 +103,7 @@
 
 	<!-- BEGIN member -->
 		<!-- IF member.S_PENDING -->
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_GROUP_PENDING}</th>
@@ -119,7 +119,7 @@
 				</tbody>
 				</table>
 			<!-- ENDIF -->
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_GROUP_APPROVED}</th>
@@ -140,7 +140,7 @@
 			</tr>
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
-		<table class="table1" cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th class="name">{L_MEMBERS}</th>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 0392b87715..6a711cfd30 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -9,7 +9,7 @@
 		<p>{TITLE_EXPLAIN}</p>
 
 		<!-- IF MODE == 'notification_options' -->
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 				<thead>
 					<th>{L_NOTIFICATION_TYPE}</th>
 					<!-- BEGIN notification_methods -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index a1012689f0..efe6663db0 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -126,7 +126,8 @@
 		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
 	</fieldset>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
index d8a78b8c6d..bf97434bac 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
@@ -15,7 +15,7 @@
 	<!-- ENDIF -->
 
 	<p>{L_PROFILE_AUTOLOGIN_KEYS}</p><br />
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_MARK}</th>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index ee279908b0..f0994f0716 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -211,7 +211,8 @@
 	<!-- IF not S_IS_BOT -->
 			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+			<label>{S_SELECT_SORT_DIR}</label>
+			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 	<!-- ENDIF -->
 		</fieldset>
 	</form>
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index 551e52a317..13f459b57f 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -16,7 +16,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 	
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 
 	<!-- IF .user_row -->
 		<thead>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index b7c5f16e96..46881d3b03 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -283,7 +283,8 @@
 		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 		<!-- IF not S_IS_BOT -->
 		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<!-- ENDIF -->
 	</fieldset>