diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index debfdf8649..31cfdd24c7 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -54,6 +54,10 @@ android {
 dependencies {
     implementation libs.androidx.appCompat
     implementation libs.google.material
+    // Pref theme
+    implementation libs.androidx.preferenceKtx
+    // PFLockScreen attrs
+    implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
     // dialpad dimen
     implementation 'im.dlg:android-dialer:1.2.5'
 }
diff --git a/library/ui-styles/src/main/res/drawable/bg_pin_key.xml b/library/ui-styles/src/main/res/drawable/bg_pin_key.xml
new file mode 100644
index 0000000000..5bf293aab0
--- /dev/null
+++ b/library/ui-styles/src/main/res/drawable/bg_pin_key.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item
+        android:gravity="center">
+        <shape android:shape="oval">
+            <solid android:color="#44FFFFFF" />
+            <size
+                android:width="70dp"
+                android:height="70dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
new file mode 100644
index 0000000000..879cac15ca
--- /dev/null
+++ b/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <stroke
+        android:color="?vctr_content_secondary"
+        android:width="1px"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
diff --git a/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
new file mode 100644
index 0000000000..83bdac5126
--- /dev/null
+++ b/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="?colorPrimary"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
diff --git a/library/ui-styles/src/main/res/drawable/pin_code_dots.xml b/library/ui-styles/src/main/res/drawable/pin_code_dots.xml
new file mode 100644
index 0000000000..c4b1073f85
--- /dev/null
+++ b/library/ui-styles/src/main/res/drawable/pin_code_dots.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- NOTE: order is important (the first matching state(s) is what is rendered) -->
+    <item
+        android:state_checked="true"
+        android:drawable="@drawable/pin_code_dot_fill"/>
+    <item
+        android:drawable="@drawable/pin_code_dot_empty"/>
+</selector>
diff --git a/library/ui-styles/src/main/res/values/styles_pin_code.xml b/library/ui-styles/src/main/res/values/styles_pin_code.xml
new file mode 100644
index 0000000000..cb22863694
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_pin_code.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="PinCodeScreenStyle" >
+        <item name="android:background">?android:colorBackground</item>
+    </style>
+
+    <style name="PinCodeKeyButtonStyle">
+        <item name="android:textColor">?vctr_content_primary</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:background">@drawable/bg_pin_key</item>
+    </style>
+
+    <style name="PinCodeDotsViewStyle">
+        <item name="android:button">@drawable/pin_code_dots</item>
+    </style>
+
+    <style name="PinCodeNextButtonStyle" parent="Widget.Vector.Button">
+        <item name="android:textSize">18sp</item>
+        <item name="android:backgroundTint">@android:color/transparent</item>
+        <item name="android:layout_marginBottom">24dp</item>
+    </style>
+
+    <style name="PinCodeDeleteButtonStyle">
+        <item name="android:src">@drawable/delete_lockscreen_pf</item>
+        <item name="android:tint">?vctr_content_primary</item>
+        <item name="background">@drawable/bg_pin_key</item>
+    </style>
+
+    <style name="PinCodeFingerprintButtonStyle">
+        <item name="android:src">@drawable/fingerprint_lockscreen_pf</item>
+        <item name="android:tint">?vctr_content_primary</item>
+        <item name="background">@drawable/bg_pin_key</item>
+    </style>
+
+    <style name="PinCodeTitleStyle">
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
+    <style name="PinCodeHintStyle">
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 185e5b919c..7177687fdd 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -106,6 +106,17 @@
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
         <item name="android:overScrollMode">never</item>
 
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
+        <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
+        <item name="pf_title">@style/PinCodeTitleStyle</item>
+        <item name="pf_hint">@style/PinCodeHintStyle</item>
+        <item name="pf_code_view">@style/PinCodeDotsViewStyle</item>
+        <item name="pf_delete_button">@style/PinCodeDeleteButtonStyle</item>
+        <item name="pf_fingerprint_button">@style/PinCodeFingerprintButtonStyle</item>
+        <item name="pf_next">@style/PinCodeNextButtonStyle</item>
+
         <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
         <item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item>
 
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 0eb11a139c..c90c021591 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -106,6 +106,17 @@
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
         <item name="android:overScrollMode">never</item>
 
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
+        <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
+        <item name="pf_title">@style/PinCodeTitleStyle</item>
+        <item name="pf_hint">@style/PinCodeHintStyle</item>
+        <item name="pf_code_view">@style/PinCodeDotsViewStyle</item>
+        <item name="pf_delete_button">@style/PinCodeDeleteButtonStyle</item>
+        <item name="pf_fingerprint_button">@style/PinCodeFingerprintButtonStyle</item>
+        <item name="pf_next">@style/PinCodeNextButtonStyle</item>
+
         <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
         <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
         <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
diff --git a/vector/build.gradle b/vector/build.gradle
index 237754d2d1..6d318f82b9 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -6,6 +6,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.likethesalad.stem'
+apply plugin: 'dagger.hilt.android.plugin'
 
 kapt {
     correctErrorTypes = true
@@ -446,6 +447,7 @@ dependencies {
     implementation 'com.github.jetradarmobile:android-snowfall:1.2.1'
     // DI
     implementation libs.dagger.hilt
+    kapt libs.dagger.hiltCompiler
 
     // Analytics
     implementation 'com.posthog.android:posthog:1.1.2'