diff --git a/public_html/media/css/post-small.css b/public_html/media/css/post-small.css
index 4f6aa8ad..abfa714a 100644
--- a/public_html/media/css/post-small.css
+++ b/public_html/media/css/post-small.css
@@ -6,8 +6,17 @@
 	display: inline-block;
 }
 .post-type-flash {
-	border-color: #dd5;
-	box-shadow: 0.25em 0.25em #eeb, 0.1em 0.1em 0.5em 0.1em rgba(238,238,187,0.5);
+	border-color: red;
+}
+.post-type-flash:after {
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 150px;
+	height: 150px;
+	content: ' ';
+	background: url('../img/thumb-overlay-swf.png');
+	pointer-events: none;
 }
 
 .post:focus,
diff --git a/public_html/media/css/upload.css b/public_html/media/css/upload.css
index edf04c09..fdcf7a0f 100644
--- a/public_html/media/css/upload.css
+++ b/public_html/media/css/upload.css
@@ -30,7 +30,8 @@
 	width: 100px;
 	height: 100px;
 	line-height: 100px;
-	background-image: url('../img/thumb-upload.png');
+	background-image: url('../img/thumb.png');
+	background-size: 100px 100px;
 	border: 1px solid black;
 	vertical-align: middle;
 	text-align: center;
diff --git a/public_html/media/img/thumb-overlay-swf.png b/public_html/media/img/thumb-overlay-swf.png
new file mode 100644
index 00000000..dc3de9f8
Binary files /dev/null and b/public_html/media/img/thumb-overlay-swf.png differ
diff --git a/public_html/media/img/thumb-swf.png b/public_html/media/img/thumb-swf.png
deleted file mode 100644
index 3100aa53..00000000
Binary files a/public_html/media/img/thumb-swf.png and /dev/null differ
diff --git a/public_html/media/img/thumb-upload.png b/public_html/media/img/thumb-upload.png
deleted file mode 100644
index dbc3d48c..00000000
Binary files a/public_html/media/img/thumb-upload.png and /dev/null differ
diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
index 60795e5d..5897fc9c 100644
--- a/src/Controllers/PostController.php
+++ b/src/Controllers/PostController.php
@@ -596,11 +596,8 @@ class PostController
 						if (file_exists($tmpPath))
 							$srcImage = imagecreatefrompng($tmpPath);
 					}
-					if (!$srcImage)
-						$path = $this->config->main->mediaPath . DS . 'img' . DS . 'thumb-swf.png';
 					break;
 				default:
-					$path = $this->config->main->mediaPath . DS . 'img' . DS . 'thumb.png';
 					break;
 			}
 
@@ -622,6 +619,10 @@ class PostController
 				imagedestroy($srcImage);
 				imagedestroy($dstImage);
 			}
+			else
+			{
+				$path = $this->config->main->mediaPath . DS . 'img' . DS . 'thumb.png';
+			}
 		}
 		if (!is_readable($path))
 			throw new SimpleException('Thumbnail file is not readable');