diff --git a/OptionValueButton.qml b/OptionValueButton.qml
index b56ce47..3137c40 100644
--- a/OptionValueButton.qml
+++ b/OptionValueButton.qml
@@ -24,6 +24,7 @@ AbstractButton {
 
     property alias label: label.text
     property alias iconName: icon.name
+    property alias iconSource: icon.source
     property bool selected
     property bool isLast
     property int columnWidth
diff --git a/OptionsOverlay.qml b/OptionsOverlay.qml
index fbd09c9..0f9c40c 100644
--- a/OptionsOverlay.qml
+++ b/OptionsOverlay.qml
@@ -143,6 +143,7 @@ Item {
 
             label: (model && model.label) ? i18n.tr(model.label) : ""
             iconName: (model && model.icon) ? model.icon : ""
+            iconSource: (model && model.iconSource) ? model.iconSource : ""
             selected: optionValueSelector.model.selectedIndex == index
 
             isLast: index === optionValueSelector.count - 1
diff --git a/ViewFinderOverlay.qml b/ViewFinderOverlay.qml
index 29ea8a0..cb29133 100644
--- a/ViewFinderOverlay.qml
+++ b/ViewFinderOverlay.qml
@@ -44,6 +44,7 @@ Item {
         id: settings
 
         property int flashMode: Camera.FlashAuto
+        property bool screenFlash: false
         property bool gpsEnabled: false
         property bool hdrEnabled: false
         property int videoFlashMode: Camera.FlashOff
@@ -389,6 +390,29 @@ Item {
                         value: Camera.FlashOff
                     }
                 },
+                ListModel {
+                    id: screenFlashOptionsModel
+
+                    property string settingsProperty: "screenFlash"
+                    property string icon: ""
+                    property string label: ""
+                    property bool isToggle: true
+                    property int selectedIndex: bottomEdge.indexForValue(screenFlashOptionsModel, settings.screenFlash)
+                    property bool available: (!camera.advanced.hasFlash && camera.position === Camera.FrontFace)
+                    property bool visible: camera.captureMode == Camera.CaptureStillImage
+                    property bool showInIndicators: true
+
+                    ListElement {
+                        iconSource: "assets/screen_flash_on.png"
+                        label: QT_TR_NOOP("On")
+                        value: true
+                    }
+                    ListElement {
+                        iconSource: "assets/screen_flash_off.png"
+                        label: QT_TR_NOOP("Off")
+                        value: false
+                    }
+                },
                 ListModel {
                     id: videoFlashOptionsModel
 
@@ -691,6 +715,24 @@ Item {
                 timedShootFeedback.stop();
             }
         }
+        function prepareShoot() {
+            shootFeedback.start();
+            if (camera.captureMode == Camera.CaptureStillImage && shootFeedback.shouldFlash) {
+                // TODO this should be using 'camera.exposure.shutterSpeed' but currently it just returns -1.
+                // console.log(camera.exposure.shutterSpeed * 1000);
+                shootTimer.interval = 150;
+            } else {
+               shootTimer.interval = 0;
+            }
+        }
+
+        Timer {
+            id:shootTimer
+            interval: 0
+            repeat: false
+            running: false
+            onTriggered: controls.shoot();
+        }
 
         function shoot() {
             var orientation = 0;
@@ -740,9 +782,7 @@ Item {
                     camera.videoRecorder.record();
                 }
             } else {
-                if (!main.contentExportMode) {
-                    shootFeedback.start();
-                }
+
                 camera.photoCaptureInProgress = true;
                 camera.imageCapture.setMetadata("Orientation", orientation);
                 camera.imageCapture.setMetadata("Date", new Date());
@@ -885,7 +925,8 @@ Item {
                     if (settings.selfTimerDelay > 0) {
                         controls.timedShoot(settings.selfTimerDelay);
                     } else {
-                        controls.shoot();
+                        controls.prepareShoot();
+                        shootTimer.start();
                     }
                 }
             }
diff --git a/ViewFinderView.qml b/ViewFinderView.qml
index 8928538..c5d6282 100644
--- a/ViewFinderView.qml
+++ b/ViewFinderView.qml
@@ -387,13 +387,18 @@ FocusScope {
         Rectangle {
             id: shootFeedback
             anchors.fill: parent
-            color: "black"
+            property bool shouldFlash : ( !camera.advanced.hasFlash
+                                        && camera.position === Camera.FrontFace
+                                        && viewFinderOverlay.settings.screenFlash )
+            color: shouldFlash ? "white" : "black"
             visible: opacity != 0.0
             opacity: 0.0
 
             function start() {
-                shootFeedback.opacity = 1.0;
-                shootFeedbackAnimation.restart();
+                if (!main.contentExportMode) {
+                   shootFeedback.opacity = 1.0;
+                   shootFeedbackAnimation.restart();
+                }
             }
 
             OpacityAnimator {
@@ -401,9 +406,10 @@ FocusScope {
                 target: shootFeedback
                 from: 1.0
                 to: 0.0
-                duration: UbuntuAnimation.SnapDuration
+                duration: UbuntuAnimation.BriskDuration
                 easing: UbuntuAnimation.StandardEasing
             }
+
         }
     }
 
diff --git a/assets/screen_flash.svg b/assets/screen_flash.svg
new file mode 100644
index 0000000..2ec8e5b
--- /dev/null
+++ b/assets/screen_flash.svg
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   viewBox="0 0 64 64"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="screen_flash.svg"
+   inkscape:export-filename="/home/eran/projects/oss/Ubuntu/github/camera-app/assets/screen_flash_off.png"
+   inkscape:export-xdpi="201.56624"
+   inkscape:export-ydpi="201.56624">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="30.038697"
+     inkscape:cy="49.112211"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1878"
+     inkscape:window-height="1051"
+     inkscape:window-x="42"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-center="false" />
+  <defs
+     id="defs3709">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4692"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4677"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.4) translate(10,0)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata3712">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Screen"
+     sodipodi:insensitive="true"
+     style="display:inline;opacity:0.97000002">
+    <rect
+       style="fill:none;fill-opacity:0;stroke:#666666;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect3729"
+       width="23"
+       height="36.5"
+       x="20.25"
+       y="13.75" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 20.25,13.75 v 0"
+       id="path4541"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+       d="M 17.475681,32.875023 H 8.460074"
+       id="path4603-1"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 44.84546,12.183611 50.767479,5.2009286"
+       id="path4552-7"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 18.745683,12.1075 12.823664,5.1248191"
+       id="path4552-9-0"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+       d="M 31.875,11.007806 V 1.992194"
+       id="path4603-6"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+       d="M 54.726211,32.765981 H 45.710604"
+       id="path4603-1-8"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 44.783013,51.749124 5.922019,6.982683"
+       id="path4552-7-5"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 18.683236,51.825235 -5.922019,6.982681"
+       id="path4552-9-0-3"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
+       d="m 31.812553,52.924929 v 9.015612"
+       id="path4603-6-9"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="fill:none;fill-opacity:0;stroke:#666666;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path4991"
+       cx="31.863998"
+       cy="47.757984"
+       rx="0.42807764"
+       ry="0.5972718" />
+    <rect
+       style="fill:none;fill-opacity:0;stroke:#666666;stroke-width:0.30000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect4993"
+       width="19.125"
+       height="30"
+       x="22.25"
+       y="15.875" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Light"
+     sodipodi:insensitive="true"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Cancel"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <ellipse
+       style="fill:#666666;fill-opacity:0;stroke:#666666;stroke-width:3.00000048;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path5003"
+       cx="31.70369"
+       cy="33.014141"
+       rx="25.736887"
+       ry="25.410141" />
+    <path
+       style="display:inline;fill:#666666;fill-rule:evenodd;stroke:#666666;stroke-width:3.00000048;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12.80872,14.881209 48.350538,50.711196"
+       id="path5005"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#666666;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 45.555113,55.018626 v 0"
+       id="path5007"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#666666;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 45.555113,55.018626 v 0"
+       id="path5013"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#666666;fill-rule:evenodd;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 45.555113,55.018626 2.795425,-4.30743"
+       id="path5019"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/screen_flash_off.png b/assets/screen_flash_off.png
new file mode 100644
index 0000000..2c7fbb0
Binary files /dev/null and b/assets/screen_flash_off.png differ
diff --git a/assets/screen_flash_on.png b/assets/screen_flash_on.png
new file mode 100644
index 0000000..637a635
Binary files /dev/null and b/assets/screen_flash_on.png differ