diff --git a/app/src/main/java/com/simplemobiletools/flashlight/MarshmallowCamera.java b/app/src/main/java/com/simplemobiletools/flashlight/MarshmallowCamera.java
index 0832ca0..32c5d2e 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/MarshmallowCamera.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/MarshmallowCamera.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraManager;
 import android.os.Build;
+import android.os.Handler;
 import android.util.Log;
 
 import com.squareup.otto.Bus;
@@ -14,9 +15,11 @@ class MarshmallowCamera {
 
     private CameraManager manager;
     private String cameraId;
+    private Context mContext;
 
     @TargetApi(Build.VERSION_CODES.M)
     MarshmallowCamera(Context context) {
+        mContext = context;
         manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
         try {
             final String[] list = manager.getCameraIdList();
@@ -31,7 +34,14 @@ class MarshmallowCamera {
             manager.setTorchMode(cameraId, enable);
         } catch (CameraAccessException e) {
             Log.e(TAG, "toggle marshmallow flashlight " + e.getMessage());
-            bus.post(new Events.CameraUnavailable());
+
+            Runnable mainRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    bus.post(new Events.CameraUnavailable());
+                }
+            };
+            new Handler(mContext.getMainLooper()).post(mainRunnable);
         }
     }
 }
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java b/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java
index 276798a..3ede2b0 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java
@@ -67,7 +67,7 @@ public class MyCameraImpl {
         return true;
     }
 
-    private void stopStroboscope() {
+    public void stopStroboscope() {
         mShouldStroboscopeStop = true;
     }
 
@@ -221,7 +221,7 @@ public class MyCameraImpl {
 
             if (mCamera != null) {
                 mCamera.setParameters(torchOff);
-                if (!mShouldEnableFlashlight) {
+                if (!mShouldEnableFlashlight || mIsMarshmallow) {
                     mCamera.release();
                     mCamera = null;
                 }
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
index 703d683..4cea0c9 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
@@ -118,6 +118,7 @@ public class MainActivity extends SimpleActivity {
         if (isCameraPermissionGranted()) {
             if (mCameraImpl.toggleStroboscope()) {
                 mStroboscopeBar.setVisibility(mStroboscopeBar.getVisibility() == View.VISIBLE ? View.INVISIBLE : View.VISIBLE);
+                changeIconColor(mStroboscopeBar.getVisibility() == View.VISIBLE ? R.color.colorPrimary : R.color.translucent_white, mStroboscopeBtn);
             }
         } else {
             final String[] permissions = {Manifest.permission.CAMERA};
@@ -156,7 +157,10 @@ public class MainActivity extends SimpleActivity {
 
         mBrightDisplayBtn.setVisibility(mConfig.getBrightDisplay() ? View.VISIBLE : View.GONE);
         mStroboscopeBtn.setVisibility(mConfig.getStroboscope() ? View.VISIBLE : View.GONE);
-        mStroboscopeBar.setVisibility(View.INVISIBLE);
+        if (!mConfig.getStroboscope()) {
+            mCameraImpl.stopStroboscope();
+            mStroboscopeBar.setVisibility(View.INVISIBLE);
+        }
     }
 
     @Override
@@ -193,6 +197,7 @@ public class MainActivity extends SimpleActivity {
     }
 
     public void enableFlashlight() {
+        changeIconColor(R.color.translucent_white, mStroboscopeBtn);
         changeIconColor(R.color.colorPrimary, mToggleBtn);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fc8dfa1..65a70a6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -30,7 +30,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/buttons_margin"
-        android:background="@mipmap/bright_display"
+        android:background="@mipmap/stroboscope"
         android:padding="@dimen/activity_margin"/>
 
     <SeekBar
diff --git a/app/src/main/res/mipmap-hdpi/bright_display.png b/app/src/main/res/mipmap-hdpi/bright_display.png
index 5173d12..ca036f5 100644
Binary files a/app/src/main/res/mipmap-hdpi/bright_display.png and b/app/src/main/res/mipmap-hdpi/bright_display.png differ
diff --git a/app/src/main/res/mipmap-hdpi/stroboscope.png b/app/src/main/res/mipmap-hdpi/stroboscope.png
new file mode 100644
index 0000000..5ee44e0
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/stroboscope.png differ
diff --git a/app/src/main/res/mipmap-mdpi/bright_display.png b/app/src/main/res/mipmap-mdpi/bright_display.png
index 0f0929c..5d20731 100644
Binary files a/app/src/main/res/mipmap-mdpi/bright_display.png and b/app/src/main/res/mipmap-mdpi/bright_display.png differ
diff --git a/app/src/main/res/mipmap-mdpi/stroboscope.png b/app/src/main/res/mipmap-mdpi/stroboscope.png
new file mode 100644
index 0000000..d82add2
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/stroboscope.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/bright_display.png b/app/src/main/res/mipmap-xhdpi/bright_display.png
index 0a4db2c..b6529a8 100644
Binary files a/app/src/main/res/mipmap-xhdpi/bright_display.png and b/app/src/main/res/mipmap-xhdpi/bright_display.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/stroboscope.png b/app/src/main/res/mipmap-xhdpi/stroboscope.png
new file mode 100644
index 0000000..5f46226
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/stroboscope.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/bright_display.png b/app/src/main/res/mipmap-xxhdpi/bright_display.png
index 311f0ed..d129e16 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/bright_display.png and b/app/src/main/res/mipmap-xxhdpi/bright_display.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/stroboscope.png b/app/src/main/res/mipmap-xxhdpi/stroboscope.png
new file mode 100644
index 0000000..4f9c5c5
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/stroboscope.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/bright_display.png b/app/src/main/res/mipmap-xxxhdpi/bright_display.png
index 9acfbbb..e850819 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/bright_display.png and b/app/src/main/res/mipmap-xxxhdpi/bright_display.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/stroboscope.png b/app/src/main/res/mipmap-xxxhdpi/stroboscope.png
new file mode 100644
index 0000000..47287c0
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/stroboscope.png differ