diff --git a/website/cli.html b/website/cli.html
index 39215746..5bf5c4b2 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -77,7 +77,7 @@
 			
 			<div class="content">
 				<div class="main-section-screenshot">
-					<a target="_blank" href="screenshots/original/cli.rename.png"><img alt="screenshot" width="290" src="screenshots/original/cli.rename.png" /></a>
+					<a target="_blank" href="screenshots/cli.png"><img alt="FileBot command-line tools" width="330" src="screenshots/cli.png" /></a>
 				</div>
 				<div class="section about">
 					<h2>About</h2>
diff --git a/website/naming.html b/website/naming.html
index a34fecdf..53fb3d1a 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -78,8 +78,8 @@
 			
 			<div class="content">
 				<div class="screenshot">
-					<a href="gallery.html#screenshots/original/dialog.format.png" title="Format Dialog" target="_blank">
-						<img alt="screenshot" src="screenshots/medium/dialog.format.png" />
+					<a href="screenshots/format.png" title="Format Dialog" target="_blank">
+						<img alt="Edit Format Dialog" width="230" src="screenshots/format.png" />
 					</a>
 				</div>
 				<div class="section about">
diff --git a/website/screenshots/original/cli.rename.png b/website/screenshots/cli.png
similarity index 100%
rename from website/screenshots/original/cli.rename.png
rename to website/screenshots/cli.png
diff --git a/website/screenshots/format.png b/website/screenshots/format.png
new file mode 100644
index 00000000..1a62cd2a
Binary files /dev/null and b/website/screenshots/format.png differ
diff --git a/website/screenshots/medium/dialog.format.png b/website/screenshots/medium/dialog.format.png
deleted file mode 100644
index 7bd2206f..00000000
Binary files a/website/screenshots/medium/dialog.format.png and /dev/null differ
diff --git a/website/screenshots/original/dialog.format.png b/website/screenshots/original/dialog.format.png
deleted file mode 100644
index 56dec8f0..00000000
Binary files a/website/screenshots/original/dialog.format.png and /dev/null differ