diff --git a/docs/graphics/launcher_options_snapshots.png b/docs/graphics/launcher_options_snapshots.png
index 40de9d003..6139b66bc 100644
Binary files a/docs/graphics/launcher_options_snapshots.png and b/docs/graphics/launcher_options_snapshots.png differ
diff --git a/docs/graphics/options_ui.png b/docs/graphics/options_ui.png
index c5f694623..eb2d4a605 100644
Binary files a/docs/graphics/options_ui.png and b/docs/graphics/options_ui.png differ
diff --git a/docs/index.html b/docs/index.html
index c1d77fd7d..6fe83e762 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2184,7 +2184,7 @@
 
     <tr>
       <td><pre>-snaploaddir &lt;path&gt;</pre></td>
-      <td>The directory to load snapshot files from.</td>
+      <td>The directory to load ROM info viewer snaposhot files from.</td>
     </tr>
 
     <tr>
@@ -2723,7 +2723,7 @@
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
           <tr><td>Save path</td><td>Specifies where to save snapshots</td><td>-snapsavedir</td></tr>
-          <tr><td>Load path</td><td>Specifies where to load snapshots</td><td>-snaploaddir</td></tr>
+   		  <!--<tr><td>Load path</td><td>Specifies where to load snapshots</td><td>-snaploaddir</td></tr>  -->
           <tr><td>Continuous snapshot interval</td><td>Interval (in seconds) between snapshots</td><td>-ssinterval</td></tr>
           <tr><td>Use actual ROM name</td><td>Use the actual ROM filename instead of the internal database name.</td><td>-snapname</td></tr>
           <tr><td>Overwrite existing files</td><td>Whether to overwrite old snapshots</td><td>-sssingle</td></tr>
diff --git a/src/common/PNGLibrary.cxx b/src/common/PNGLibrary.cxx
index 0a3f22353..6c1f3d5dd 100644
--- a/src/common/PNGLibrary.cxx
+++ b/src/common/PNGLibrary.cxx
@@ -49,7 +49,7 @@ void PNGLibrary::loadImage(const string& filename, FBSurface& surface)
 
   ifstream in(filename, std::ios_base::binary);
   if(!in.is_open())
-    loadImageERROR("No image found");
+    loadImageERROR("No snapshot found");
 
   // Create the PNG loading context structure
   png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr,