diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index b317cd2aa5..08ec170195 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -7,9 +7,8 @@
 		<!-- END av_local_cats -->
 	</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd>
 </dl>
-<dl>
 	<!-- IF AV_LOCAL_SHOW -->
-	<table cellspacing="1">
+	<table style="border-spacing: 1px;">
 	<!-- BEGIN av_local_row -->
 	<tr>
 		<!-- BEGIN av_local_col -->
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 9ca9b6e9ec..8b46dfa7f5 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -9,8 +9,8 @@
 <div id="gallery">
 <!-- BEGIN av_local_row -->
 <!-- BEGIN av_local_col -->
-	<label for="av-{av_local_row.av_local_col.S_ROW_COUNT}"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></label>
+	<label for="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></label>
 <!-- END av_local_col -->
 <!-- END av_local_row -->
 </div>
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
index 37ac864b27..352052f9f4 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
@@ -22,6 +22,10 @@
 					<td class="row2" align="center"><input type="radio" class="radio" name="av_local_file" value="{av_local_col.av_local_option.S_OPTIONS_AVATAR}" /></td>
 				<!-- END av_local_option -->
 			</tr>
+			<!-- BEGINELSE -->
+			<tr>
+				<td class="row1" colspan="2">{L_NO_AVATAR_CATEGORY}</td>
+			</tr>
 			<!-- END av_local_col -->
 			</table>
 		</td>