diff --git a/css/context-menu.css b/css/context-menu.css
index acb03353..0a41c2b8 100644
--- a/css/context-menu.css
+++ b/css/context-menu.css
@@ -19,7 +19,6 @@
     padding: 0;
     margin: 0;
     border: 1px solid #a7a394;
-    cursor: default;
     box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
 }
 
diff --git a/css/playlist-window.css b/css/playlist-window.css
index 61827fdd..c44cd0f0 100644
--- a/css/playlist-window.css
+++ b/css/playlist-window.css
@@ -65,7 +65,6 @@
 #webamp .playlist-tracks {
     display: flex;
     flex: 1 0 auto;
-    cursor: default;
 }
 
 #webamp .playlist-tracks .track-cell {
diff --git a/js/components/Skin.js b/js/components/Skin.js
index baf62099..e3b585ea 100644
--- a/js/components/Skin.js
+++ b/js/components/Skin.js
@@ -117,7 +117,13 @@ const Skin = props => {
     if (cursorUrl) {
       cursorSelectors[cursorName].forEach(selector => {
         cssRules.push(
-          `${CSS_PREFIX} ${selector} {cursor: url(${cursorUrl}), auto}`
+          `${
+            // TODO: Fix this hack
+            // Maybe our CSS name spacing should be based on some other class/id
+            // than the one we use for defining the main div.
+            // That way it could be shared by both the player and the context menu.
+            selector.startsWith("#webamp-context-menu") ? "" : CSS_PREFIX
+          } ${selector} {cursor: url(${cursorUrl}), auto}`
         );
       });
     }
diff --git a/js/skinSelectors.js b/js/skinSelectors.js
index 833ea07a..9bbc7506 100644
--- a/js/skinSelectors.js
+++ b/js/skinSelectors.js
@@ -337,11 +337,12 @@ export const cursorSelectors = {
     "#equalizer-window.shade",
     "#equalizer-window.shade input"
   ],
-  MAINMENU: ["#main-window #option"],
+  MAINMENU: ["#main-window #option", "#webamp-context-menu .context-menu"],
   MIN: ["#main-window #minimize"],
   NORMAL: [
     // Use this as the default cursor.
     ".window",
+    ".window input", // Otherwise
     "#main-window",
     "#main-window.shade #title-bar"
   ],
@@ -367,7 +368,7 @@ export const cursorSelectors = {
   PVSCROLL: ["#playlist-window .playlist-scrollbar"],
   SONGNAME: ["#main-window #marquee"],
   TITLEBAR: ["#main-window #title-bar"],
-  VOLBAL: ["#volume", "#balance"],
+  VOLBAL: ["#volume", "#volume input", "#balance"],
   WINBUT: ["#main-window #shade"],
   WSNORMAL: ["#main-window.shade #title-bar"],
   WSPOSBAR: ["#main-window.shade #position"]
diff --git a/skins/base-2.91-png.wsz b/skins/base-2.91-png.wsz
index b982a9e0..5e2230e4 100644
Binary files a/skins/base-2.91-png.wsz and b/skins/base-2.91-png.wsz differ
diff --git a/skins/base-2.91-png/PTBAR.CUR b/skins/base-2.91-png/PTBAR.CUR
new file mode 100644
index 00000000..8b73d0ed
Binary files /dev/null and b/skins/base-2.91-png/PTBAR.CUR differ
diff --git a/skins/base-2.91.wsz b/skins/base-2.91.wsz
index 459bb72b..285675be 100644
Binary files a/skins/base-2.91.wsz and b/skins/base-2.91.wsz differ
diff --git a/skins/base-2.91/PTBAR.CUR b/skins/base-2.91/PTBAR.CUR
new file mode 100644
index 00000000..8b73d0ed
Binary files /dev/null and b/skins/base-2.91/PTBAR.CUR differ