diff --git a/src/migrations/hotbar-store/5.0.0-beta.4.ts b/src/migrations/hotbar-store/5.0.0-beta.4.ts
index a8d3be0fd6..2c1060126a 100644
--- a/src/migrations/hotbar-store/5.0.0-beta.4.ts
+++ b/src/migrations/hotbar-store/5.0.0-beta.4.ts
@@ -1,4 +1,4 @@
-import { Hotbar } from "../../common/hotbar-store";
+import type { Hotbar } from "../../common/hotbar-store";
 import { migration } from "../migration-wrapper";
 import { catalogEntityRegistry } from "../../renderer/api/catalog-entity-registry";
 
diff --git a/src/migrations/hotbar-store/index.ts b/src/migrations/hotbar-store/index.ts
index 57f0c2a67a..c4a055f0db 100644
--- a/src/migrations/hotbar-store/index.ts
+++ b/src/migrations/hotbar-store/index.ts
@@ -7,5 +7,5 @@ import version500beta4 from "./5.0.0-beta.4";
 export default {
   ...version500alpha0,
   ...version500alpha2,
-  ...version500beta4
+  ...version500beta4,
 };
diff --git a/src/renderer/components/+catalog/material-tooltip/material-tooltip.tsx b/src/renderer/components/+catalog/material-tooltip/material-tooltip.tsx
index bd10dde78c..dbfd8b5323 100644
--- a/src/renderer/components/+catalog/material-tooltip/material-tooltip.tsx
+++ b/src/renderer/components/+catalog/material-tooltip/material-tooltip.tsx
@@ -3,12 +3,12 @@ import { makeStyles, Tooltip, TooltipProps } from "@material-ui/core";
 
 const useStyles = makeStyles(() => ({
   arrow: {
-    color: "#18191c",
+    color: "var(--tooltipBackground)",
   },
   tooltip: {
     fontSize: 12,
-    backgroundColor: "#18191c",
-    color: "#fff",
+    backgroundColor: "var(--tooltipBackground)",
+    color: "var(--textColorAccent)",
     padding: 8,
     boxShadow: "0 8px 16px rgba(0,0,0,0.24)"
   },
diff --git a/src/renderer/components/hotbar/hotbar-cell.tsx b/src/renderer/components/hotbar/hotbar-cell.tsx
index f4fb3d9ac7..aa19faa052 100644
--- a/src/renderer/components/hotbar/hotbar-cell.tsx
+++ b/src/renderer/components/hotbar/hotbar-cell.tsx
@@ -15,11 +15,7 @@ export function HotbarCell({ innerRef, children, className, ...rest }: Props) {
   const [animating, setAnimating] = useState(false);
   const onAnimationEnd = () => { setAnimating(false); };
   const onClick = () => {
-    if (className.includes("isDraggingOver")) {
-      return;
-    }
-
-    setAnimating(true);
+    setAnimating(!className.includes("isDraggingOver"));
   };
 
   return (
diff --git a/src/renderer/themes/lens-dark.json b/src/renderer/themes/lens-dark.json
index 0082f9ce63..f96eb81453 100644
--- a/src/renderer/themes/lens-dark.json
+++ b/src/renderer/themes/lens-dark.json
@@ -128,6 +128,7 @@
     "settingsColor": "#909ba6",
     "navSelectedBackground": "#262b2e",
     "navHoverColor": "#dcddde",
-    "hrColor": "#ffffff0f"
+    "hrColor": "#ffffff0f",
+    "tooltipBackground": "#18191c"
   }
 }
diff --git a/src/renderer/themes/lens-light.json b/src/renderer/themes/lens-light.json
index 5a4365b500..d3b5938de3 100644
--- a/src/renderer/themes/lens-light.json
+++ b/src/renderer/themes/lens-light.json
@@ -130,6 +130,7 @@
     "settingsColor": "#555555",
     "navSelectedBackground": "#ffffff",
     "navHoverColor": "#2e3135",
-    "hrColor": "#06060714"
+    "hrColor": "#06060714",
+    "tooltipBackground": "#ffffff"
   }
 }