diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
index 06f5c93a5..b5b56aa82 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
@@ -344,7 +344,7 @@ public class ConversationFragment extends MessageSelectorFragment
             boolean saved = messageRecord.getSavedMsgId() != 0;
             MenuItem toggleSave = menu.findItem(R.id.menu_toggle_save);
             toggleSave.setVisible(messageRecord.canSave() && !chat.isSelfTalk());
-            toggleSave.setIcon(saved? R.drawable.baseline_bookmark_border_24 : R.drawable.baseline_bookmark_24);
+            toggleSave.setIcon(saved? R.drawable.baseline_bookmark_remove_24 : R.drawable.baseline_bookmark_border_24);
             toggleSave.setTitle(saved? R.string.unsave : R.string.save);
         }
 
diff --git a/src/main/res/drawable/baseline_bookmark_remove_24.xml b/src/main/res/drawable/baseline_bookmark_remove_24.xml
new file mode 100644
index 000000000..1fb5c5a92
--- /dev/null
+++ b/src/main/res/drawable/baseline_bookmark_remove_24.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+    <path android:fillColor="@android:color/white" android:pathData="M21,7h-6V5h6V7zM19,10.9c-0.32,0.07 -0.66,0.1 -1,0.1c-2.76,0 -5,-2.24 -5,-5c0,-1.13 0.37,-2.16 1,-3L7,3C5.9,3 5,3.9 5,5v16l7,-3l7,3V10.9z"/>
+</vector>
diff --git a/src/main/res/menu/conversation_context.xml b/src/main/res/menu/conversation_context.xml
index 81cf21d3f..56625123d 100644
--- a/src/main/res/menu/conversation_context.xml
+++ b/src/main/res/menu/conversation_context.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item android:title="@string/save"
+        android:id="@+id/menu_toggle_save"
+        android:icon="@drawable/baseline_bookmark_border_24"
+        app:showAsAction="ifRoom" />
+
   <item android:title="@string/edit_message"
         android:id="@+id/menu_context_edit"
         android:icon="@drawable/ic_create_white_24dp"
         app:showAsAction="ifRoom" />
 
-  <item android:title="@string/save"
-        android:id="@+id/menu_toggle_save"
-        android:icon="@drawable/baseline_bookmark_24"
-        app:showAsAction="ifRoom" />
-
   <item android:title="@string/menu_copy_text_to_clipboard"
         android:id="@+id/menu_context_copy"
         android:icon="?menu_copy_icon"