diff --git a/src/lib/components/fitness/RestTimer.svelte b/src/lib/components/fitness/RestTimer.svelte
index 6ae4c6b..9e7d134 100644
--- a/src/lib/components/fitness/RestTimer.svelte
+++ b/src/lib/components/fitness/RestTimer.svelte
@@ -41,13 +41,13 @@
 		overflow: hidden;
 		position: relative;
 		height: 2.2rem;
-		background: var(--color-bg-elevated);
+		background: var(--nord0);
 	}
 	.bar-fill {
 		position: absolute;
 		inset: 0;
 		width: 100%;
-		background: var(--color-primary);
+		background: var(--blue);
 		border-radius: 8px;
 		transition: width 1s linear;
 	}
@@ -66,14 +66,14 @@
 		font-size: 0.9rem;
 		font-weight: 700;
 		font-variant-numeric: tabular-nums;
-		color: var(--color-text-primary, inherit);
+		color: white;
 		cursor: pointer;
 		padding: 0.2rem 0.5rem;
 	}
 	.adjust-btn {
 		background: none;
 		border: none;
-		color: var(--color-text-primary, inherit);
+		color: white;
 		cursor: pointer;
 		font-size: 0.7rem;
 		font-weight: 600;
diff --git a/src/lib/components/fitness/SetTable.svelte b/src/lib/components/fitness/SetTable.svelte
index 5f463a6..df43ce3 100644
--- a/src/lib/components/fitness/SetTable.svelte
+++ b/src/lib/components/fitness/SetTable.svelte
@@ -77,7 +77,7 @@
 			{/if}
 			<th class="col-set">SET</th>
 			{#if previousSets}
-				<th class="col-prev">PREVIOUS</th>
+				<th class="col-prev">PREV</th>
 			{/if}
 			{#each mainMetrics as metric (metric)}
 				<th class="col-metric">{METRIC_LABELS[metric]}</th>
@@ -114,7 +114,7 @@
 					</td>
 				{/if}
 				{#each mainMetrics as metric (metric)}
-					<td class="col-metric">
+					<td class="col-metric" class:col-weight={metric === 'weight'}>
 						{#if editable}
 							<input
 								type="number"
@@ -210,6 +210,12 @@
 	.col-metric {
 		width: 4rem;
 	}
+	.col-weight {
+		width: 5.5rem;
+	}
+	.col-weight input {
+		max-width: 5.5rem;
+	}
 	.col-metric:has(+ .col-at) {
 		padding-right: 0;
 	}
@@ -241,6 +247,13 @@
 		padding: 0.3rem 0.25rem;
 		font-size: 0.875rem;
 		color: inherit;
+		-moz-appearance: textfield;
+		appearance: textfield;
+	}
+	input::-webkit-outer-spin-button,
+	input::-webkit-inner-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
 	}
 	.col-rpe input {
 		max-width: 3rem;