diff --git a/assets/appicon.png b/assets/appicon.png
new file mode 100644
index 0000000..6b2cc5a
Binary files /dev/null and b/assets/appicon.png differ
diff --git a/index.html b/index.html
index 119da42..1e77ebd 100644
--- a/index.html
+++ b/index.html
@@ -357,7 +357,7 @@
         
         <footer class="now-playing-bar">
             <div class="track-info">
-                <img src="https://resources.tidal.com/images/03b50002/d6f9/40e7/8b2e/0e9093cba2ac/80x80.jpg" alt="Current Track Cover" class="cover">
+                <img src="./assets/appicon.png" alt="Current Track Cover" class="cover">
                 <div class="details">
                     <div class="title">Select a song</div>
                     <div class="artist"></div>
diff --git a/js/app.js b/js/app.js
index 678bf7b..4ae254d 100644
--- a/js/app.js
+++ b/js/app.js
@@ -396,6 +396,49 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     window.loadHomeFeed = loadHomeFeed;
 
+    function positionContextMenu(menu, x, y, preferLeft = false) {
+        menu.style.display = 'block';
+        menu.style.visibility = 'hidden';
+        
+        const menuRect = menu.getBoundingClientRect();
+        const viewportWidth = window.innerWidth;
+        const viewportHeight = window.innerHeight;
+        
+        let finalX = x;
+        let finalY = y;
+        
+        if (preferLeft || (x + menuRect.width > viewportWidth)) {
+            finalX = x - menuRect.width;
+            if (finalX < 0) {
+                finalX = Math.min(x, viewportWidth - menuRect.width - 10);
+            }
+        }
+        
+        if (finalX < 10) {
+            finalX = 10;
+        }
+        
+        if (finalX + menuRect.width > viewportWidth - 10) {
+            finalX = viewportWidth - menuRect.width - 10;
+        }
+        
+        if (y + menuRect.height > viewportHeight) {
+            finalY = Math.max(10, y - menuRect.height);
+        }
+        
+        if (finalY + menuRect.height > viewportHeight - 10) {
+            finalY = viewportHeight - menuRect.height - 10;
+        }
+        
+        if (finalY < 10) {
+            finalY = 10;
+        }
+        
+        menu.style.left = `${finalX}px`;
+        menu.style.top = `${finalY}px`;
+        menu.style.visibility = 'visible';
+    }
+
     function updateLastFMUI() {
         if (scrobbler.isAuthenticated()) {
             lastfmStatus.textContent = `Connected as ${scrobbler.username}`;
@@ -808,11 +851,11 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     function showQueueTrackMenu(e, trackIndex) {
         const menu = document.getElementById('queue-track-menu');
-        menu.style.top = `${e.pageY}px`;
-        menu.style.left = `${e.pageX}px`;
         menu.classList.add('show');
         menu.dataset.trackIndex = trackIndex;
         
+        positionContextMenu(menu, e.pageX, e.pageY, true);
+        
         document.addEventListener('click', hideQueueTrackMenu);
     }
 
@@ -845,9 +888,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                 contextTrack = trackDataStore.get(trackItem);
                 if (contextTrack) {
                     const rect = menuBtn.getBoundingClientRect();
-                    contextMenu.style.top = `${rect.bottom + 5}px`;
-                    contextMenu.style.left = `${rect.left}px`;
-                    contextMenu.style.display = 'block';
+                    positionContextMenu(contextMenu, rect.left, rect.bottom + 5, true);
                 }
             }
             return;
@@ -877,9 +918,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             contextTrack = trackDataStore.get(trackItem);
             
             if (contextTrack) {
-                contextMenu.style.top = `${e.pageY}px`;
-                contextMenu.style.left = `${e.pageX}px`;
-                contextMenu.style.display = 'block';
+                positionContextMenu(contextMenu, e.pageX, e.pageY, true);
             }
         }
     });
@@ -1160,4 +1199,4 @@ document.addEventListener('DOMContentLoaded', async () => {
         e.preventDefault();
         deferredPrompt = e;
     });
-});
+});
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0a211d4..5453afc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,19 +9,19 @@
   "orientation": "portrait-primary",
   "icons": [
     {
-      "src": "/assets/192.png",
+      "src": "/assets/appicon.png",
       "sizes": "192x192",
       "type": "image/png",
       "purpose": "any"
     },
     {
-      "src": "/assets/512.png",
+      "src": "/assets/appicon.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "any"
     },
     {
-      "src": "/assets/512.png",
+      "src": "/assets/appicon.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "maskable"
diff --git a/styles.css b/styles.css
index 34f2ebd..a90be22 100644
--- a/styles.css
+++ b/styles.css
@@ -589,7 +589,10 @@ a {
     z-index: 10;
 }
 
-.track-item:hover .track-menu-btn,
+.track-item:hover .track-menu-btn {
+    opacity: 1;
+}
+
 @media (hover: none) {
     .track-menu-btn {
         opacity: 1;