diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 3139e0088..00933953c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -646,7 +646,7 @@ class EntryEditActivity : LockingActivity(),
             isVisible = allowCustomField
         }
 
-        menu?.findItem(R.id.menu_add_cc)?.apply {
+        menu?.findItem(R.id.menu_add_credit_card)?.apply {
             isEnabled = allowCustomField
             isVisible = allowCustomField
         }
@@ -718,7 +718,7 @@ class EntryEditActivity : LockingActivity(),
                 addNewCustomField()
                 return true
             }
-            R.id.menu_add_cc -> {
+            R.id.menu_add_credit_card -> {
                 addNewCreditCard()
                 return true
             }
diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml
index 703610489..f5faa0949 100644
--- a/app/src/main/res/layout/activity_entry_edit.xml
+++ b/app/src/main/res/layout/activity_entry_edit.xml
@@ -83,7 +83,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/validate"
-        android:layout_marginBottom="?attr/actionBarSize"
         android:src="@drawable/ic_check_white_24dp"
         app:fabSize="mini"
         app:layout_constraintTop_toTopOf="@+id/entry_edit_bottom_bar"
diff --git a/app/src/main/res/menu/entry_edit.xml b/app/src/main/res/menu/entry_edit.xml
index 0cc1c4605..fbff6f365 100644
--- a/app/src/main/res/menu/entry_edit.xml
+++ b/app/src/main/res/menu/entry_edit.xml
@@ -21,27 +21,28 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:ignore="AlwaysShowAction">
-    <item android:id="@+id/menu_add_field"
-        android:icon="@drawable/ic_new_field_white_24dp"
-        android:title="@string/entry_add_field"
-        android:orderInCategory="92"
-        app:iconTint="?attr/colorControlNormal"
-        app:showAsAction="always" />
     <item android:id="@+id/menu_add_attachment"
         android:icon="@drawable/ic_attach_file_white_24dp"
         android:title="@string/entry_add_attachment"
-        android:orderInCategory="93"
+        android:orderInCategory="92"
         app:iconTint="?attr/colorControlNormal"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_add_otp"
         android:icon="@drawable/ic_otp_white_24dp"
         android:title="@string/entry_setup_otp"
-        android:orderInCategory="94"
+        android:orderInCategory="93"
         app:iconTint="?attr/colorControlNormal"
-        app:showAsAction="always" />
-    <item android:id="@+id/menu_add_cc"
+        app:showAsAction="ifRoom" />
+    <item android:id="@+id/menu_add_credit_card"
         android:icon="@drawable/ic_credit_card_white_24dp"
         android:title="@string/entry_setup_credit_card"
+        android:orderInCategory="94"
+        app:iconTint="?attr/colorControlNormal"
+        app:showAsAction="ifRoom" />
+    <item android:id="@+id/menu_add_field"
+        android:icon="@drawable/ic_new_field_white_24dp"
+        android:title="@string/entry_add_field"
         android:orderInCategory="95"
-        app:showAsAction="always" />
+        app:iconTint="?attr/colorControlNormal"
+        app:showAsAction="ifRoom" />
 </menu>