diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6d4e1750..fca20c8e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,7 +27,7 @@
   <component name="ProjectPlainTextFileTypeManager">
     <file url="file://$PROJECT_DIR$/app/src/main/res/values-v21/bools.xml" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/app-release.apk b/app/app-release.apk
index 45e9bbd3..ad33e1bf 100644
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/build.gradle b/app/build.gradle
index cd0fa852..ddc4becd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "us.koller.cameraroll"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 16
-        versionName "v1.3.1 Beta"
+        versionCode 17
+        versionName "v1.3.2 Beta"
         renderscriptTargetApi 25
         vectorDrawables.useSupportLibrary = true
         renderscriptSupportModeEnabled true
diff --git a/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java b/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java
index ac9d10d0..7bb16a2c 100644
--- a/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java
+++ b/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java
@@ -740,13 +740,13 @@ public void run() {
 
                     toolbar.setTitleTextColor(ContextCompat.getColor(AlbumActivity.this, R.color.grey_900_translucent));
 
-                    /*//show share button
-                    menu.findItem(R.id.share).setVisible(true);
+                    //show share button
+                    //menu.findItem(R.id.share).setVisible(true);
                     //show copy & move button
-                    menu.findItem(R.id.copy).setVisible(true);
+                    /*menu.findItem(R.id.copy).setVisible(true);
                     menu.findItem(R.id.move).setVisible(true);*/
                 }
-            }, navIcon instanceof Animatable ? 500 : 0);
+            }, navIcon instanceof Animatable ? (int) (500 * Util.getAnimatorSpeed(this)) : 0);
         } else {
             toolbar.setBackgroundColor(ContextCompat
                     .getColor(this, R.color.colorAccent));
@@ -820,7 +820,7 @@ public void run() {
                 menu.findItem(R.id.copy).setVisible(false);
                 menu.findItem(R.id.move).setVisible(false);
             }
-        }, navIcon instanceof Animatable ? 500 : 0);
+        }, navIcon instanceof Animatable ? (int) (500 * Util.getAnimatorSpeed(this)) : 0);
 
         animateFab(false, false);
     }
@@ -871,7 +871,7 @@ public void run() {
                     setPhotosResult();
                 }
             }
-        }, 400);
+        }, (int) (400 * Util.getAnimatorSpeed(this)));
     }
 
     public void animateFab(final boolean show, boolean click) {
@@ -908,7 +908,7 @@ public void run() {
                         .setDuration(250)
                         .start();
             }
-        }, click ? 400 : 0);
+        }, click ? (int) (400 * Util.getAnimatorSpeed(this)) : 0);
     }
 
     private void setSystemUiFlags() {
diff --git a/app/src/main/java/us/koller/cameraroll/ui/FileExplorerActivity.java b/app/src/main/java/us/koller/cameraroll/ui/FileExplorerActivity.java
index a68cb77e..5a0f466e 100644
--- a/app/src/main/java/us/koller/cameraroll/ui/FileExplorerActivity.java
+++ b/app/src/main/java/us/koller/cameraroll/ui/FileExplorerActivity.java
@@ -289,7 +289,7 @@ public boolean onPreDraw() {
                             public void run() {
                                 recyclerViewAdapter.pickTarget();
                             }
-                        }, 500);
+                        }, (int) (500 * Util.getAnimatorSpeed(this)));
                     }
                 }
             }
@@ -720,7 +720,7 @@ public void run() {
                     }
                 }
             }
-        }, navIcon instanceof Animatable ? 500 : 0);
+        }, navIcon instanceof Animatable ? (int) (500 * Util.getAnimatorSpeed(this)) : 0);
     }
 
     @Override
@@ -808,7 +808,7 @@ public void run() {
                     }
                 }
             }
-        }, 300);
+        }, (int) (300 * Util.getAnimatorSpeed(this)));
     }
 
     @Override
@@ -911,6 +911,6 @@ public void setTitle(Toolbar toolbar) {
                     }
                 }
             }
-        }, navIcon instanceof Animatable ? 500 : 0);
+        }, navIcon instanceof Animatable ? (int) (500 * Util.getAnimatorSpeed(this)) : 0);
     }
 }
diff --git a/app/src/main/java/us/koller/cameraroll/ui/FileOperationDialogActivity.java b/app/src/main/java/us/koller/cameraroll/ui/FileOperationDialogActivity.java
index ba146194..f0df12c8 100644
--- a/app/src/main/java/us/koller/cameraroll/ui/FileOperationDialogActivity.java
+++ b/app/src/main/java/us/koller/cameraroll/ui/FileOperationDialogActivity.java
@@ -10,7 +10,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,7 +18,6 @@
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/us/koller/cameraroll/ui/ItemActivity.java b/app/src/main/java/us/koller/cameraroll/ui/ItemActivity.java
index cc29050b..73a78a37 100644
--- a/app/src/main/java/us/koller/cameraroll/ui/ItemActivity.java
+++ b/app/src/main/java/us/koller/cameraroll/ui/ItemActivity.java
@@ -717,7 +717,7 @@ public void bottomBarOnClick(View v) {
                         public void run() {
                             showDeleteDialog();
                         }
-                    }, 400);
+                    }, (int) (400 * Util.getAnimatorSpeed(this)));
                 } else {
                     showDeleteDialog();
                 }
diff --git a/app/src/main/java/us/koller/cameraroll/util/Util.java b/app/src/main/java/us/koller/cameraroll/util/Util.java
index bc530358..707efaf2 100644
--- a/app/src/main/java/us/koller/cameraroll/util/Util.java
+++ b/app/src/main/java/us/koller/cameraroll/util/Util.java
@@ -15,6 +15,7 @@
 import android.os.Build;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
+import android.provider.Settings;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
@@ -24,6 +25,7 @@
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -171,4 +173,9 @@ public static int[] getScreenSize(Activity context) {
                 displayRect.left, displayRect.top,
                 displayRect.right, displayRect.bottom};
     }
+
+    public static float getAnimatorSpeed(Context context) {
+        return Settings.Global.getFloat(context.getContentResolver(),
+                Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f);
+    }
 }
diff --git a/app/src/main/res/drawable-ldrtl-v21/back_to_cancel_avd.xml b/app/src/main/res/drawable-ldrtl-v21/back_to_cancel_avd.xml
new file mode 100644
index 00000000..e62d13bc
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl-v21/back_to_cancel_avd.xml
@@ -0,0 +1,206 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+
+    <aapt:attr name="android:drawable">
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+            android:width="24dp"
+            android:height="24dp"
+            android:alpha="0.54"
+            android:viewportHeight="24"
+            android:viewportWidth="24">
+            <group
+                android:name="group"
+                android:pivotX="12"
+                android:pivotY="12"
+                android:translateX="7.3">
+
+                <path
+                    android:name="stem"
+                    android:pathData="M 11.41 12 L -2.59 12 Z"
+                    android:strokeColor="@color/white"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2"
+                    android:trimPathStart="0" />
+                <path
+                    android:name="arrow_head_top"
+                    android:pathData="M 12.71 12.71 L 4.7 4.7 Z"
+                    android:strokeColor="@color/white"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2" />
+                <path
+                    android:name="arrow_head_bottom"
+                    android:pathData="M 12.71 11.29 L 4.7 19.3 Z"
+                    android:strokeColor="@color/white"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2" />
+                <path
+                    android:name="clear_top_right"
+                    android:pathData="M 12 12 L 18.3 5.7 Z"
+                    android:strokeColor="@color/white"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2"
+                    android:trimPathStart="1" />
+                <path
+                    android:name="clear_bottom_right"
+                    android:pathData="M 12 12 L 18.3 18.3 Z"
+                    android:strokeColor="@color/white"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2"
+                    android:trimPathStart="1" />
+            </group>
+        </vector>
+    </aapt:attr>
+
+    <target android:name="stem">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="stem"
+                    android:duration="250"
+                    android:fillAfter="true"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathStart"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/white"
+                    android:valueTo="@color/grey_900"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="clear_bottom_right">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="clear_bottom_right"
+                    android:duration="250"
+                    android:fillAfter="true"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathStart"
+                    android:startOffset="250"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/white"
+                    android:valueTo="@color/grey_900"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="clear_top_right">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:name="clear_top_right"
+                    android:duration="250"
+                    android:fillAfter="true"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathStart"
+                    android:startOffset="250"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/white"
+                    android:valueTo="@color/grey_900"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="arrow_head_top">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:name="arrow_head_top"
+                    android:duration="500"
+                    android:fillAfter="true"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathEnd"
+                    android:valueFrom="1"
+                    android:valueTo="0.44"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/white"
+                    android:valueTo="@color/grey_900"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="arrow_head_bottom">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="arrow_head_bottom"
+                    android:duration="500"
+                    android:fillAfter="true"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathEnd"
+                    android:valueFrom="1"
+                    android:valueTo="0.44"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/white"
+                    android:valueTo="@color/grey_900"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="group">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="group"
+                    android:duration="500"
+                    android:fillAfter="true"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="translateX"
+                    android:valueFrom="7.3"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="group"
+                    android:duration="375"
+                    android:fillAfter="true"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="rotation"
+                    android:startOffset="125"
+                    android:valueFrom="0"
+                    android:valueTo="180"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/app/src/main/res/drawable-ldrtl-v21/cancel_to_back_avd.xml b/app/src/main/res/drawable-ldrtl-v21/cancel_to_back_avd.xml
new file mode 100644
index 00000000..aeed546c
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl-v21/cancel_to_back_avd.xml
@@ -0,0 +1,195 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+            android:width="24dp"
+            android:height="24dp"
+            android:alpha="0.54"
+            android:viewportHeight="24"
+            android:viewportWidth="24">
+            <group
+                android:name="group"
+                android:pivotX="12"
+                android:pivotY="12">
+                <path
+                    android:name="stem"
+                    android:pathData="M 11.41 12 L -2.59 12 Z"
+                    android:strokeColor="@color/grey_900"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2"
+                    android:trimPathStart="1" />
+                <path
+                    android:name="arrow_head_top"
+                    android:pathData="M 12.71 12.71 L 4.7 4.7 Z"
+                    android:strokeColor="@color/grey_900"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2"
+                    android:trimPathEnd="0.44" />
+                <path
+                    android:name="arrow_head_bottom"
+                    android:pathData="M 12.71 11.29 L 4.7 19.3 Z"
+                    android:strokeColor="@color/grey_900"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2"
+                    android:trimPathEnd="0.44" />
+                <path
+                    android:name="clear_top_right"
+                    android:pathData="M 12 12 L 18.3 5.7 Z"
+                    android:strokeColor="@color/grey_900"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2" />
+                <path
+                    android:name="clear_bottom_right"
+                    android:pathData="M 12 12 L 18.3 18.3 Z"
+                    android:strokeColor="@color/grey_900"
+                    android:strokeMiterLimit="10"
+                    android:strokeWidth="2" />
+            </group>
+        </vector>
+    </aapt:attr>
+
+    <target android:name="stem">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="stem"
+                    android:duration="250"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathStart"
+                    android:startOffset="250"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/grey_900"
+                    android:valueTo="@color/white"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="clear_bottom_right">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="clear_bottom_right"
+                    android:duration="250"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathStart"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/grey_900"
+                    android:valueTo="@color/white"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="clear_top_right">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="clear_top_right"
+                    android:duration="250"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathStart"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/grey_900"
+                    android:valueTo="@color/white"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="arrow_head_top">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="arrow_head_top"
+                    android:duration="500"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathEnd"
+                    android:valueFrom="0.44"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/grey_900"
+                    android:valueTo="@color/white"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="arrow_head_bottom">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="arrow_head_bottom"
+                    android:duration="500"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="trimPathEnd"
+                    android:valueFrom="0.44"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="stroke_color"
+                    android:duration="300"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="strokeColor"
+                    android:valueFrom="@color/grey_900"
+                    android:valueTo="@color/white"
+                    android:valueType="colorType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="group">
+        <aapt:attr name="android:animation">
+            <set xmlns:android="http://schemas.android.com/apk/res/android">
+                <objectAnimator
+                    android:name="group"
+                    android:duration="500"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="translateX"
+                    android:valueFrom="0"
+                    android:valueTo="7.3"
+                    android:valueType="floatType" />
+
+                <objectAnimator
+                    android:name="group"
+                    android:duration="375"
+                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                    android:propertyName="rotation"
+                    android:valueFrom="180"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/app/src/main/res/layout-v21/file_op_view_holder.xml b/app/src/main/res/layout-v21/file_op_view_holder.xml
index d575a3cf..c9896c41 100644
--- a/app/src/main/res/layout-v21/file_op_view_holder.xml
+++ b/app/src/main/res/layout-v21/file_op_view_holder.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:contentDescription="@string/photo"
         android:scaleType="centerCrop" />
 
diff --git a/app/src/main/res/layout/file_op_view_holder.xml b/app/src/main/res/layout/file_op_view_holder.xml
index 2db5b149..48b4acee 100644
--- a/app/src/main/res/layout/file_op_view_holder.xml
+++ b/app/src/main/res/layout/file_op_view_holder.xml
@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:contentDescription="@string/photo"
         android:scaleType="centerCrop" />