diff --git a/gitbutler-ui/src/lib/components/AccountLink.svelte b/gitbutler-ui/src/lib/components/AccountLink.svelte
index 3ac85c953..ea2af07cb 100644
--- a/gitbutler-ui/src/lib/components/AccountLink.svelte
+++ b/gitbutler-ui/src/lib/components/AccountLink.svelte
@@ -49,6 +49,8 @@
 			color var(--transition-fast),
 			filter var(--transition-fast);
 
+		cursor: pointer;
+
 		&.pop {
 			color: var(--clr-theme-scale-pop-10);
 			background: color-mix(
diff --git a/gitbutler-ui/src/lib/components/Button.svelte b/gitbutler-ui/src/lib/components/Button.svelte
index 7fdbd8212..9cd5a7cdc 100644
--- a/gitbutler-ui/src/lib/components/Button.svelte
+++ b/gitbutler-ui/src/lib/components/Button.svelte
@@ -84,7 +84,9 @@
 		min-width: var(--size-btn-m);
 		background: transparent;
 		transition: background-color var(--transition-fast);
+		cursor: pointer;
 		&:disabled {
+			cursor: default;
 			pointer-events: none;
 			opacity: 0.6;
 		}
@@ -99,6 +101,7 @@
 			flex-direction: row-reverse;
 		}
 		&.not-clickable {
+			cursor: default;
 			pointer-events: none;
 		}
 	}
diff --git a/gitbutler-ui/src/lib/components/IconButton.svelte b/gitbutler-ui/src/lib/components/IconButton.svelte
index 650141c3a..d04c7255c 100644
--- a/gitbutler-ui/src/lib/components/IconButton.svelte
+++ b/gitbutler-ui/src/lib/components/IconButton.svelte
@@ -32,9 +32,9 @@
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
-		color: var(--clr-theme-scale-ntrl-40);
 		border-radius: var(--radius-m);
 		color: var(--clr-theme-scale-ntrl-50);
+		cursor: pointer;
 		transition:
 			background-color var(--transition-fast),
 			color var(--transition-fast);
@@ -45,6 +45,7 @@
 	}
 	.selected {
 		background-color: color-mix(in srgb, transparent, var(--darken-tint-light));
+		cursor: default;
 	}
 	.large {
 		height: var(--size-btn-l);
diff --git a/gitbutler-ui/src/lib/components/SegmentControl/Segment.svelte b/gitbutler-ui/src/lib/components/SegmentControl/Segment.svelte
index 57778c103..14fd8080e 100644
--- a/gitbutler-ui/src/lib/components/SegmentControl/Segment.svelte
+++ b/gitbutler-ui/src/lib/components/SegmentControl/Segment.svelte
@@ -84,6 +84,8 @@
 
 		transition: background var(--transition-fast);
 
+		cursor: pointer;
+
 		&:hover {
 			background-color: color-mix(
 				in srgb,
@@ -98,11 +100,15 @@
 			border-right-width: 1px;
 			border-left-width: 1px;
 
+			cursor: default;
+
 			& > .label {
 				color: var(--clr-theme-scale-ntrl-0);
+				cursor: default;
 			}
 			& > .icon {
 				color: var(--clr-theme-scale-ntrl-30);
+				cursor: default;
 			}
 			&.left {
 				border-right-width: 1px;
@@ -128,9 +134,11 @@
 		justify-content: center;
 		align-items: center;
 		color: var(--clr-theme-scale-ntrl-50);
+		cursor: pointer;
 	}
 
 	.label {
 		color: var(--clr-theme-scale-ntrl-40);
+		cursor: pointer;
 	}
 </style>
diff --git a/gitbutler-ui/src/lib/components/SyncButton.svelte b/gitbutler-ui/src/lib/components/SyncButton.svelte
index c5d413e6e..ae4062097 100644
--- a/gitbutler-ui/src/lib/components/SyncButton.svelte
+++ b/gitbutler-ui/src/lib/components/SyncButton.svelte
@@ -17,6 +17,7 @@
 
 <button
 	class="sync-btn"
+	class:sync-btn-busy={$baseServiceBusy$}
 	on:click={async (e) => {
 		e.preventDefault();
 		e.stopPropagation();
@@ -53,6 +54,12 @@
 		background: var(--clr-theme-container-light);
 		border: 1px solid var(--clr-theme-container-outline-light);
 		border-radius: var(--radius-m);
+		cursor: pointer;
+
+		&.sync-btn-busy {
+			cursor: default;
+		}
+
 		transition:
 			background var(--transition-fast),
 			border var(--transition-fast);
diff --git a/gitbutler-ui/src/lib/components/Tag.svelte b/gitbutler-ui/src/lib/components/Tag.svelte
index 323ec03f4..1f5dbfa93 100644
--- a/gitbutler-ui/src/lib/components/Tag.svelte
+++ b/gitbutler-ui/src/lib/components/Tag.svelte
@@ -79,7 +79,7 @@
 		padding: 0 var(--space-2);
 	}
 	.clickable {
-		cursor: default;
+		cursor: pointer;
 	}
 
 	/* colors */