diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 9c9c2e5c8..2bb279610 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -356,17 +356,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         enterButton.setOnClickListener(new EditCardIdAndBarcode());
         barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
 
-        if(cardIdFieldView.getText().length() > 0)
-        {
-            cardAndBarcodeLayout.setVisibility(View.VISIBLE);
-            enterButton.setText(R.string.editCard);
-        }
-        else
-        {
-            cardAndBarcodeLayout.setVisibility(View.GONE);
-            enterButton.setText(R.string.enterCard);
-        }
-
         ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
         barcodeList.add(0, getString(R.string.noBarcode));
         ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(this, android.R.layout.select_dialog_item, barcodeList);
diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml
index 5f114ba3b..199513b49 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -123,13 +123,11 @@
             <!-- Buttons -->
             <TableLayout android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:shrinkColumns="1"
-                android:background="@color/inputContrastBackground">
+                android:shrinkColumns="1">
 
                 <LinearLayout android:orientation="vertical"
                     android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/inputBackground">
+                    android:layout_height="wrap_content">
 
                     <LinearLayout android:orientation="horizontal"
                         android:padding="10.0dip"
@@ -140,7 +138,7 @@
                             android:layout_margin="@dimen/inputMargin"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:text="@string/enterCard"
+                            android:text="@string/editCard"
                             android:layout_weight="1.0"/>
                     </LinearLayout>
                 </LinearLayout>
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png
index c3748fa4f..9be572857 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png
index cfb5e081f..b52d8d37f 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png differ