diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2ee07bc2..5cae9d9b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Breaking changes:
 
 Changes:
 
+- Make it possible to enable or disable the flashlight while scanning
 - Add UPC-E support
 - Support adding a front and back photo to each card
 - Support importing password-protected zip files
diff --git a/app/src/main/java/protect/card_locker/ScanActivity.java b/app/src/main/java/protect/card_locker/ScanActivity.java
index fd3ebbeba..3c326569e 100644
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -2,9 +2,11 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -34,6 +36,7 @@ public class ScanActivity extends AppCompatActivity {
     private DecoratedBarcodeView barcodeScannerView;
 
     private String cardId;
+    private boolean torch = false;
 
     private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
@@ -114,6 +117,18 @@ public class ScanActivity extends AppCompatActivity {
         return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
+            getMenuInflater().inflate(R.menu.scan_menu, menu);
+        }
+
+        barcodeScannerView.setTorchOff();
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
     {
@@ -122,6 +137,19 @@ public class ScanActivity extends AppCompatActivity {
             setResult(Activity.RESULT_CANCELED);
             finish();
             return true;
+        } else if (item.getItemId() == R.id.action_toggle_flashlight)
+        {
+            if (torch) {
+                torch = false;
+                barcodeScannerView.setTorchOff();
+                item.setTitle(R.string.turn_flashlight_on);
+                item.setIcon(R.drawable.ic_flashlight_off_white_24dp);
+            } else {
+                torch = true;
+                barcodeScannerView.setTorchOn();
+                item.setTitle(R.string.turn_flashlight_off);
+                item.setIcon(R.drawable.ic_flashlight_on_white_24dp);
+            }
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/drawable/ic_flashlight_off_white_24dp.xml b/app/src/main/res/drawable/ic_flashlight_off_white_24dp.xml
new file mode 100644
index 000000000..99910c16b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flashlight_off_white_24dp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,5l0,-3l-12,0l0,1.17l1.83,1.83z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M16,11l2,-3l0,-1l-8.17,0l6.17,6.17z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M2.81,2.81L1.39,4.22L8,10.83V22h8v-3.17l3.78,3.78l1.41,-1.41L2.81,2.81z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_flashlight_on_white_24dp.xml b/app/src/main/res/drawable/ic_flashlight_on_white_24dp.xml
new file mode 100644
index 000000000..2d367a292
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flashlight_on_white_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2h12v3h-12z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M6,7v1l2,3v11h8V11l2,-3V7H6zM12,15.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S12.83,15.5 12,15.5z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/menu/scan_menu.xml b/app/src/main/res/menu/scan_menu.xml
new file mode 100644
index 000000000..df63714b5
--- /dev/null
+++ b/app/src/main/res/menu/scan_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_toggle_flashlight"
+        android:icon="@drawable/ic_flashlight_off_white_24dp"
+        android:title="@string/turn_flashlight_on"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e9ce4a6c..fa4cbc746 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,4 +195,6 @@
     <string name="no">No</string>
     <string name="passwordRequired">Please enter the password</string>
     <string name="failedGeneratingShareURL">Failed generating share URL. Please report this bug!</string>
+    <string name="turn_flashlight_on">Turn flashlight on</string>
+    <string name="turn_flashlight_off">Turn flashlight off</string>
 </resources>