diff --git a/contrib/static/site.css b/contrib/static/site.css
index 568f2a8..40b168b 100644
--- a/contrib/static/site.css
+++ b/contrib/static/site.css
@@ -267,6 +267,10 @@ fieldset {
     max-width: 90%;
 }
 
+fieldset > img {
+	float: right;
+}
+
 .thread {
     float: left;
 	width: 90%;
diff --git a/contrib/templates/default/post.mustache b/contrib/templates/default/post.mustache
index 9e49658..b2fa457 100644
--- a/contrib/templates/default/post.mustache
+++ b/contrib/templates/default/post.mustache
@@ -1,14 +1,14 @@
 <fieldset>
+  {{#IsI2P}}
+    <img src="{{Prefix}}static/i2p.png" title="post from i2p" />
+  {{/IsI2P}}
+  {{#IsTor}}
+    <img src="{{Prefix}}static/tor.png" title="post from tor" />
+  {{/IsTor}}
+  {{#IsClearnet}}
+    <img src="{{Prefix}}static/clearnet.png" title="post from clearnet" />
+  {{/IsClearnet}}
   <legend>
-    {{#IsI2P}}
-      <img src="{{Prefix}}static/i2p.png" title="post from i2p" />
-    {{/IsI2P}}
-    {{#IsTor}}
-      <img src="{{Prefix}}static/tor.png" title="post from tor" />
-    {{/IsTor}}
-    {{#IsClearnet}}
-      <img src="{{Prefix}}static/clearnet.png" title="post from clearnet" />
-    {{/IsClearnet}}
     <span class="subject">{{Subject}}</span> <span class="name">{{Name}}</span> {{Date}}
     No. <a onclick="nntpchan_backlink('{{ShortHash}}');" title="{{MessageID}}">{{ShortHash}}</a>
     <a href="{{PostURL}}">[reply]</a> <span class="tripcode">{{{Pubkey}}}</span><br />