diff --git a/embed.html b/embed.html
index 03a5d510..134c3f62 100644
--- a/embed.html
+++ b/embed.html
@@ -79,7 +79,7 @@
       >
         <video
           id="embedVideo"
-          class="h-full w-full object-contain bg-black"
+          class="h-full w-full object-contain"
           controls
           playsinline
           preload="metadata"
@@ -97,12 +97,12 @@
               target="_blank"
               class="flex items-center gap-2 rounded-full border border-white/20 bg-white/10 px-3 py-1.5 text-xs font-medium text-white transition-colors hover:bg-white/20 backdrop-blur-md"
             >
+              <span>Watch on</span>
               <img
                 src="assets/svg/bitvid-logo-light-mode.svg"
                 alt="BitVid"
-                class="h-4 w-auto"
+                class="h-4 w-auto invert brightness-0"
               />
-              <span>Watch on BitVid</span>
             </a>
 
             <div
diff --git a/js/app.js b/js/app.js
index be021a6d..3acd81ca 100644
--- a/js/app.js
+++ b/js/app.js
@@ -4923,8 +4923,19 @@ class Application {
   }
 
   getShareUrlBase() {
+    if (typeof BITVID_WEBSITE_URL === "string" && BITVID_WEBSITE_URL) {
+      // Ensure no trailing slash for consistency if desired, though buildShareUrlFromNevent
+      // appends ?v=... so trailing slash is fine if URL ctor handles it.
+      // BITVID_WEBSITE_URL usually has a trailing slash in config, but let's be safe.
+      return BITVID_WEBSITE_URL.replace(/\/$/, "");
+    }
+
     try {
       const current = new URL(window.location.href);
+      // If we are in the embed, we want to strip that filename.
+      if (current.pathname.endsWith("/embed.html")) {
+        return `${current.origin}${current.pathname.replace(/\/embed\.html$/, "")}`;
+      }
       return `${current.origin}${current.pathname}`;
     } catch (err) {
       const origin = window.location?.origin || "";
diff --git a/js/embed.js b/js/embed.js
index 945f3170..4f767b51 100644
--- a/js/embed.js
+++ b/js/embed.js
@@ -323,6 +323,20 @@ const setPointerState = ({ video, hint } = {}) => {
     app.currentVideo.pointer = app.currentVideoPointer;
     app.currentVideo.pointerKey = app.currentVideoPointerKey;
   }
+
+  // Ensure stats subscriptions are active since we don't go through playVideoByEventId
+  if (app.subscribeModalViewCount) {
+    app.subscribeModalViewCount(
+      app.currentVideoPointer,
+      app.currentVideoPointerKey
+    );
+  }
+  if (app.reactionController && app.reactionController.subscribe) {
+    app.reactionController.subscribe(
+      app.currentVideoPointer,
+      app.currentVideoPointerKey
+    );
+  }
 };
 
 const startEmbed = async () => {