diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index aef274b7e..f40e4bb36 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -9,6 +9,7 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.widget.TextViewCompat;
 import androidx.appcompat.app.ActionBar;
@@ -24,7 +25,9 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -33,7 +36,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.zxing.BarcodeFormat;
 
 import java.text.DateFormat;
-import java.util.Date;
 import java.util.List;
 
 import protect.card_locker.preferences.Settings;
@@ -43,13 +45,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     private static final String TAG = "Catima";
 
     TextView cardIdFieldView;
+    BottomSheetBehavior behavior;
     View bottomSheet;
     ImageView bottomSheetButton;
     TextView noteView;
     TextView groupsView;
     TextView expiryView;
     TextView storeName;
+    ImageButton maximizeButton;
     ImageView barcodeImage;
+    ImageButton minimizeButton;
     View collapsingToolbarLayout;
     int loyaltyCardId;
     LoyaltyCard loyaltyCard;
@@ -61,10 +66,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     String cardIdString;
     BarcodeFormat format;
 
+    FloatingActionButton editButton;
+
+    Guideline centerGuideline;
+    SeekBar barcodeScaler;
+
     boolean starred;
     boolean backgroundNeedsDarkIcons;
     boolean barcodeIsFullscreen = false;
-    ViewGroup.LayoutParams barcodeImageState;
 
     private void extractIntentFields(Intent intent)
     {
@@ -119,41 +128,66 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         groupsView = findViewById(R.id.groupsView);
         expiryView = findViewById(R.id.expiryView);
         storeName = findViewById(R.id.storeName);
+        maximizeButton = findViewById(R.id.maximizeButton);
         barcodeImage = findViewById(R.id.barcode);
+        minimizeButton = findViewById(R.id.minimizeButton);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
 
+        centerGuideline = findViewById(R.id.centerGuideline);
+        centerGuideline.setGuidelinePercent(0.5f);
+        barcodeScaler = findViewById(R.id.barcodeScaler);
+        barcodeScaler.setProgress(100);
+        barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                Log.d(TAG, "Progress is " + progress);
+                Log.d(TAG, "Max is " + barcodeScaler.getMax());
+                float scale = (float) progress / (float) barcodeScaler.getMax();
+                Log.d(TAG, "Scaling to " + scale);
+
+                redrawBarcodeAfterResize();
+                centerGuideline.setGuidelinePercent(0.5f * scale);
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+
+            }
+        });
+
         rotationEnabled = true;
 
         // Allow making barcode fullscreen on tap
-        barcodeImage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (barcodeIsFullscreen)
-                {
-                    setFullscreen(false);
-                }
-                else
-                {
-                    setFullscreen(true);
-                }
+        maximizeButton.setOnClickListener(v -> setFullscreen(true));
+        barcodeImage.setOnClickListener(view -> {
+            if (barcodeIsFullscreen)
+            {
+                setFullscreen(false);
+            }
+            else
+            {
+                setFullscreen(true);
             }
         });
+        minimizeButton.setOnClickListener(v -> setFullscreen(false));
 
-        final FloatingActionButton editButton = findViewById(R.id.fabEdit);
-        editButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCardId);
-                bundle.putBoolean("update", true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                finish();
-            }
+        editButton = findViewById(R.id.fabEdit);
+        editButton.setOnClickListener(v -> {
+            Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putInt("id", loyaltyCardId);
+            bundle.putBoolean("update", true);
+            intent.putExtras(bundle);
+            startActivity(intent);
+            finish();
         });
 
-        final BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet);
+        behavior = BottomSheetBehavior.from(bottomSheet);
         behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
             @Override
             public void onStateChanged(@NonNull View bottomSheet, int newState) {
@@ -172,14 +206,11 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             public void onSlide(@NonNull View bottomSheet, float slideOffset) { }
         });
 
-        bottomSheetButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (behavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
-                    behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-                } else {
-                    behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-                }
+        bottomSheetButton.setOnClickListener(v -> {
+            if (behavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+                behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+            } else {
+                behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
             }
         });
     }
@@ -200,15 +231,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
-        if(barcodeIsFullscreen)
-        {
-            // Completely reset state
-            //
-            // This prevents the barcode from taking up the entire screen
-            // on resume and thus being stretched out of proportion.
-            recreate();
-        }
-
         // The brightness value is on a scale from [0, ..., 1], where
         // '1' is the brightest. We attempt to maximize the brightness
         // to help barcode readers scan the barcode.
@@ -281,12 +303,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
         expiryView.setTag(loyaltyCard.expiry);
 
-        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
-            bottomSheet.setVisibility(View.VISIBLE);
-        }
-        else
-        {
-            bottomSheet.setVisibility(View.GONE);
+        if (!barcodeIsFullscreen) {
+            makeBottomSheetVisibleIfUseful();
         }
 
         storeName.setText(loyaltyCard.store);
@@ -338,24 +356,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         if(format != null)
         {
-            findViewById(R.id.barcode).setVisibility(View.VISIBLE);
+            if (!barcodeIsFullscreen) {
+                maximizeButton.setVisibility(View.VISIBLE);
+            }
+            barcodeImage.setVisibility(View.VISIBLE);
             if(barcodeImage.getHeight() == 0)
             {
                 Log.d(TAG, "ImageView size is not known known at start, waiting for load");
                 // The size of the ImageView is not yet available as it has not
                 // yet been drawn. Wait for it to be drawn so the size is available.
-                barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
-                        new ViewTreeObserver.OnGlobalLayoutListener()
-                        {
-                            @Override
-                            public void onGlobalLayout()
-                            {
-                                barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                                Log.d(TAG, "ImageView size now known");
-                                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
-                            }
-                        });
+                redrawBarcodeAfterResize();
             }
             else
             {
@@ -365,8 +375,11 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
         else
         {
-            findViewById(R.id.barcode).setVisibility(View.GONE);
+            maximizeButton.setVisibility(View.GONE);
+            barcodeImage.setVisibility(View.GONE);
         }
+
+        Log.d(TAG, String.valueOf(bottomSheet.getTop()));
     }
 
     @Override
@@ -473,6 +486,33 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
     }
 
+    private void makeBottomSheetVisibleIfUseful()
+    {
+        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
+            bottomSheet.setVisibility(View.VISIBLE);
+        }
+        else
+        {
+            bottomSheet.setVisibility(View.GONE);
+        }
+    }
+
+    private void redrawBarcodeAfterResize()
+    {
+        barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
+                new ViewTreeObserver.OnGlobalLayoutListener()
+                {
+                    @Override
+                    public void onGlobalLayout()
+                    {
+                        barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+
+                        Log.d(TAG, "ImageView size now known");
+                        new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+                    }
+                });
+    }
+
     /**
      * When enabled, hides the status bar and moves the barcode to the top of the screen.
      *
@@ -484,8 +524,13 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         ActionBar actionBar = getSupportActionBar();
         if(enable && !barcodeIsFullscreen)
         {
-            // Save previous barcodeImage state
-            barcodeImageState = barcodeImage.getLayoutParams();
+            // Prepare redraw after size change
+            redrawBarcodeAfterResize();
+
+            // Hide maximize and show minimize button and scaler
+            maximizeButton.setVisibility(View.GONE);
+            minimizeButton.setVisibility(View.VISIBLE);
+            barcodeScaler.setVisibility(View.VISIBLE);
 
             // Hide actionbar
             if(actionBar != null)
@@ -496,30 +541,36 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             // Hide collapsingToolbar
             collapsingToolbarLayout.setVisibility(View.GONE);
 
+            // Hide other UI elements
+            cardIdFieldView.setVisibility(View.GONE);
+            bottomSheet.setVisibility(View.GONE);
+            behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+            Log.d(TAG, String.valueOf(bottomSheet.getTop()));
+            editButton.hide();
+
             // Set Android to fullscreen mode
             getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    getWindow().getDecorView().getSystemUiVisibility()
+                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            | View.SYSTEM_UI_FLAG_FULLSCREEN
             );
 
-            // Make barcode take all space
-            barcodeImage.setLayoutParams(new ConstraintLayout.LayoutParams(
-                ConstraintLayout.LayoutParams.MATCH_PARENT,
-                ConstraintLayout.LayoutParams.MATCH_PARENT
-            ));
-
-            // Move barcode to top
-            barcodeImage.setScaleType(ImageView.ScaleType.FIT_START);
-
-            // Prevent centering
-            barcodeImage.setAdjustViewBounds(false);
-
             // Set current state
             barcodeIsFullscreen = true;
         }
         else if(!enable && barcodeIsFullscreen)
         {
+            // Reset center guideline
+            barcodeScaler.setProgress(100);
+
+            // Prepare redraw after size change
+            redrawBarcodeAfterResize();
+
+            // Show maximize and hide minimize button and scaler
+            maximizeButton.setVisibility(View.VISIBLE);
+            minimizeButton.setVisibility(View.GONE);
+            barcodeScaler.setVisibility(View.GONE);
+
             // Show actionbar
             if(actionBar != null)
             {
@@ -529,18 +580,23 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             // Show collapsingToolbar
             collapsingToolbarLayout.setVisibility(View.VISIBLE);
 
+            // Show other UI elements
+            cardIdFieldView.setVisibility(View.VISIBLE);
+            makeBottomSheetVisibleIfUseful();
+            Log.d(TAG, String.valueOf(bottomSheet.getTop()));
+            editButton.show();
+
             // Unset fullscreen mode
             getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                & ~View.SYSTEM_UI_FLAG_FULLSCREEN
+                    getWindow().getDecorView().getSystemUiVisibility()
+                            & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            & ~View.SYSTEM_UI_FLAG_FULLSCREEN
             );
 
-            // Turn barcode back to normal
-            barcodeImage.setLayoutParams(barcodeImageState);
-
-            // Fix barcode centering
-            barcodeImage.setAdjustViewBounds(true);
+            // FIXME: Figure out why the bottom sheet gets paddingTop 24px sometimes
+            // For some reason bottom sheet can get a 24px padding top after we enter and then leave fullscreen mode
+            // No clue why
+            // Android library bug?
 
             // Set current state
             barcodeIsFullscreen = false;
diff --git a/app/src/main/res/layout/loyalty_card_view_layout.xml b/app/src/main/res/layout/loyalty_card_view_layout.xml
index 15bfcf969..d93c8d720 100644
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -2,6 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinator_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -36,30 +37,82 @@
                 android:orientation="horizontal"
                 app:layout_constraintGuide_percent="0.5"/>
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/scalerGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.75"/>
+
+            <ImageButton
+                android:id="@+id/maximizeButton"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                android:layout_marginTop="10dp"
+                android:padding="0dp"
+                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
+                android:contentDescription="@string/moveBarcodeToTopOfScreen"
+                app:tint="@color/iconColor"
+                android:background="@color/colorPrimary"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@+id/barcode"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
             <ImageView
                 android:id="@+id/barcode"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:layout_marginTop="20.0dip"
-                android:layout_marginBottom="10.0dip"
                 android:layout_marginStart="15.0dip"
                 android:layout_marginEnd="15.0dip"
-                android:padding="10.0dp"
+                android:padding="10dp"
                 android:background="#ffffff"
                 app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"
                 android:contentDescription="@string/barcodeImageDescription"/>
 
+            <ImageButton
+                android:id="@+id/minimizeButton"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                android:padding="0dp"
+                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
+                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
+                app:tint="@color/iconColor"
+                android:background="@color/colorPrimary"
+                app:layout_constraintTop_toBottomOf="@+id/barcode"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <SeekBar
+                android:id="@+id/barcodeScaler"
+                android:visibility="gone"
+                android:max="100"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/inputPadding"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
             <TextView
                 android:id="@+id/cardIdView"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_marginLeft="10.0dip"
                 android:layout_marginRight="10.0dip"
-                android:layout_marginBottom="80dp"
-                app:layout_constraintTop_toBottomOf="@+id/barcode"
+                android:paddingBottom="80dp"
+                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -80,24 +133,24 @@
 
     <LinearLayout
         android:id="@+id/bottom_sheet"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:visibility="gone"
         app:behavior_hideable="false"
         app:behavior_peekHeight="80dp"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
+        tools:visibility="visible">
 
         <ImageButton
             android:id="@+id/bottomSheetButton"
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:background="@color/colorPrimary"
-            android:gravity="center"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            android:adjustViewBounds="true"
             android:scaleType="fitCenter"
-            android:tint="@android:color/white" />
+            android:layout_gravity="top|start"
+            android:tint="@android:color/white"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24" />
 
         <TextView
             android:id="@+id/noteView"
@@ -106,9 +159,9 @@
             android:background="@color/inputBackground"
             android:gravity="center"
             android:padding="20dp"
-            app:autoSizeTextType="uniform"
+            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
             app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax" />
+            app:autoSizeTextType="uniform" />
 
         <TextView
             android:id="@+id/groupsView"
@@ -117,9 +170,9 @@
             android:background="@color/inputBackground"
             android:gravity="center"
             android:padding="20dp"
-            app:autoSizeTextType="uniform"
+            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
             app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax" />
+            app:autoSizeTextType="uniform" />
 
         <TextView
             android:id="@+id/expiryView"
@@ -128,9 +181,9 @@
             android:background="@color/inputBackground"
             android:gravity="center"
             android:padding="20dp"
-            app:autoSizeTextType="uniform"
+            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
             app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax" />
+            app:autoSizeTextType="uniform" />
     </LinearLayout>
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3152aba35..a0f2510d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,4 +141,6 @@
     <string name="expiryDate">Expiry date</string>
     <string name="never">Never</string>
     <string name="chooseExpiryDate">Choose expiry date</string>
+    <string name="moveBarcodeToTopOfScreen">Move the barcode to the top of the screen</string>
+    <string name="moveBarcodeToCenterOfScreen">Center the barcode on the screen</string>
 </resources>