diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index c7b451e68b..7e9df737d3 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 bb50f922f7..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>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 7b1466cfbd..8e451c9fe3 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">
+		<table class="table1">
 			<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 cf1a7be427..399dc422cd 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>
@@ -115,7 +115,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 eca02d2798..faeb4c010e 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 b644862ce1..2e84ce5658 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">
+	<table class="table1">
 		<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 1e49198725..c543cf51d4 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 d654c320ca..a246d6dc9a 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -92,7 +92,7 @@
 			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 				<span class="corners-top"><span></span></span>
 				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
+					<table id="table00{auth.S_ROW_COUNT}" class="table1">
 					<colgroup>
 						<col class="permissions-name" />
 						<col class="permissions-yes" />
@@ -144,7 +144,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 3dc4c2d616..49efcf9ac0 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">
+	<table class="table1">
 	<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 ca15338133..4e63052960 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -529,6 +529,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..b968bdb625 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -44,7 +44,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++)
 	{
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 4d52b901c3..d26cd5d8a6 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -77,7 +77,7 @@
 		<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 -->>
 			<span class="corners-top"><span></span></span>
 			<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">
+				<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">
 				<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>