diff --git a/inc/config.php b/inc/config.php
index 5db20405..741846e9 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -746,12 +746,14 @@
 	// Download the file with its original filename upon clicking on it. Only works when $config['show_filename'] is true.
 	$config['download_filename'] = false;
 
-	// Display image identification links using ImgOps, regex.info/exif and Google Images.
+	// Display image identification links for ImgOps, regex.info/exif, Google Images and iqdb.
 	$config['image_identification'] = false;
 	// Which of the identification links to display. Only works if $config['image_identification'] is true.
 	$config['image_identification_imgops'] = true;
 	$config['image_identification_exif'] = true;
 	$config['image_identification_google'] = true;
+	// Anime/manga search engine.
+	$config['image_identification_iqdb'] = false;
 	
 	// Number of posts in a "View Last X Posts" page
 	$config['noko50_count'] = 50;
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 20d895ae..37a46858 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -113,18 +113,21 @@ form table tr td div label {
     float: left;
     margin-right: 2px;
 }
-.multifile {
-    border: 2px dashed #B7C5D9;
-}
 .file:not(.multifile) .post-image {
     float: left;
 }
 .file:not(.multifile) {
     float: none;
 }
+.multifile {
+	padding-right: 20px;
+}
 p.fileinfo {
 	display: block;
-	margin: 0;
+	margin: 0 0 0 20px;
+}
+div.post p.fileinfo {
+	padding-left: 5px;
 }
 div.banner {
 	background-color: #E04000;
@@ -148,12 +151,12 @@ img.banner, img.board_image {
 .post-image {
 	display: block;
 	float: left;
-	margin: 10px 20px;
+	margin: 5px 20px 10px 20px;
 	border: none;
 }
 div.post .post-image {
 	padding: 5px;
-	margin: 5px 20px 0 0;
+	margin: 0 20px 0 0;
 }
 div.post img.icon {
 	display: inline;
@@ -289,7 +292,7 @@ span.heading {
 span.spoiler {
 	background: black;
 	color: black;
-	padding: 0px 1px;
+	padding: 0 1px;
 }
 div.post.reply div.body span.spoiler a {
 	color: black;
@@ -436,11 +439,11 @@ table.mod.config-editor input[type="text"] {
 }
 .desktop-style div.boardlist:nth-child(1) {
   position: fixed;
-  top: 0px;
-  left: 0px;
-  right: 0px;
-  /*text-shadow: white 1px 0px 6px, white 1px 0px 6px, black 1px 0px 3px;*/
-  margin-top: 0px;
+  top: 0;
+  left: 0;
+  right: 0;
+  /*text-shadow: white 1px 0 6px, white 1px 0 6px, black 1px 0 3px;*/
+  margin-top: 0;
   z-index: 30;
 }
 .desktop-style div.boardlist:nth-child(1):hover, .desktop-style div.boardlist:nth-child(1).cb-menu {
@@ -462,7 +465,7 @@ table.mod.config-editor input[type="text"] {
 }
 .desktop-style .sub .sub:hover, .desktop-style .sub .sub.hover {
   display: inline;
-  text-indent: 0px;
+  text-indent: 0;
   background: inherit;
 }
 
@@ -489,8 +492,8 @@ table.mod.config-editor input[type="text"] {
   background-color: rgba(100%, 100%, 100%, 0.2);
 }
 p.intro.thread-hidden {
-	margin: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
 }
 
 form.ban-appeal {
@@ -569,7 +572,7 @@ form.ban-appeal textarea {
 
 .compact-boardlist {
         padding: 3px;
-        padding-bottom: 0px;
+        padding-bottom: 0;
 }
 .compact-boardlist .cb-item {
         display: inline-block;
@@ -624,6 +627,6 @@ form.ban-appeal textarea {
 
 /* Containerchan */
     div.post video.post-image {
-        padding: 0px;
-        margin: 10px 25px 5px 5px;
+        padding: 0;
+        margin: 5px 25px 5px 5px;
     }
diff --git a/templates/post/fileinfo.html b/templates/post/fileinfo.html
index 7b7e278c..ad398d60 100644
--- a/templates/post/fileinfo.html
+++ b/templates/post/fileinfo.html
@@ -21,7 +21,7 @@
 		{% else %}
 			>{{ file.file }}
 		{% endif %}
-			</a> <span class="unimportant">
+			</a><br><span class="unimportant"><em>
 		(
 			{% if file.thumb == 'spoiler' %}
 				{% trans %}Spoiler Image{% endtrans %}, 
@@ -33,9 +33,9 @@
 					, {{ ratio(file.width, file.height) }}
 				{% endif %}
 			{% endif %}
-			{% include "post/image_identification.html" %}
 		)
-		</span>	{% include "post/file_controls.html" %}</p>
+			{% include "post/image_identification.html" %}
+			</em></span> {% include "post/file_controls.html" %}</p>
 	{% include "post/image.html" with {'post':file} %}
 	{% endif %}
 </div>
diff --git a/templates/post/image_identification.html b/templates/post/image_identification.html
index 4f3f593a..1ebc01a7 100644
--- a/templates/post/image_identification.html
+++ b/templates/post/image_identification.html
@@ -1,14 +1,17 @@
 {% if file.thumb != 'file' and config.image_identification %}
-	, 
+	 
 	<span class='image_id'>
 		{% if config.image_identification_imgops %}
-			<a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ file.file }}">io</a> 
+			<a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ file.file }}">ImgOps</a> 
 		{% endif %}
 		{% if config.image_identification_exif and file.file|extension == 'jpg' %}
-			<a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}">e</a> 
+			<a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}">Exif</a> 
 		{% endif %}
 		{% if config.image_identification_google %}
-			<a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ file.file }}">g</a>
+			<a href="https://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ file.file }}">Google</a>
+		{% endif %}
+		{% if config.image_identification_iqdb %}
+			<a href="http://iqdb.org/?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}">iqdb</a>
 		{% endif %}
 	</span>
 {% endif %}