diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/StoreExtensionItem.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/StoreExtensionItem.java
index aa976ed..45f7fd1 100644
--- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/StoreExtensionItem.java
+++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/StoreExtensionItem.java
@@ -51,7 +51,7 @@ public class StoreExtensionItem implements ContentItem {
                 .append("<div class=\"overview_item ").append(displayColor(i)).append(" content_item\">")
 
                 .append("<div class=\"overview_item_logo\">")
-                .append("<img src=\"").append(repository.getResourceUrl("store", "extensions", storeExtension.getTitle(), "icon.png")).append("\" alt=\"\">")
+                .append("<img src=\"").append(repository.getResourceUrl("store", "extensions", storeExtension.getTitle(), "icon.png")).append("\" alt=\"\" onerror=\"this.src=").append(repository.getResourceUrl("assets", "icons", "placeholder.png")).append("\">")
                 .append("</div>")
 
                 .append("<div class=\"overview_item_info\">")
diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java
index 63e9715..4e61642 100644
--- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java
+++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java
@@ -104,8 +104,10 @@ public class StoreExtensionDetailsItem implements ContentItem {
             contentBuilder.append("Warning: this extension has been marked unstable!\n\n");
         }
 
-        contentBuilder.append("\n*Screenshot: *").append("\n")
-                .append("--img:").append(gExtensionStore.getRepository().getResourceUrl("store", "extensions", storeExtension.getTitle(), "screenshot.png"));
+        contentBuilder.append("<div>"
+                .append("\n*Screenshot: *").append("\n")
+                .append("--img:").append(gExtensionStore.getRepository().getResourceUrl("store", "extensions", storeExtension.getTitle(), "screenshot.png"))
+                .append("</div>");
 
         return contentBuilder.toString();
     }
@@ -145,7 +147,7 @@ public class StoreExtensionDetailsItem implements ContentItem {
             line = line.replaceAll("\\*([^*]*)\\*", "<b>$1</b>")
                     .replaceAll("_([^_<>]*)_", "<i>$1</i>")
                     .replaceAll("(^| |>)@([^ <>]*)($| |<)", "$1<u>$2</u>$3")
-                    .replaceAll("--img:([^ ]*)", "<img src=\"$1\" alt=\"extension screenshot\">")
+                    .replaceAll("--img:([^ ]*)", "<img src=\"$1\" alt=\"extension screenshot\" onerror=\"this.parentNode.remove()\">")
                     .replaceAll("--url:([^-]*)-(https?:[^ ]*)",
                             String.format("<a href=\"#\" onClick=\"%s.openUrl(&quot;$2&quot;)\">$1</a>", id));
 //                    .replaceAll("([^\";])(https?:[^ ]*)",