diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 0a9b4515dd..9861aa0f0b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -32,6 +32,7 @@ import android.content.Intent;
 import android.content.IntentSender;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -962,6 +963,16 @@ public class FragmentCompose extends FragmentBase {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_compose, menu);
+
+        menu.findItem(R.id.menu_encrypt).setActionView(R.layout.action_button);
+        ImageButton ib = (ImageButton) menu.findItem(R.id.menu_encrypt).getActionView();
+        ib.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onMenuEncrypt();
+            }
+        });
+
         super.onCreateOptionsMenu(menu, inflater);
     }
 
@@ -987,7 +998,12 @@ public class FragmentCompose extends FragmentBase {
         menu.findItem(R.id.menu_answer).setEnabled(!busy);
         menu.findItem(R.id.menu_send).setEnabled(!busy);
 
-        menu.findItem(R.id.menu_encrypt).setIcon(encrypt ? R.drawable.baseline_lock_open_24 : R.drawable.baseline_lock_24);
+        int colorEncrypt = Helper.resolveColor(getContext(), R.attr.colorEncrypt);
+        ImageButton ib = (ImageButton) menu.findItem(R.id.menu_encrypt).getActionView();
+        ib.setEnabled(!busy);
+        ib.setImageResource(encrypt ? R.drawable.baseline_lock_24 : R.drawable.baseline_lock_open_24);
+        ib.setImageTintList(encrypt ? ColorStateList.valueOf(colorEncrypt) : null);
+
         menu.findItem(R.id.menu_media).setChecked(media);
         menu.findItem(R.id.menu_compact).setChecked(compact);
 
diff --git a/app/src/main/res/layout/action_button.xml b/app/src/main/res/layout/action_button.xml
index 6b48b6d71d..0ef5a2a490 100644
--- a/app/src/main/res/layout/action_button.xml
+++ b/app/src/main/res/layout/action_button.xml
@@ -4,4 +4,4 @@
     style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:srcCompat="@drawable/baseline_folder_24" />
+    app:srcCompat="@mipmap/ic_launcher" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1ea0c5cd3c..c23c48860e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,6 +18,8 @@
     <!-- White 87%  primary_text_default_material_dark -->
     <color name="colorUnreadDark">#ffffffff</color>
 
+    <color name="colorEncrypt">#ff00d000</color>
+
     <!-- Grey 800 -->
     <color name="darkPrimary">#424242</color>
     <color name="darkPrimaryDark">#1b1b1b</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b48801864e..ad46e9b063 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,6 +3,7 @@
     <attr name="colorRead" format="reference" />
     <attr name="colorUnread" format="reference" />
     <attr name="colorUnreadHighlight" format="reference" />
+    <attr name="colorEncrypt" format="reference" />
     <attr name="colorSeparator" format="reference" />
     <attr name="colorWarning" format="reference" />
     <attr name="colorDrawerScrim" format="reference" />
@@ -30,6 +31,8 @@
         <item name="colorUnread">@color/colorUnreadLight</item>
         <item name="colorUnreadHighlight">@color/colorAccentDark</item>
 
+        <item name="colorEncrypt">@color/colorEncrypt</item>
+
         <item name="colorSeparator">@color/lightColorSeparator</item>
         <item name="colorWarning">@color/lightColorWarning</item>
 
@@ -75,6 +78,8 @@
         <item name="colorUnread">@color/colorUnreadDark</item>
         <item name="colorUnreadHighlight">@color/colorAccent</item>
 
+        <item name="colorEncrypt">@color/colorEncrypt</item>
+
         <item name="colorSeparator">@color/darkColorSeparator</item>
         <item name="colorWarning">@color/darkColorWarning</item>