diff --git a/templates/post/fileinfo.html b/templates/post/fileinfo.html
index ec490129..ae1dc092 100644
--- a/templates/post/fileinfo.html
+++ b/templates/post/fileinfo.html
@@ -1,16 +1,16 @@
 	{% if post.embed %}
 		{{ post.embed }}
-    {% else %}
-    <div class="files">
-    {% for file in post.files %}
-        <div class="file{% if post.num_files > 1 %} multifile" style="width:{{ file.thumbwidth + 40 }}px"{% else %}"{% endif %}>
+	{% else %}
+	<div class="files {% if post.num_files > 1 %} multifile{% endif %}">
+	{% for file in post.files %}
+		<div class="file{% if post.num_files > 1 %} multifile" style="width:{{ file.thumbwidth + 40 }}px"{% else %}"{% endif %}>
 	{% if file.file == 'deleted' %}
 		<img class="post-image deleted" src="{{ config.root }}{{ config.image_deleted }}" alt="" />
 	{% else %}
-		<p class="fileinfo">File: <a href="{{ config.uri_img }}{{ file.file }}">{{ file.file }}</a> <span class="unimportant">
+		<p class="fileinfo"><span>File: <a href="{{ config.uri_img }}{{ file.file }}">{{ file.file }}</a></span><span class="unimportant">
 		(
 			{% if file.thumb == 'spoiler' %}
-				{% trans %}Spoiler Image{% endtrans %}, 
+				{% trans %}Spoiler Image{% endtrans %},
 			{% endif %}
 			{{ file.size|filesize }}
 			{% if file.width and file.height %}
@@ -21,18 +21,22 @@
 			{% endif %}
 			{% if config.show_filename and file.filename %}
 				, 
-				{% if file.filename|length > config.max_filename_display %}
-					<a class="postfilename" href="{{ config.uri_img }}{{ file.file|e|bidi_cleanup }}" download="{{ file.filename|e|bidi_cleanup }}" data-truncate="true" title="{% trans %}Save as original filename{% endtrans %}">{{ file.filename|truncate_filename(config.max_filename_display)|e|bidi_cleanup }}</a>
+				{% if file.thumb == 'spoiler' %}
+					<a href="{{ config.uri_img }}{{ file.file|e|bidi_cleanup }}" download="{{ file.filename|e|bidi_cleanup }}" title="{% trans %}Spoiler Image{% endtrans %}">{% trans %}Spoiler Image{% endtrans %}</a>
+				{% elseif file.filename|length > config.max_filename_display %}
+					<a href="{{ config.uri_img }}{{ file.file|e|bidi_cleanup }}" download="{{ file.filename|e|bidi_cleanup }}" title="Save as original filename: {{ file.filename|e|bidi_cleanup }}">{{ file.filename|truncate_filename(config.max_filename_display)|e|bidi_cleanup }}</a>
 				{% else %}
-					<a class="postfilename" href="{{ config.uri_img }}{{ file.file|e|bidi_cleanup }}" download="{{ file.filename|e|bidi_cleanup }}" title="{% trans %}Save as original filename{% endtrans %}">{{ file.filename|e|bidi_cleanup }}</a>
+					<a href="{{ config.uri_img }}{{ file.file|e|bidi_cleanup }}" download="{{ file.filename|e|bidi_cleanup }}" title="Save as original filename">{{ file.filename|e|bidi_cleanup }}</a>
 				{% endif %}
 			{% endif %}
 		)
+		</span>
 		{% include "post/image_identification.html" %}
-		{% include "post/file_controls.html" %}</span></p>
+		{% include "post/file_controls.html" %}
+		</p>
 	{% include "post/image.html" with {'post':file} %}
 	{% endif %}
 </div>
-    {% endfor %}
+	{% endfor %}
 </div>
-    {% endif %}
+	{% endif %}