diff --git a/library/attachment-viewer/build.gradle b/library/attachment-viewer/build.gradle
index b89d9c6cca..57e5f30887 100644
--- a/library/attachment-viewer/build.gradle
+++ b/library/attachment-viewer/build.gradle
@@ -55,5 +55,6 @@ dependencies {
     implementation libs.androidx.appCompat
     implementation libs.androidx.recyclerview
 
-    implementation libs.google.material
+    api "androidx.viewpager2:viewpager2:1.0.0"
+    implementation "androidx.transition:transition:1.2.0"
 }
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
index 2b6c113359..edec029faf 100644
--- a/library/ui-styles/src/main/res/values/styles_pin_code.xml
+++ b/library/ui-styles/src/main/res/values/styles_pin_code.xml
@@ -21,18 +21,6 @@
         <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>
@@ -41,4 +29,4 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-</resources>
\ No newline at end of file
+</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 7177687fdd..185e5b919c 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -106,17 +106,6 @@
         <!-- 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 c90c021591..0eb11a139c 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -106,17 +106,6 @@
         <!-- 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+ -->