diff --git a/src/android/customCamera/res/drawable-hdpi/icon_flash_auto.png b/src/android/customCamera/res/drawable-hdpi/icon_flash_auto.png
new file mode 100644
index 0000000..cb342f4
Binary files /dev/null and b/src/android/customCamera/res/drawable-hdpi/icon_flash_auto.png differ
diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index b0ed095..b0f21dc 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -25,7 +25,7 @@
         android:id="@+id/flash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="60dp"
         android:background="@android:color/transparent"
         android:onClick="enableFlash"
         android:src="@drawable/flash" />
@@ -34,11 +34,20 @@
         android:id="@+id/noFlash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="60dp"
         android:background="@android:color/transparent"
         android:onClick="enableFlash"
         android:src="@drawable/no_flash" />
 
+    <ImageButton
+        android:id="@+id/flashAuto"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+        android:background="@android:color/transparent"
+        android:onClick="enableFlash"
+        android:src="@drawable/icon_flash_auto" />
+
     <LinearLayout
         android:id="@+id/beforePhoto"
         android:layout_width="match_parent"
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index 9ecb8f3..ccd0567 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -866,25 +866,30 @@ public class CameraActivity extends Activity {
    */
   public void enableFlash(View view) {
     ImageButton flash = (ImageButton)findViewById(R.id.flash);
+    ImageButton flashAuto = (ImageButton)findViewById(R.id.flashAuto);
     ImageButton noFlash = (ImageButton)findViewById(R.id.noFlash);
     Camera.Parameters params = customCamera.getParameters();
   
     if (hasFlash()) {
+      flash.setVisibility(View.INVISIBLE);
+      flashAuto.setVisibility(View.INVISIBLE);
+      noFlash.setVisibility(View.INVISIBLE);
       if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_ON)
-          || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_AUTO)
           || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_RED_EYE)
           || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_TORCH)) {
+        params.setFlashMode(Camera.Parameters.FLASH_MODE_AUTO);
+        flashAuto.setVisibility(View.VISIBLE);
+      } else if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_AUTO)) {
         params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
         noFlash.setVisibility(View.VISIBLE);
-        flash.setVisibility(View.INVISIBLE);
       } else if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_OFF)) {
         params.setFlashMode(Camera.Parameters.FLASH_MODE_ON);
-        noFlash.setVisibility(View.INVISIBLE);
         flash.setVisibility(View.VISIBLE);
       }
       customCamera.setParameters(params);
     } else {
       flash.setVisibility(View.INVISIBLE);
+      flashAuto.setVisibility(View.INVISIBLE);
       noFlash.setVisibility(View.INVISIBLE);
     }
   }