diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt
index 3960d80ea..702b941d6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt
@@ -24,8 +24,9 @@ class PickAlbumDialog(val activity: SimpleActivity, val callback: (path: String)
 
         AlertDialog.Builder(activity)
                 .setView(view)
-                .setNeutralButton(R.string.other_folder, { dialogInterface, i -> showOtherFolder() })
                 .setPositiveButton(R.string.ok, null)
+                .setNegativeButton(R.string.cancel, null)
+                .setNeutralButton(R.string.other_folder, { dialogInterface, i -> showOtherFolder() })
                 .create().apply {
             activity.setupDialogStuff(view, this, R.string.select_destination)
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 8361a4f69..9122be9e4 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -19,7 +19,7 @@
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin">
 
-            <TextView
+            <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_customize_colors_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             android:paddingRight="@dimen/settings_padding"
             android:paddingTop="@dimen/activity_margin">
 
-            <TextView
+            <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_show_media_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_copy_move.xml b/app/src/main/res/layout/dialog_copy_move.xml
index 05bb0a09a..bf80d8d81 100644
--- a/app/src/main/res/layout/dialog_copy_move.xml
+++ b/app/src/main/res/layout/dialog_copy_move.xml
@@ -9,14 +9,14 @@
     android:paddingRight="@dimen/activity_margin"
     android:paddingTop="@dimen/activity_margin">
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/source_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/source"
         android:textSize="@dimen/details_text_size"/>
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/source"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -25,14 +25,14 @@
         android:paddingRight="@dimen/small_padding"
         android:paddingTop="@dimen/small_padding"/>
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/destination_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/destination"
         android:textSize="@dimen/details_text_size"/>
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/destination"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_save_as.xml b/app/src/main/res/layout/dialog_save_as.xml
index d3777bc2b..7de31eb45 100644
--- a/app/src/main/res/layout/dialog_save_as.xml
+++ b/app/src/main/res/layout/dialog_save_as.xml
@@ -7,14 +7,14 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/file_path_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/path"
         android:textSize="@dimen/details_text_size"/>
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/file_path"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -23,24 +23,26 @@
         android:paddingRight="@dimen/small_padding"
         android:paddingTop="@dimen/small_padding"/>
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/file_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/activity_margin"
-        android:singleLine="true"/>
+        android:singleLine="true"
+        android:textCursorDrawable="@null"/>
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/file_extension_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/extension"/>
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/file_extension"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/activity_margin"
-        android:singleLine="true"/>
+        android:singleLine="true"
+        android:textCursorDrawable="@null"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/pager_video_item.xml b/app/src/main/res/layout/pager_video_item.xml
index bae1a2727..7d6564f15 100644
--- a/app/src/main/res/layout/pager_video_item.xml
+++ b/app/src/main/res/layout/pager_video_item.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/video_holder"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_holder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <SurfaceView
         android:id="@+id/video_surface"
diff --git a/app/src/main/res/layout/rename_directory.xml b/app/src/main/res/layout/rename_directory.xml
index 4711c9b23..8ccc8f383 100644
--- a/app/src/main/res/layout/rename_directory.xml
+++ b/app/src/main/res/layout/rename_directory.xml
@@ -7,16 +7,17 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/directory_path"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/directory_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/activity_margin"
-        android:singleLine="true"/>
+        android:singleLine="true"
+        android:textCursorDrawable="@null"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/rename_file.xml b/app/src/main/res/layout/rename_file.xml
index 64d5f77dc..e4780e37c 100644
--- a/app/src/main/res/layout/rename_file.xml
+++ b/app/src/main/res/layout/rename_file.xml
@@ -7,29 +7,31 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/file_path"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/file_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/activity_margin"
-        android:singleLine="true"/>
+        android:singleLine="true"
+        android:textCursorDrawable="@null"/>
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/file_extension_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/extension"/>
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/file_extension"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/activity_margin"
-        android:singleLine="true"/>
+        android:singleLine="true"
+        android:textCursorDrawable="@null"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/resize_image.xml b/app/src/main/res/layout/resize_image.xml
index 52df56f46..488c10135 100644
--- a/app/src/main/res/layout/resize_image.xml
+++ b/app/src/main/res/layout/resize_image.xml
@@ -7,13 +7,13 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/image_width_label"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:text="@string/width"/>
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/image_width"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
@@ -21,9 +21,10 @@
         android:layout_marginBottom="@dimen/activity_margin"
         android:inputType="number"
         android:maxLength="6"
-        android:maxLines="1"/>
+        android:maxLines="1"
+        android:textCursorDrawable="@null"/>
 
-    <TextView
+    <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/image_height_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,7 +33,7 @@
         android:layout_toRightOf="@+id/image_width_label"
         android:text="@string/height"/>
 
-    <EditText
+    <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/image_height"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
@@ -41,7 +42,8 @@
         android:layout_below="@+id/image_width_label"
         android:inputType="number"
         android:maxLength="6"
-        android:maxLines="1"/>
+        android:maxLines="1"
+        android:textCursorDrawable="@null"/>
 
     <com.simplemobiletools.commons.views.MyAppCompatCheckbox
         android:id="@+id/keep_aspect_ratio"