diff --git a/app/src/main/res/layout/bottom_sheet_encryption_actions.xml b/app/src/main/res/layout/bottom_sheet_encryption_actions.xml
index d260ac7038e..25b1b3f3e72 100644
--- a/app/src/main/res/layout/bottom_sheet_encryption_actions.xml
+++ b/app/src/main/res/layout/bottom_sheet_encryption_actions.xml
@@ -20,6 +20,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:theme="@style/EncryptionPrimaryColorTheme"
     tools:context=".ui.newMessage.encryption.EncryptionActionsBottomSheet">
 
     <TextView
@@ -32,7 +33,7 @@
         android:paddingVertical="@dimen/marginStandardSmall"
         android:text="@string/encryptedStatePanelTitle"
         app:drawableStartCompat="@drawable/ic_shield_lock"
-        app:drawableTint="@color/encryptionIconColor" />
+        app:drawableTint="?attr/colorPrimary" />
 
     <TextView
         android:id="@+id/encryptionStatusDescription"
@@ -48,7 +49,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:icon="@drawable/ic_lock_password_field"
-        app:iconColor="@color/encryptionIconColor"
+        app:iconColor="?attr/colorPrimary"
         app:title="@string/encryptedMessageAddPasswordButton"
         app:visibleDivider="false" />
 
@@ -57,7 +58,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:icon="@drawable/ic_lock_open"
-        app:iconColor="@color/encryptionIconColor"
+        app:iconColor="?attr/colorPrimary"
         app:title="@string/encryptedMessageDisableEncryptionButton" />
 
 </com.infomaniak.mail.views.BottomSheetScaffoldingView>
diff --git a/app/src/main/res/layout/bottom_sheet_encryption_discovery.xml b/app/src/main/res/layout/bottom_sheet_encryption_discovery.xml
index 300a9284736..ef450d74025 100644
--- a/app/src/main/res/layout/bottom_sheet_encryption_discovery.xml
+++ b/app/src/main/res/layout/bottom_sheet_encryption_discovery.xml
@@ -17,9 +17,9 @@
   -->
 <com.infomaniak.mail.views.BottomSheetScaffoldingView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:theme="@style/EncryptionPrimaryColorTheme">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/bottom_sheet_unencryptable_recipients.xml b/app/src/main/res/layout/bottom_sheet_unencryptable_recipients.xml
index 5e53e32b41f..c2198cc32fa 100644
--- a/app/src/main/res/layout/bottom_sheet_unencryptable_recipients.xml
+++ b/app/src/main/res/layout/bottom_sheet_unencryptable_recipients.xml
@@ -20,6 +20,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:theme="@style/EncryptionPrimaryColorTheme"
     app:useDefaultLayout="false"
     tools:context=".ui.main.thread.calendar.AttendeesBottomSheetDialog"
     tools:title="@string/encryptedRecipientRequiringPasswordTitle">
diff --git a/app/src/main/res/layout/fragment_encryption_password.xml b/app/src/main/res/layout/fragment_encryption_password.xml
index 1feea2a95bc..60a15e373fe 100644
--- a/app/src/main/res/layout/fragment_encryption_password.xml
+++ b/app/src/main/res/layout/fragment_encryption_password.xml
@@ -20,7 +20,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:theme="@style/EncryptionPrimaryColorTheme">
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
@@ -64,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/marginStandardVerySmall"
                 android:text="@string/readMore"
-                android:textColor="@color/encryptionButtonColor" />
+                android:textColor="@color/primary_color_disabled" />
 
             <TextView
                 style="@style/BodyMedium"
@@ -118,13 +119,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/marginStandardSmall"
                 android:hint="@string/attachMailboxPasswordInputHint"
-                app:boxStrokeColor="@color/encryptionButtonColor"
-                app:cursorColor="@color/encryptionButtonColor"
+                app:boxStrokeColor="?attr/colorPrimary"
+                app:cursorColor="?attr/colorPrimary"
                 app:endIconContentDescription="@string/encryptedMessageGeneratePasswordContentDescription"
                 app:endIconDrawable="@drawable/ic_text_field_arrows_counter_clockwise"
                 app:endIconMode="custom"
-                app:hintTextColor="@color/encryptionButtonColor"
-                app:placeholderTextColor="@color/encryptionButtonColor">
+                app:hintTextColor="?attr/colorPrimary"
+                app:placeholderTextColor="?attr/colorPrimary">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/passwordInput"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 8eba808f443..20a12c129a3 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -432,6 +432,7 @@
                 android:id="@+id/encryptionAlert"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:theme="@style/EncryptionPrimaryColorTheme"
                 android:visibility="gone"
                 app:icon="@drawable/ic_lock_filled_big"
                 app:style="encryption"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 376119acf25..a6e00dc31a2 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -102,6 +102,11 @@
     <color name="encryptionOnButtonColor">@color/sovereignBlue950</color>
     <color name="encryptionTextButtonColor">@color/sovereignBlue200</color>
 
+    <color name="encryptionColorPrimary">@color/sovereignBlue300</color>
+    <color name="encryptionOnColorPrimary">@color/sovereignBlue950</color>
+    <color name="encryptionPrimaryContainer">@color/sovereignBlue900</color>
+    <color name="encryptionOnPrimaryContainer">@color/sovereignBlue200</color>
+
     <!-- Thread -->
     <color name="folderTagTextColor">@color/shark</color>
     <color name="folderTagBackground">@color/orca</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 42bfbe12d40..f00e5537ac2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -219,6 +219,11 @@
     <color name="encryptionTextButtonColor">@color/sovereignBlue600</color>
     <color name="encryptionSnackbarActionColor">@color/sovereignBlue300</color>
 
+    <color name="encryptionColorPrimary">@color/sovereignBlue600</color>
+    <color name="encryptionOnColorPrimary">@color/white</color>
+    <color name="encryptionPrimaryContainer">@color/sovereignBlue100</color>
+    <color name="encryptionOnPrimaryContainer">@color/sovereignBlue900</color>
+
     <color name="partialEncryptionTagColor">@color/favoriteYellow</color>
     <color name="validEncryptionTagColor">@color/greenSuccess</color>
     <color name="onEncryptionTagColor">@color/orca</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 49bf3956e88..661b8a0deae 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -215,7 +215,7 @@
     </style>
 
     <style name="TextButtonEncryptionAlert" parent="TextButtonAlerts">
-        <item name="android:textColor">@color/encryptionTextButtonColor</item>
+        <item name="android:textColor">?attr/colorPrimary</item>
     </style>
 
     <style name="IconButtonSmall" parent="Widget.Material3.Button.TextButton">
@@ -567,16 +567,25 @@
     <!-- Encryption -->
 
     <style name="EncryptionMessageAlertView" parent="BasicMessageAlertView">
-        <item name="android:background">@color/encryptionBackgroundColor</item>
-        <item name="android:textColor">@color/encryptionTextColor</item>
-        <item name="tint">@color/encryptionIconColor</item>
-        <item name="materialButtonStyle">@style/TextButtonEncryptionAlert</item>
+        <item name="android:background">?attr/colorPrimaryContainer</item>
+        <item name="android:textColor">?attr/colorOnPrimaryContainer</item>
+        <item name="tint">?attr/colorPrimary</item>
     </style>
 
     <style name="TextButtonPrimary.EncryptionButton">
-        <item name="iconTint">@color/encryption_on_primary_color</item>
-        <item name="android:textColor">@color/encryption_on_primary_color</item>
-        <item name="backgroundTint">@color/encryption_primary_color</item>
+        <item name="iconTint">?attr/colorOnPrimary</item>
+        <item name="android:textColor">?attr/colorOnPrimary</item>
+        <item name="backgroundTint">?attr/colorPrimary</item>
+        <item name="materialButtonStyle">@style/TextButtonEncryptionAlert</item>
+    </style>
+
+    <style name="EncryptionPrimaryColorTheme">
+        <item name="colorControlActivated">@color/encryptionColorPrimary</item>
+        <item name="colorOnPrimary">@color/encryptionOnColorPrimary</item>
+        <item name="colorPrimary">@color/encryptionColorPrimary</item>
+        <item name="colorPrimaryContainer">@color/encryptionPrimaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/encryptionOnPrimaryContainer</item>
+        <item name="colorControlNormal">@color/encryptionOnPrimaryContainer</item>
     </style>
 
     <!-- Other -->