diff --git a/public/images/close.svg b/public/images/close.svg
new file mode 100644
index 0000000..c3b5907
--- /dev/null
+++ b/public/images/close.svg
@@ -0,0 +1,4 @@
+<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="16.9727" y1="5.65681" x2="5.65902" y2="16.9705" stroke="#B1B1B1" stroke-width="2"/>
+<line x1="16.9706" y1="16.9713" x2="5.65692" y2="5.65756" stroke="#B1B1B1" stroke-width="2"/>
+</svg>
diff --git a/src/pages/download/_downloadPythonPackage.js b/src/pages/download/_downloadPythonPackage.js
index 0c1e756..99446d9 100644
--- a/src/pages/download/_downloadPythonPackage.js
+++ b/src/pages/download/_downloadPythonPackage.js
@@ -60,17 +60,6 @@ function handlePartialSuccess(failedImages) {
   });
 }
 
-function handleNoGeneratedMockup() {
-  const description = `
-    <div>Try a different image/device. <br> If the issue persists, please report it on <a href='https://github.com/oursky/mockuphone.com/issues'>Github</a></div>
-  `;
-  showToast({
-    title: "No generated mockup",
-    description: description,
-    avatar: "/images/upload-error.svg",
-  });
-}
-
 function downloadGeneratedMockup(deviceId, images) {
   var zip = new JSZip();
   var count = 0;
@@ -112,8 +101,4 @@ export async function generateZIP(deviceId) {
   if (failedImages.length > 0 && images.size > 0) {
     handlePartialSuccess(failedImages);
   }
-
-  if (images.size === 0) {
-    handleNoGeneratedMockup();
-  }
 }
diff --git a/src/pages/model/_upload.js b/src/pages/model/_upload.js
index 217ec37..5cbe42e 100644
--- a/src/pages/model/_upload.js
+++ b/src/pages/model/_upload.js
@@ -3,6 +3,7 @@ import localforage from "localforage";
 import { ImageUpload, ImageUploadState } from "./models/_image-upload";
 import { isSameAspectRatio } from "./utils/_images";
 import { scrollToElementTop } from "./utils/_scroll";
+import { showToast } from "../../scripts/utils/toast/toast";
 
 let dragZoneCounter = 0; // https://stackoverflow.com/a/21002544/19287186
 const MAX_FILE_SIZE_BYTE = 104857600;
@@ -719,14 +720,33 @@ function main() {
     e.target.value = "";
   };
 
+  function handleNoGeneratedMockup() {
+    const description = `
+      <div>Try a different image/device. <br> If the issue persists, please report it on <a href='https://github.com/oursky/mockuphone.com/issues'>Github</a></div>
+    `;
+    showToast({
+      title: "No generated mockup",
+      description: description,
+      avatar: "/images/upload-error.svg",
+    });
+  }
+
   const navigateToDownloadPage = () => {
     window.location.href = "/download/?deviceId=" + window.workerDeviceId;
   };
 
   const onAllMockupGenerated = async (allGeneratedMockups) => {
-    localforage.setItem("generatedMockups", allGeneratedMockups).then(() => {
-      navigateToDownloadPage();
+    const haveGeneratedMockup = allGeneratedMockups.some((mockup) => {
+      return mockup.status === "success";
     });
+    if (haveGeneratedMockup) {
+      localforage.setItem("generatedMockups", allGeneratedMockups).then(() => {
+        navigateToDownloadPage();
+      });
+    } else {
+      window.viewModel.cancelMockup();
+      handleNoGeneratedMockup();
+    }
   };
 
   // observe fileListViewModel: isProcessing
diff --git a/src/scripts/utils/toast/toast.css b/src/scripts/utils/toast/toast.css
index 4c53893..81b08b8 100644
--- a/src/scripts/utils/toast/toast.css
+++ b/src/scripts/utils/toast/toast.css
@@ -1,14 +1,33 @@
 @import url("toastify-js/src/toastify.css");
 
 .toast-close {
-  color: black !important;
+  opacity: 1;
+  padding: 0;
+  margin-left: 20px;
 }
 
 .toast-header {
   display: flex;
-  gap: 12px;
-  margin-bottom: 8px;
+  gap: 10px;
+  margin-bottom: 16px;
   font-size: 20px;
-  font-weight: bold;
+  font-weight: 700;
   color: black;
+  align-items: center;
+}
+
+.toast-content {
+  font-size: 12px;
+  font-weight: 400;
+
+  ul {
+    margin-bottom: 16px;
+  }
+
+  a:hover,
+  a:link,
+  a:visited {
+    color: black;
+    text-decoration: underline;
+  }
 }
diff --git a/src/scripts/utils/toast/toast.ts b/src/scripts/utils/toast/toast.ts
index 2357ed1..c2aa844 100644
--- a/src/scripts/utils/toast/toast.ts
+++ b/src/scripts/utils/toast/toast.ts
@@ -7,6 +7,13 @@ interface ToastOptions extends StartToastifyInstance.Options {
   title?: string;
 }
 
+function updateCloseButton() {
+  const closeButtonNode = document.querySelector(".toast-close");
+  if (closeButtonNode) {
+    closeButtonNode.innerHTML = "<img src='/images/close.svg' >";
+  }
+}
+
 export function showToast(options: ToastOptions) {
   const { description, avatar, title } = options;
   const toastNode = document.createElement("div");
@@ -18,6 +25,7 @@ export function showToast(options: ToastOptions) {
     title ?? ""
   }</span>`;
 
+  toastMessage.classList.add("toast-content");
   toastMessage.innerHTML = description;
   toastNode.appendChild(toastHeader);
   toastNode.appendChild(toastMessage);
@@ -30,6 +38,9 @@ export function showToast(options: ToastOptions) {
       color: "black",
       alignItems: "start",
       justifyContent: "start",
+      boxShadow: "0px 4px 20px 0px rgba(0, 0, 0, 0.3)",
+      borderRadius: "10px",
+      padding: "20px",
     },
     onClick: function () {},
     duration: 3000,
@@ -39,4 +50,6 @@ export function showToast(options: ToastOptions) {
     stopOnFocus: true,
     ...options,
   }).showToast();
+
+  updateCloseButton();
 }