diff --git a/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.module.scss b/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.module.scss
index 50ca4ee8c..9045d2685 100644
--- a/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.module.scss
+++ b/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.module.scss
@@ -5,12 +5,17 @@
 }
 
 .interfaces {
-  padding: 0.5rem 1rem;
+  padding: 0.5rem 0.5rem;
   display: flex;
   flex-wrap: wrap;
   gap: 0.5rem;
 }
 
+.interfaceCopy {
+  display: flex;
+  align-items: center;
+}
+
 .goIcon {
   @include rotate-fourty-five;
   margin-left: 0.25rem;
diff --git a/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.tsx b/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.tsx
index 35d3f6caf..69f3dfce3 100644
--- a/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.tsx
+++ b/apps/client/src/common/components/navigation-menu/other-addresses/OtherAddresses.tsx
@@ -30,8 +30,10 @@ export default function OtherAddresses({ currentLocation }: OtherAddressesProps)
           const address = linkToOtherHost(nif.address, currentLocation);
 
           return (
-            <CopyTag key={nif.name} copyValue={address} onClick={() => openLink(address)}>
-              {nif.address} <IoArrowUp className={style.goIcon} />
+            <CopyTag key={nif.name} copyValue={address} onClick={() => openLink(address)} size='small'>
+              <span className={style.interfaceCopy}>
+                {nif.address} <IoArrowUp className={style.goIcon} />
+              </span>
             </CopyTag>
           );
         })}
diff --git a/apps/client/src/common/components/switch/Switch.module.scss b/apps/client/src/common/components/switch/Switch.module.scss
index d350fb383..7777fd811 100644
--- a/apps/client/src/common/components/switch/Switch.module.scss
+++ b/apps/client/src/common/components/switch/Switch.module.scss
@@ -22,6 +22,11 @@
     outline: 2px solid $blue-500;
     outline-offset: 2px;
   }
+
+  &[data-disabled] {
+    opacity: $opacity-disabled;
+    cursor: not-allowed;
+  }
 }
 
 .medium {
@@ -50,4 +55,5 @@
   &[data-checked] {
     translate: calc(var(--width) - var(--height)) 0;
   }
+
 }
diff --git a/apps/client/src/features/rundown/rundown-block/RundownBlock.tsx b/apps/client/src/features/rundown/rundown-block/RundownBlock.tsx
index 21d6bdb41..23d2e4681 100644
--- a/apps/client/src/features/rundown/rundown-block/RundownBlock.tsx
+++ b/apps/client/src/features/rundown/rundown-block/RundownBlock.tsx
@@ -95,7 +95,7 @@ export default function RundownBlock({ data, hasCursor, collapsed, onCollapse }:
     zIndex: isDragging ? 2 : 'inherit',
     transform: CSS.Translate.toString(transform),
     transition,
-    cursor: isOver ? (isValidDrop ? 'grabbing' : 'no-drop') : 'default',
+    cursor: isOver ? (isValidDrop ? 'grabbing' : 'no-drop') : 'grab',
   };
 
   return (
diff --git a/apps/client/src/features/rundown/rundown-delay/RundownDelay.tsx b/apps/client/src/features/rundown/rundown-delay/RundownDelay.tsx
index b3ae36237..8cb2f0bc9 100644
--- a/apps/client/src/features/rundown/rundown-delay/RundownDelay.tsx
+++ b/apps/client/src/features/rundown/rundown-delay/RundownDelay.tsx
@@ -37,6 +37,7 @@ export default function RundownDelay({ data, hasCursor }: RundownDelayProps) {
 
   const dragStyle = {
     zIndex: isDragging ? 2 : 'inherit',
+    cursor: isDragging ? 'grabbing' : 'grab',
     transform: CSS.Translate.toString(transform),
     transition,
   };
diff --git a/apps/client/src/features/rundown/rundown-event/RundownEvent.tsx b/apps/client/src/features/rundown/rundown-event/RundownEvent.tsx
index 77f3684e2..f519783ab 100644
--- a/apps/client/src/features/rundown/rundown-event/RundownEvent.tsx
+++ b/apps/client/src/features/rundown/rundown-event/RundownEvent.tsx
@@ -201,6 +201,7 @@ export default function RundownEvent({
 
   const dragStyle = {
     zIndex: isDragging ? 2 : 'inherit',
+    cursor: isDragging ? 'grabbing' : 'grab',
     transform: CSS.Translate.toString(transform),
     transition,
   };
diff --git a/apps/client/src/features/rundown/rundown-milestone/RundownMilestone.tsx b/apps/client/src/features/rundown/rundown-milestone/RundownMilestone.tsx
index 6c083478c..5afccd33f 100644
--- a/apps/client/src/features/rundown/rundown-milestone/RundownMilestone.tsx
+++ b/apps/client/src/features/rundown/rundown-milestone/RundownMilestone.tsx
@@ -70,6 +70,7 @@ export default function RundownMilestone({ colour, cue, entryId, hasCursor, titl
 
   const dragStyle = {
     zIndex: isDragging ? 2 : 'inherit',
+    cursor: isDragging ? 'grabbing' : 'grab',
     transform: CSS.Translate.toString(transform),
     transition,
   };
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SortableCell.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SortableCell.tsx
index 7752bc947..7d0d568a6 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SortableCell.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SortableCell.tsx
@@ -15,13 +15,15 @@ interface SortableCellProps {
 export function SortableCell({ header, injectedStyles, children }: SortableCellProps) {
   const { column, colSpan } = header;
 
-  const { attributes, listeners, setNodeRef, transform, transition } = useSortable({
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
     id: column.id,
   });
 
   // build drag styles
   const dragStyle = {
     ...injectedStyles,
+    zIndex: isDragging ? 2 : 'inherit',
+    cursor: isDragging ? 'grabbing' : 'grab',
     transform: CSS.Translate.toString(transform),
     transition,
   };