diff --git a/app/src/main/res/drawable/twotone_save_24.xml b/app/src/main/res/drawable/twotone_save_24.xml
deleted file mode 100755
index 8130c6d2b7..0000000000
--- a/app/src/main/res/drawable/twotone_save_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/layout/activity_widget.xml b/app/src/main/res/layout/activity_widget.xml
index 94833beff5..1cc46e05c2 100644
--- a/app/src/main/res/layout/activity_widget.xml
+++ b/app/src/main/res/layout/activity_widget.xml
@@ -102,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:text="@string/title_save"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_widget_sync.xml b/app/src/main/res/layout/activity_widget_sync.xml
index 833046c3d1..fcc17ed536 100644
--- a/app/src/main/res/layout/activity_widget_sync.xml
+++ b/app/src/main/res/layout/activity_widget_sync.xml
@@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:text="@string/title_save"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_widget_unified.xml b/app/src/main/res/layout/activity_widget_unified.xml
index cbb4135ee0..ecf3d6b831 100644
--- a/app/src/main/res/layout/activity_widget_unified.xml
+++ b/app/src/main/res/layout/activity_widget_unified.xml
@@ -126,7 +126,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:text="@string/title_save"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 2d337d15cf..9e6ffaddcb 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -878,7 +878,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:tag="disable"
android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 560b8fb7f8..cfe8be3682 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -362,7 +362,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:tag="disable"
android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 7e114221c2..72ae8fac31 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -835,7 +835,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:tag="disable"
android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index b47f87b96c..a4eab460ba 100644
--- a/app/src/main/res/layout/fragment_pop.xml
+++ b/app/src/main/res/layout/fragment_pop.xml
@@ -487,7 +487,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:tag="disable"
android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 2da7df944d..43efe357c9 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -336,7 +336,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
- android:drawableEnd="@drawable/twotone_save_24"
+ android:drawableEnd="@drawable/twotone_save_alt_24"
android:drawablePadding="6dp"
android:tag="disable"
android:text="@string/title_save"
diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 475ba6471c..fa4318a8c1 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -49,7 +49,7 @@
android:tooltipText="@string/title_save_all"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
- app:srcCompat="@drawable/twotone_save_24" />
+ app:srcCompat="@drawable/twotone_save_alt_24" />
+ app:srcCompat="@drawable/twotone_save_alt_24" />
+ app:srcCompat="@drawable/twotone_save_alt_24" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_keyword.xml b/app/src/main/res/layout/item_keyword.xml
index c97680e57b..ddf5790735 100644
--- a/app/src/main/res/layout/item_keyword.xml
+++ b/app/src/main/res/layout/item_keyword.xml
@@ -62,7 +62,7 @@
app:layout_constraintBottom_toBottomOf="@+id/btnColor"
app:layout_constraintStart_toEndOf="@id/etKeyword"
app:layout_constraintTop_toTopOf="@+id/btnColor"
- app:srcCompat="@drawable/twotone_save_24" />
+ app:srcCompat="@drawable/twotone_save_alt_24" />
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index 2ada436a8b..a49eddec2f 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -119,7 +119,7 @@