diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 230e7dc7..9ffcae9e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,8 +9,8 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.CameraRoll">
 
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 56697adb..f208cd7a 100644
--- a/app/src/main/java/us/koller/cameraroll/ui/FileOperationDialogActivity.java
+++ b/app/src/main/java/us/koller/cameraroll/ui/FileOperationDialogActivity.java
@@ -2,14 +2,12 @@
 
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Environment;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -21,8 +19,7 @@
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.Target;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import java.util.ArrayList;
 
@@ -159,15 +156,17 @@ public void showFolderSelectorDialog(final File_POJO[] files) {
                             public void onClick(DialogInterface dialogInterface, int i) {
                                 String path = recyclerViewAdapter.getSelectedPath();
                                 if (path != null) {
-                                    if (path.equals(CREATE_NEW_FOLDER)) {
-                                        creatingNewFolder = true;
-                                        createNewFolder(files);
-                                    } else {
-                                        executeAction(files, path);
-                                    }
+                                    executeAction(files, path);
                                 }
                             }
                         })
+                .setNeutralButton(getString(R.string.new_folder), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        creatingNewFolder = true;
+                        createNewFolder(files);
+                    }
+                })
                 .setNegativeButton(R.string.cancel, null)
                 .setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
@@ -201,7 +200,7 @@ public void createNewFolderDialog(final NewFolderCallback callback) {
 
         final EditText editText = (EditText) dialogLayout.findViewById(R.id.edit_text);
 
-        dialog = new AlertDialog.Builder(this)
+        dialog = new AlertDialog.Builder(this, R.style.Theme_CameraRoll_Dialog)
                 .setTitle(R.string.new_folder)
                 .setView(dialogLayout)
                 .setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
@@ -233,14 +232,14 @@ public void failed(String path) {
                 .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        creatingNewFolder = false;
-                        //showFolderSelectorDialog();
+                        showFolderSelectorDialog();
                     }
                 })
                 .setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface dialogInterface) {
                         onDialogDismiss();
+                        creatingNewFolder = false;
                     }
                 })
                 .create();
@@ -284,11 +283,7 @@ String getSelectedPath() {
                 return null;
             }
 
-            if (albums.size() > selected_position) {
-                return albums.get(selected_position).getPath();
-            } else {
-                return CREATE_NEW_FOLDER;
-            }
+            return albums.get(selected_position).getPath();
         }
 
         @Override
@@ -300,25 +295,18 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
 
         @Override
         public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
-            if (albums.size() > position) {
-                final Album album = albums.get(position);
-                ((TextView) holder.itemView.findViewById(R.id.album_title))
-                        .setText(album.getName());
-
-                if (album.getAlbumItems().size() > 0) {
-                    Glide.with(holder.itemView.getContext())
-                            .load(album.getAlbumItems().get(0).getPath())
-                            .asBitmap()
-                            //.centerCrop()
-                            .error(R.drawable.error_placeholder_tinted)
-                            .into((ImageView) holder.itemView.findViewById(R.id.image));
-                }
-            } else {
-                ((TextView) holder.itemView.findViewById(R.id.album_title))
-                        .setText(holder.itemView.getContext().getString(R.string.new_folder));
+            final Album album = albums.get(position);
+            ((TextView) holder.itemView.findViewById(R.id.album_title))
+                    .setText(album.getName());
+
+            if (album.getAlbumItems().size() > 0) {
+                Log.d("FileOperationDialog", "onBindViewHolder: " + album.getAlbumItems().get(0).getPath());
 
                 Glide.with(holder.itemView.getContext())
-                        .load(R.drawable.new_folder_placeholder)
+                        .load(album.getAlbumItems().get(0).getPath())
+                        .skipMemoryCache(true)
+                        .thumbnail(0.1f)
+                        .error(R.drawable.error_placeholder_tinted)
                         .into((ImageView) holder.itemView.findViewById(R.id.image));
             }
 
@@ -360,7 +348,7 @@ public void onClick(View view) {
 
         @Override
         public int getItemCount() {
-            return albums.size() + 1;
+            return albums.size();
         }
     }
 }
diff --git a/app/src/main/res/drawable/new_folder_placeholder.png b/app/src/main/res/drawable/new_folder_placeholder.png
deleted file mode 100644
index caadd0d4..00000000
Binary files a/app/src/main/res/drawable/new_folder_placeholder.png and /dev/null differ
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 fcec5d30..d575a3cf 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
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <us.koller.cameraroll.ui.widget.SquareCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="200dp"
     android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
     android:layout_margin="8dp"
-    android:stateListAnimator="@animator/lift_up">
+    android:stateListAnimator="@animator/lift_up"
+    app:cardBackgroundColor="@color/grey_900">
 
     <ImageView
         android:id="@+id/image"
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 994d6fe7..2db5b149 100644
--- a/app/src/main/res/layout/file_op_view_holder.xml
+++ b/app/src/main/res/layout/file_op_view_holder.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <us.koller.cameraroll.ui.widget.SquareCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="200dp"
     android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
-    android:layout_margin="8dp">
+    android:layout_margin="8dp"
+    app:cardBackgroundColor="@color/grey_900">
 
     <ImageView
         android:id="@+id/image"