diff --git a/frontend/src/lib/components/DataInput/DataInput.svelte b/frontend/src/lib/components/DataInput/DataInput.svelte
index 9015e3e..458e40d 100644
--- a/frontend/src/lib/components/DataInput/DataInput.svelte
+++ b/frontend/src/lib/components/DataInput/DataInput.svelte
@@ -63,7 +63,7 @@
 	<svelte:component
 		this={component}
 		class={highlight
-			? 'border-primary-600 dark:border-primary-600 rounded border-2 ' + componentClass
+			? 'rounded border-2 border-primary-600 dark:border-primary-600 ' + componentClass
 			: componentClass}
 		bind:value
 		{...properties}
diff --git a/frontend/src/lib/components/UserDataInput.svelte b/frontend/src/lib/components/UserDataInput.svelte
index a929785..260ba59 100644
--- a/frontend/src/lib/components/UserDataInput.svelte
+++ b/frontend/src/lib/components/UserDataInput.svelte
@@ -198,7 +198,7 @@
 			{#if dataIsCurrent === true}
 				<Button
 					type="button"
-					class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+					class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 					on:click={() => {
 						console.log('dataiscurrent click');
 						for (let element of data) {
@@ -215,7 +215,7 @@
 				</Button>
 			{:else}
 				<Button
-					class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+					class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 					type="submit">{$_('userData.submitButtonLabel')}</Button
 				>
 			{/if}