diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index 21c0f3be..13cc1416 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -703,7 +703,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
         if (media_size_toggle_group.isVisible() ||
             flash_toggle_group.isVisible()
         ) {
-            val transitionSet = createTransition()
+            val transitionSet = createTransition(isClosing = true)
             TransitionManager.go(defaultScene, transitionSet)
             return true
         }
@@ -765,15 +765,17 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
         media_size_toggle_group.children.map { it as MaterialButton }.forEach(::setButtonColors)
     }
 
-    private fun createTransition(): Transition {
+    private fun createTransition(isClosing: Boolean = false): Transition {
         val fadeTransition = Fade()
         val changeBounds = ChangeBounds().apply {
             interpolator = OvershootInterpolator()
         }
         return TransitionSet().apply {
-            addTransition(changeBounds)
+            if (!isClosing) {
+                addTransition(changeBounds)
+            }
             addTransition(fadeTransition)
-            this.duration = 200L
+            this.duration = resources.getInteger(R.integer.icon_anim_duration).toLong()
         }
     }
 
diff --git a/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml b/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml
index 20b365b3..eb8bdd91 100644
--- a/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml
+++ b/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml
@@ -7,14 +7,14 @@
         <aapt:attr name="android:animation">
             <set>
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleX"
                     android:valueFrom="0.9"
                     android:valueTo="1"
                     android:valueType="floatType" />
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleY"
                     android:valueFrom="0.9"
diff --git a/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml b/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml
index de740180..7ebc744a 100644
--- a/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml
+++ b/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml
@@ -7,14 +7,14 @@
         <aapt:attr name="android:animation">
             <set>
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleX"
                     android:valueFrom="1"
                     android:valueTo="0.9"
                     android:valueType="floatType" />
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleY"
                     android:valueFrom="1"
diff --git a/app/src/main/res/drawable/video_rec_idle_to_record.xml b/app/src/main/res/drawable/video_rec_idle_to_record.xml
index 6a39c308..4f26e17f 100644
--- a/app/src/main/res/drawable/video_rec_idle_to_record.xml
+++ b/app/src/main/res/drawable/video_rec_idle_to_record.xml
@@ -7,7 +7,7 @@
         <aapt:attr name="android:animation">
             <set>
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleX"
                     android:valueFrom="1"
@@ -15,7 +15,7 @@
                     android:valueType="floatType" />
 
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleY"
                     android:valueFrom="1"
diff --git a/app/src/main/res/drawable/video_rec_record_to_idle.xml b/app/src/main/res/drawable/video_rec_record_to_idle.xml
index 85b1d278..2a3fe687 100644
--- a/app/src/main/res/drawable/video_rec_record_to_idle.xml
+++ b/app/src/main/res/drawable/video_rec_record_to_idle.xml
@@ -7,7 +7,7 @@
         <aapt:attr name="android:animation">
             <set>
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleX"
                     android:valueFrom="0"
@@ -15,7 +15,7 @@
                     android:valueType="floatType" />
 
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleY"
                     android:valueFrom="0"
diff --git a/app/src/main/res/drawable/video_rec_unpressed_to_pressed.xml b/app/src/main/res/drawable/video_rec_unpressed_to_pressed.xml
index d197c67f..37754633 100644
--- a/app/src/main/res/drawable/video_rec_unpressed_to_pressed.xml
+++ b/app/src/main/res/drawable/video_rec_unpressed_to_pressed.xml
@@ -7,14 +7,14 @@
         <aapt:attr name="android:animation">
             <set>
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleX"
                     android:valueFrom="1"
                     android:valueTo="0.9"
                     android:valueType="floatType" />
                 <objectAnimator
-                    android:duration="@integer/shutter_anim_duration"
+                    android:duration="@integer/icon_anim_duration"
                     android:interpolator="@android:anim/accelerate_interpolator"
                     android:propertyName="scaleY"
                     android:valueFrom="1"
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 55ebaf7a..b03ec91a 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="shutter_anim_duration">200</integer>
+    <integer name="icon_anim_duration">200</integer>
 </resources>