diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css
index 8018605a..7bfa3365 100644
--- a/gulp/res/css/style.css
+++ b/gulp/res/css/style.css
@@ -312,12 +312,18 @@ summary {
 	overflow: hidden;
 	text-overflow: ellipsis;
 	word-break: keep-all;
+	font-size: x-small;
 }
 
 .post-file-src {
 	margin: 0 auto;
 }
 
+.file-thumb {
+	max-width: 128px;
+	max-height: 128px;
+}
+
 figure {
 }
 
diff --git a/models/forms/make-post.js b/models/forms/make-post.js
index a42989d9..aa0a1f58 100644
--- a/models/forms/make-post.js
+++ b/models/forms/make-post.js
@@ -109,7 +109,12 @@ module.exports = async (req, res, next, numFiles) => {
 					processedFile.geometry = imageData.size // object with width and height pixels
 					processedFile.sizeString = formatSize(processedFile.size) // 123 Ki string
 					processedFile.geometryString = imageData.Geometry // 123 x 123 string
-					await imageThumbnail(filename);
+					if (processedFile.geometry.height <= 128 && processedFile.geometry.width <= 128) {
+						processedFile.hasThumb = false;
+					} else {
+						processedFile.hasThumb = true;
+						await imageThumbnail(filename);
+					}
 					break;
 				case 'video':
 					//video metadata
@@ -120,6 +125,7 @@ module.exports = async (req, res, next, numFiles) => {
 					processedFile.geometry = {width: videoData.streams[0].coded_width, height: videoData.streams[0].coded_height} // object with width and height pixels
 					processedFile.sizeString = formatSize(processedFile.size) // 123 Ki string
 					processedFile.geometryString = `${processedFile.geometry.width}x${processedFile.geometry.height}` // 123 x 123 string
+					processedFile.hasThumb = true;
 					await videoThumbnail(filename);
 					break;
 				default:
diff --git a/views/mixins/post.pug b/views/mixins/post.pug
index 0d9785ee..a8ae0fd3 100644
--- a/views/mixins/post.pug
+++ b/views/mixins/post.pug
@@ -41,7 +41,7 @@ mixin post(post, truncate, manage=false, globalmanage=false)
 				.post-files
 					each file in post.files
 						.post-file
-							small.post-file-info
+							span.post-file-info
 								span: a(href='/img/'+file.filename title=file.originalFilename download=file.originalFilename) #{file.originalFilename}
 								br
 								span 
@@ -50,11 +50,13 @@ mixin post(post, truncate, manage=false, globalmanage=false)
 										| , #{file.durationString}
 									| )
 							.post-file-src
-								a(target='_blank' href='/img/'+file.filename)
+								a(target='_blank' href=`/img/${file.filename}`)
 									if post.spoiler
-										object(data='/img/spoiler.png' width='128' height='128')
+										object.file-thumb(data='/img/spoiler.png' width='128' height='128')
+									else if file.hasThumb
+										object.file-thumb(data=`/img/thumb-${file.filename.split('.')[0]}.jpg`)
 									else
-										object(data=`/img/thumb-${file.filename.split('.')[0]}.jpg`)
+										object.file-thumb(data=`/img/${file.filename}`)
 			if post.message
 				if truncate
 					-