diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
index 53757fbbe..5e0c32adb 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -71,13 +71,6 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
         if (loyaltyCard.starStatus!=0) star.setVisibility(View.VISIBLE);
             else star.setVisibility(View.GONE);
 
-        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
-        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
-
-        Integer letterBackgroundColor = loyaltyCard.headerColor;
-        Integer letterTextColor = loyaltyCard.headerTextColor;
-        LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store,
-                tileLetterFontSize, pixelSize, pixelSize, letterBackgroundColor, letterTextColor);
-        thumbnail.setImageBitmap(letterBitmap.getLetterTile());
+        thumbnail.setImageBitmap(Utils.generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, loyaltyCard.headerTextColor).getLetterTile());
     }
 }
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 8af102bf8..d43005c9e 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -17,7 +17,11 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -45,17 +49,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     protected static final int SELECT_BARCODE_REQUEST = 1;
 
+    ImageView thumbnail;
     EditText storeFieldEdit;
     EditText noteFieldEdit;
     ChipGroup groupsChips;
-    ImageView headingColorSample;
-    Button headingColorSelectButton;
-    ImageView headingStoreTextColorSample;
-    Button headingStoreTextColorSelectButton;
+    View cardAndBarcodeLayout;
     TextView cardIdFieldView;
-    View cardIdDivider;
-    View cardIdTableRow;
-    TextView barcodeTypeField;
+    EditText barcodeTypeField;
     ImageView barcodeImage;
     View barcodeImageLayout;
     View barcodeCaptureLayout;
@@ -102,23 +102,32 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         db = new DBHelper(this);
         importUriHelper = new ImportURIHelper(this);
 
+        thumbnail = findViewById(R.id.thumbnail);
         storeFieldEdit = findViewById(R.id.storeNameEdit);
         noteFieldEdit = findViewById(R.id.noteEdit);
         groupsChips = findViewById(R.id.groupChips);
-        headingColorSample = findViewById(R.id.headingColorSample);
-        headingColorSelectButton = findViewById(R.id.headingColorSelectButton);
-        headingStoreTextColorSample = findViewById(R.id.headingStoreTextColorSample);
-        headingStoreTextColorSelectButton = findViewById(R.id.headingStoreTextColorSelectButton);
+        cardAndBarcodeLayout = findViewById(R.id.cardAndBarcodeLayout);
         cardIdFieldView = findViewById(R.id.cardIdView);
-        cardIdDivider = findViewById(R.id.cardIdDivider);
-        cardIdTableRow = findViewById(R.id.cardIdTableRow);
-        barcodeTypeField = findViewById(R.id.barcodeTypeView);
+        barcodeTypeField = findViewById(R.id.barcodeTypeField);
         barcodeImage = findViewById(R.id.barcode);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
 
         captureButton = findViewById(R.id.captureButton);
         enterButton = findViewById(R.id.enterButton);
+
+        storeFieldEdit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                generateIcon(s.toString());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) { }
+        });
     }
 
     @Override
@@ -225,15 +234,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
 
-            View groupsView = findViewById(R.id.groupsView);
-            View groupsTableRow = findViewById(R.id.groupsTableRow);
-
             if (existingGroups.isEmpty()) {
-                groupsView.setVisibility(View.GONE);
-                groupsTableRow.setVisibility(View.GONE);
+                groupsChips.setVisibility(View.GONE);
             } else {
-                groupsView.setVisibility(View.VISIBLE);
-                groupsTableRow.setVisibility(View.VISIBLE);
+                groupsChips.setVisibility(View.VISIBLE);
             }
 
             for (Group group : db.getGroups()) {
@@ -266,10 +270,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             headingStoreTextColorValue = Color.WHITE;
         }
 
-        headingColorSample.setBackgroundColor(headingColorValue);
-        headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
-        headingColorSelectButton.setOnClickListener(new ColorSelectListener(headingColorValue, true));
-        headingStoreTextColorSelectButton.setOnClickListener(new ColorSelectListener(headingStoreTextColorValue, false));
+        thumbnail.setOnClickListener(new ColorSelectListener(headingColorValue, true));
 
         if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
@@ -356,14 +357,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         if(cardIdFieldView.getText().length() > 0)
         {
-            cardIdDivider.setVisibility(View.VISIBLE);
-            cardIdTableRow.setVisibility(View.VISIBLE);
+            cardIdFieldView.setVisibility(View.VISIBLE);
             enterButton.setText(R.string.editCard);
         }
         else
         {
-            cardIdDivider.setVisibility(View.GONE);
-            cardIdTableRow.setVisibility(View.GONE);
+            cardIdFieldView.setVisibility(View.GONE);
             enterButton.setText(R.string.enterCard);
         }
 
@@ -374,6 +373,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 doSave();
             }
         });
+
+        generateIcon(storeFieldEdit.getText().toString());
     }
 
     class ColorSelectListener implements View.OnClickListener
@@ -398,14 +399,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 {
                     if(isBackgroundColor)
                     {
-                        headingColorSample.setBackgroundColor(color);
                         headingColorValue = color;
                     }
                     else
                     {
-                        headingStoreTextColorSample.setBackgroundColor(color);
                         headingStoreTextColorValue = color;
                     }
+
+                    generateIcon(storeFieldEdit.getText().toString());
                 }
 
                 @Override
@@ -570,14 +571,32 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     }
 
     private void showBarcode() {
+        cardAndBarcodeLayout.setVisibility(View.VISIBLE);
         barcodeImageLayout.setVisibility(View.VISIBLE);
-        findViewById(R.id.barcodeTypeDivider).setVisibility(View.VISIBLE);
-        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.VISIBLE);
+        findViewById(R.id.barcodeTypeView).setVisibility(View.VISIBLE);
     }
 
     private void hideBarcode() {
         barcodeImageLayout.setVisibility(View.GONE);
-        findViewById(R.id.barcodeTypeDivider).setVisibility(View.GONE);
-        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.GONE);
+        cardAndBarcodeLayout.setVisibility(View.GONE);
+        findViewById(R.id.barcodeTypeView).setVisibility(View.GONE);
+    }
+
+    private void generateIcon(String store) {
+        if (headingColorValue == null && headingStoreTextColorValue == null) {
+            return;
+        }
+
+        thumbnail.setBackgroundColor(headingColorValue);
+
+        LetterBitmap letterBitmap = Utils.generateIcon(this, store, headingColorValue, headingStoreTextColorValue);
+
+        if (letterBitmap != null) {
+            thumbnail.setImageBitmap(letterBitmap.getLetterTile());
+        } else {
+            thumbnail.setImageBitmap(null);
+        }
+
+        thumbnail.setMinimumWidth(thumbnail.getHeight());
     }
 }
diff --git a/app/src/main/java/protect/card_locker/Utils.java b/app/src/main/java/protect/card_locker/Utils.java
new file mode 100644
index 000000000..8f4f4017f
--- /dev/null
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -0,0 +1,17 @@
+package protect.card_locker;
+
+import android.content.Context;
+
+public class Utils {
+    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor, Integer textColor) {
+        if (store.length() == 0) {
+            return null;
+        }
+
+        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
+
+        return new LetterBitmap(context, store, store,
+                tileLetterFontSize, pixelSize, pixelSize, backgroundColor, textColor);
+    }
+}
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 7ace87adb..773844b59 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -32,478 +32,193 @@
                 android:layout_height="wrap_content"
                 android:background="@color/inputContrastBackground"
                 app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-        <LinearLayout
+        <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <TableLayout android:layout_width="fill_parent"
-                         android:layout_height="wrap_content"
-                         android:shrinkColumns="1"
-                         android:background="@color/inputContrastBackground">
 
-                <!-- Store Name -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
+            <!-- Store -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
 
-                    <RelativeLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
+                <androidx.cardview.widget.CardView
+                    android:layout_width="@dimen/cardThumbnailSize"
+                    android:layout_height="@dimen/cardThumbnailSize"
+                    android:layout_marginEnd="@dimen/activity_margin"
+                    android:layout_marginRight="@dimen/activity_margin"
+                    android:layout_gravity="center_vertical"
+                    app:cardCornerRadius="4dp"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    app:cardElevation="0dp">
 
-                        <TextView
-                            android:id="@+id/storeNameField"
-                            android:text="@string/storeName"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"/>
+                    <ImageView
+                        android:id="@+id/thumbnail"
+                        android:layout_width="@dimen/cardThumbnailSize"
+                        android:layout_height="@dimen/cardThumbnailSize"
+                        android:contentDescription="@string/thumbnailDescription"
+                        android:src="@mipmap/ic_launcher"/>
 
-                        <EditText
-                            android:id="@+id/storeNameEdit"
-                            android:inputType="textCapWords"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/storeNameField"
-                            android:layout_toRightOf="@id/storeNameField"
-                            />
+                </androidx.cardview.widget.CardView>
 
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Note -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <RelativeLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/noteField"
-                            android:text="@string/note"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            />
-
-                        <EditText
-                            android:id="@+id/noteEdit"
-                            android:inputType="textMultiLine"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/noteField"
-                            android:layout_toRightOf="@id/noteField"
-                            />
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Groups -->
-                <View
-                    android:id="@+id/groupsView"
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder"
-                    android:visibility="gone"/>
-                <TableRow
-                    android:id="@+id/groupsTableRow"
-                    android:background="@color/inputBackground"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/storeNameField"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
+                    android:hint="@string/storeName">
 
-                    <RelativeLayout
-                        android:layout_weight="1"
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/storeNameEdit"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
+                        />
 
-                        <TextView
-                            android:id="@+id/groupsField"
-                            android:text="@string/groups"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
 
-                        <com.google.android.material.chip.ChipGroup
-                            android:id="@+id/groupChips"
-                            android:layout_height="match_parent"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/groupsField"
-                            android:layout_toRightOf="@id/groupsField"
-                            />
-                    </RelativeLayout>
+            <!-- Note -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
 
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-
-                <!-- Store Header Background Color -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/noteField"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
+                    android:layout_height="wrap_content"
+                    android:hint="@string/note">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_weight="1"
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/noteEdit"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
+                        />
 
-                        <TextView
-                            android:id="@+id/headingField"
-                            android:text="@string/storeTextBackgroundColorTitle"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            app:layout_constraintStart_toStartOf="parent"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/headingColorSampleBorder"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_margin="@dimen/colorSamplePadding"
-                            app:layout_constraintStart_toEndOf="@id/headingField"
-                            app:layout_constraintEnd_toStartOf="@+id/headingColorSelectButton"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            android:background="@android:color/black">
-                            <ImageView
-                                android:id="@+id/headingColorSample"
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:layout_margin="1dp"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                android:background="@android:color/white"
-                                android:contentDescription="@string/storeNameBackgroundColorDescription"/>
-                        </androidx.constraintlayout.widget.ConstraintLayout>
+            <!-- Group -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
 
-                       <Button
-                           android:id="@+id/headingColorSelectButton"
-                           android:text="@string/change"
-                           android:padding="@dimen/inputPadding"
-                           android:layout_width="wrap_content"
-                           android:layout_height="match_parent"
-                           android:layout_toEndOf="@id/headingColorSampleBorder"
-                           android:layout_toRightOf="@id/headingColorSampleBorder"
-                           app:layout_constraintEnd_toEndOf="parent"/>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Store Text Color -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/groupChips"
+                    android:layout_height="match_parent"
                     android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
+                    android:padding="@dimen/inputPadding"
+                    android:textSize="@dimen/inputSize" />
+            </LinearLayout>
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/storeTextField"
-                            android:text="@string/storeTextColorTitle"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            app:layout_constraintStart_toStartOf="parent"/>
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/headingStoreTextColorSampleBorder"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_margin="@dimen/colorSamplePadding"
-                            app:layout_constraintStart_toEndOf="@id/storeTextField"
-                            app:layout_constraintEnd_toStartOf="@+id/headingStoreTextColorSelectButton"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            android:background="@android:color/black">
-                            <ImageView
-                                android:id="@+id/headingStoreTextColorSample"
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:layout_margin="1dp"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                android:background="@android:color/white"
-                                android:contentDescription="@string/storeNameColorDescription"/>
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                        <Button
-                            android:id="@+id/headingStoreTextColorSelectButton"
-                            android:text="@string/change"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_toEndOf="@id/headingStoreTextColorSampleBorder"
-                            android:layout_toRightOf="@id/headingStoreTextColorSampleBorder"
-                            app:layout_constraintEnd_toEndOf="parent"/>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Card ID -->
-                <View
-                    android:id="@+id/cardIdDivider"
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:id="@+id/cardIdTableRow"
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <RelativeLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/cardIdField"
-                            android:text="@string/cardId"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            />
-
-                        <TextView
-                            android:id="@+id/cardIdView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/cardIdField"
-                            android:layout_toRightOf="@id/cardIdField"
-                            />
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Barcode Type -->
-                <View
-                    android:id="@+id/barcodeTypeDivider"
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:id="@+id/barcodeTypeTableRow"
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <RelativeLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/barcodeTypeField"
-                            android:text="@string/barcodeType"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            />
-
-                        <TextView
-                            android:id="@+id/barcodeTypeView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/barcodeTypeField"
-                            android:layout_toRightOf="@id/barcodeTypeField"
-                            />
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-
-                <LinearLayout android:orientation="horizontal"
-                              android:padding="10.0dip"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:visibility="gone"
-                              android:id="@+id/barcodeLayout">
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/barcode_disp_height"
-                        android:layout_gravity="center_horizontal"
-                        android:padding="10.0dp"
-                        android:background="#ffffff"
-                        android:id="@+id/barcode"
-                        android:contentDescription="@string/barcodeImageDescription"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
+            <!-- Buttons -->
+            <TableLayout android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:shrinkColumns="1"
+                android:background="@color/inputContrastBackground">
 
                 <LinearLayout android:orientation="vertical"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:background="@color/inputBackground">
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/inputBackground">
 
                     <LinearLayout android:orientation="horizontal"
-                                  android:padding="10.0dip"
-                                  android:layout_width="fill_parent"
-                                  android:layout_height="wrap_content"
-                                  android:id="@+id/barcodeCaptureLayout">
+                        android:padding="10.0dip"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/barcodeCaptureLayout">
                         <Button android:id="@+id/captureButton"
-                                android:layout_margin="@dimen/inputMargin"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:text="@string/capture"
-                                android:layout_weight="1.0"/>
+                            android:layout_margin="@dimen/inputMargin"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/capture"
+                            android:layout_weight="1.0"/>
                         <Button android:id="@+id/enterButton"
-                                android:layout_margin="@dimen/inputMargin"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:text="@string/enterCard"
-                                android:layout_weight="1.0"/>
+                            android:layout_margin="@dimen/inputMargin"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/enterCard"
+                            android:layout_weight="1.0"/>
                     </LinearLayout>
                 </LinearLayout>
-
             </TableLayout>
-        </LinearLayout>
+
+            <!-- Card ID and Barcode type -->
+            <LinearLayout
+                android:id="@+id/cardAndBarcodeLayout"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
+
+                <!-- Card ID -->
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/cardIdField"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:hint="@string/cardId">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/cardIdView"
+                        android:inputType="none"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <!-- Barcode type -->
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/barcodeTypeView"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:hint="@string/barcodeType">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/barcodeTypeField"
+                        android:inputType="none"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <!-- Barcode -->
+            <View
+                android:layout_height="@dimen/inputBorderThickness"
+                android:layout_width="match_parent" />
+
+            <LinearLayout android:orientation="horizontal"
+                          android:padding="10.0dip"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:visibility="gone"
+                          android:id="@+id/barcodeLayout">
+                <ImageView
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/barcode_disp_height"
+                    android:layout_gravity="center_horizontal"
+                    android:padding="10.0dp"
+                    android:background="#ffffff"
+                    android:id="@+id/barcode"
+                    android:contentDescription="@string/barcodeImageDescription"
+                    android:layout_weight="1.0"/>
+            </LinearLayout>
+        </TableLayout>
     </ScrollView>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b6bd2cc5a..3528e779d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="inputBorderThickness">2dip</dimen>
     <dimen name="inputBorderDividerThickness">4dip</dimen>
     <dimen name="inputMargin">2dip</dimen>
-    <dimen name="inputPadding">20dip</dimen>
+    <dimen name="inputPadding">10dip</dimen>
     <dimen name="colorSamplePadding">10dip</dimen>
     <dimen name="inputSize">18sp</dimen>