diff --git a/packages/client/package.json b/packages/client/package.json
index 2a1dadeb4..9816f6963 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -87,6 +87,7 @@
 		"vue-isyourpasswordsafe": "^2.0.0",
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
+		"vue3-otp-input": "^0.4.1",
 		"vuedraggable": "4.1.0"
 	}
 }
diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue
index 634d5932e..13da5d7ab 100644
--- a/packages/client/src/components/MkSignin.vue
+++ b/packages/client/src/components/MkSignin.vue
@@ -99,18 +99,15 @@
 							><i class="ph-lock ph-bold ph-lg"></i
 						></template>
 					</MkInput>
-					<MkInput
+					<vue3-otp-input
+						input-classes="otp-input"
+						inputType="number"
+						:num-inputs="6"
 						v-model="token"
-						type="text"
-						pattern="^[0-9]{6}$"
-						autocomplete="one-time-code"
-						:spellcheck="false"
+						:should-auto-focus="true"
+						@on-complete="onSubmit"
 						required
-					>
-						<template #prefix>
-							<i class="ph-poker-chip ph-bold ph-lg"></i>
-						</template>
-					</MkInput>
+					/>
 					<MkButton
 						type="submit"
 						:disabled="signing"
@@ -159,6 +156,7 @@
 </template>
 
 <script lang="ts" setup>
+import Vue3OtpInput from "vue3-otp-input";
 import { defineAsyncComponent } from "vue";
 import { toUnicode } from "punycode/";
 import MkButton from "@/components/MkButton.vue";
@@ -392,4 +390,27 @@ function showSuspendedDialog() {
 		}
 	}
 }
+
+.otp-input {
+  width: 40px;
+  height: 40px;
+  padding: 5px;
+  margin: 0 10px;
+  font-size: 20px;
+  border-radius: 4px;
+  border: 2px solid var(--accent);
+	background-color: var(--accentedBg);
+  text-align: center;
+}
+.otp-input.is-complete {
+	border-color: var(--success) !important;
+}
+.otp-input.error {
+  border-color: var(--error) !important;
+}
+.otp-input::-webkit-inner-spin-button,
+.otp-input::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
 </style>
diff --git a/packages/client/src/pages/settings/2fa.qrdialog.vue b/packages/client/src/pages/settings/2fa.qrdialog.vue
index f6e6e3595..76d962e21 100644
--- a/packages/client/src/pages/settings/2fa.qrdialog.vue
+++ b/packages/client/src/pages/settings/2fa.qrdialog.vue
@@ -94,5 +94,7 @@ const ok = () => {
 .qr {
 	width: 20em;
 	max-width: 100%;
+	border-radius: 10px;
+	border: 3px solid var(--accent);
 }
 </style>
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index 45915d965..56a4cca0f 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -5,7 +5,10 @@
 		<div v-if="$i" class="_gaps_s">
 			<MkFolder>
 				<template #icon
-					><i class="ph-shield-check ph-bold ph-lg"></i
+					><i
+						class="ph-shield-check ph-bold ph-lg"
+						style="margin-right: 0.5rem"
+					></i
 				></template>
 				<template #label>{{ i18n.ts.totp }}</template>
 				<template #caption>{{ i18n.ts.totpDescription }}</template>
@@ -13,13 +16,19 @@
 					<div v-text="i18n.ts._2fa.alreadyRegistered" />
 					<template v-if="$i.securityKeysList.length > 0">
 						<MkButton @click="renewTOTP"
-							><i class="ph-shield-check ph-bold ph-lg"></i
+							><i
+								class="ph-shield-check ph-bold ph-lg"
+								style="margin-right: 0.5rem"
+							></i
 							>{{ i18n.ts._2fa.renewTOTP }}</MkButton
 						>
 						<MkInfo>{{ i18n.ts._2fa.whyTOTPOnlyRenew }}</MkInfo>
 					</template>
 					<MkButton v-else @click="unregisterTOTP"
-						><i class="ph-shield-slash ph-bold ph-lg"></i
+						><i
+							class="ph-shield-slash ph-bold ph-lg"
+							style="margin-right: 0.5rem"
+						></i
 						>{{ i18n.ts.unregister }}</MkButton
 					>
 				</div>
@@ -32,7 +41,12 @@
 			</MkFolder>
 
 			<MkFolder>
-				<template #icon><i class="ph-key ph-bold ph-lg"></i></template>
+				<template #icon
+					><i
+						class="ph-key ph-bold ph-lg"
+						style="margin-right: 0.5rem"
+					></i
+				></template>
 				<template #label>{{ i18n.ts.securityKeyAndPasskey }}</template>
 				<div class="_gaps_s">
 					<MkInfo>
@@ -54,7 +68,10 @@
 
 					<template v-else>
 						<MkButton primary @click="addSecurityKey"
-							><i class="ph-key ph-bold ph-lg"></i
+							><i
+								class="ph-key ph-bold ph-lg"
+								style="margin-right: 0.5rem"
+							></i
 							>{{ i18n.ts._2fa.registerSecurityKey }}</MkButton
 						>
 						<MkFolder
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2ecab716a..e1c51be05 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -906,6 +906,9 @@ importers:
       vue-prism-editor:
         specifier: 2.0.0-alpha.2
         version: 2.0.0-alpha.2(vue@3.3.4)
+      vue3-otp-input:
+        specifier: ^0.4.1
+        version: 0.4.1(vue@3.3.4)
       vuedraggable:
         specifier: 4.1.0
         version: 4.1.0(vue@3.3.4)
@@ -15213,6 +15216,15 @@ packages:
       vue: 3.3.4
     dev: true
 
+  /vue3-otp-input@0.4.1(vue@3.3.4):
+    resolution: {integrity: sha512-wVl9i3DcWlO0C7fBI9V+RIP3crm/1tY72fuhvb3YM2JfbLoYofB96aPl5AgFhA0Cse5bQEMYtIvOeiqW3rfbAw==}
+    engines: {node: '>=16.0.0', npm: '>=8.0.0'}
+    peerDependencies:
+      vue: ^3.0.*
+    dependencies:
+      vue: 3.3.4
+    dev: true
+
   /vue@2.7.14:
     resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
     dependencies: