diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index ef707d6da2e..0157fa23926 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -75,4 +75,6 @@
     <dimen name="confirm_credentials_security_method_margin">72dp</dimen>
     <dimen name="confirm_credentials_layout_width">328dp</dimen>
     <dimen name="confirm_credentials_top_padding">48dp</dimen>
+    <dimen name="confirm_credentials_side_margin">0dp</dimen>
+    <dimen name="confirm_credentials_top_margin">64dp</dimen>
 </resources>
diff --git a/res/values-sw600dp/themes.xml b/res/values-sw600dp/themes.xml
index f26e2f5a0c8..741aecbe53e 100644
--- a/res/values-sw600dp/themes.xml
+++ b/res/values-sw600dp/themes.xml
@@ -17,7 +17,7 @@
   -->
 <resources>
     <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
-      <item name="confirmDeviceCredentialsSideMargin">0dp</item>
-      <item name="confirmDeviceCredentialsTopMargin">64dp</item>
+      <item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
+      <item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6d7b35e1f68..a8586f76e70 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -240,6 +240,8 @@
     <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
     <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>
     <dimen name="confirm_credentials_top_padding">0dp</dimen>
+    <dimen name="confirm_credentials_side_margin">16dp</dimen>
+    <dimen name="confirm_credentials_top_margin">16dp</dimen>
 
     <!-- Delete managed profile dialog -->
     <dimen name="delete_profile_dialog_padding_top">16dp</dimen>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8eda3aa679e..b9f69cfd3f9 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -250,8 +250,8 @@
     </style>
 
     <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
-        <item name="confirmDeviceCredentialsSideMargin">16dp</item>
-        <item name="confirmDeviceCredentialsTopMargin">16dp</item>
+        <item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
+        <item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
     </style>
 
     <style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.DeviceDefault">