diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_center_image.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_center_image.tmpl
index 7647b9c6d..e040e5c5f 100755
--- a/docs/upgrades/templates-6.99.0/wgtemplate_center_image.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_center_image.tmpl
@@ -27,7 +27,7 @@
 		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
 	</tmpl_if>
 </tmpl_if>
-<tmpl_var attachment.box>
+<tmpl_var attachment.icon> <tmpl_var attachment.name> <tmpl_var attachment.name>
 <p />
 </tmpl_if>
 
@@ -43,8 +43,8 @@
 <tmpl_if allowDiscussion>
 	<table width="100%" cellspacing="2" cellpadding="1" border="0">
 	<tr>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
+	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
 	</tr>
 	</table>
 </tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_article.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_article.tmpl
index d722032e7..e1bdf194f 100755
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_article.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_article.tmpl
@@ -27,7 +27,7 @@
 		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
 	</tmpl_if>
 	</tmpl_if>
-	<tmpl_var attachment.box>
+	<tmpl_var attachment.icon> <tmpl_var attachment.name> <tmpl_var attachment.name>
 </tmpl_if>
 
 <tmpl_if pagination.pageCount.isMultiple>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_left_align_image.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_left_align_image.tmpl
index eda252b1b..fbdb10020 100755
--- a/docs/upgrades/templates-6.99.0/wgtemplate_left_align_image.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_left_align_image.tmpl
@@ -29,7 +29,7 @@
 	</tmpl_if>
 </tmpl_if>
 
-<tmpl_var attachment.box> <p />
+<tmpl_var attachment.icon> <tmpl_var attachment.name> <tmpl_var attachment.name> <p />
 </tmpl_if>
 
 <tmpl_if pagination.isFirstPage>
@@ -50,8 +50,8 @@
 <tmpl_if allowDiscussion>
 	<p />
 	<table width="100%" cellspacing="2" cellpadding="1" border="0">
-	<tr><td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
+	<tr><td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
 	</table>
 </tmpl_if>
 </tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_linked_image_with_caption.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_linked_image_with_caption.tmpl
index 2b430f6d3..3611b3b17 100755
--- a/docs/upgrades/templates-6.99.0/wgtemplate_linked_image_with_caption.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_linked_image_with_caption.tmpl
@@ -32,7 +32,7 @@
 </tmpl_if>
 
 <tmpl_if pagination.isLastPage>
-	<tmpl_var attachment.box>
+	<tmpl_var attachment.icon> <tmpl_var attachment.name> <tmpl_var attachment.name>
 	<p />
 </tmpl_if>
 
@@ -54,8 +54,8 @@
 <tmpl_if allowDiscussion>
 	<p />
 	<table width="100%" cellspacing="2" cellpadding="1" border="0">
-	<tr><td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
+	<tr><td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
 	</table>
 </tmpl_if>
 </tmpl_if>