diff --git a/app/build.gradle b/app/build.gradle
index a3e2c93bf..474fedca9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.9.2'
+    compile 'com.simplemobiletools:commons:2.9.4'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 73b1caa4c..f932c8818 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Keep aspect ratio</string>
     <string name="invalid_values">Please enter a valid resolution</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Renombrar archivo</string>
-    <string name="rename_folder">Renombrar carpeta</string>
-    <string name="rename_file_error">No se pudo renombrar el archivo</string>
-    <string name="rename_folder_error">No se pudo renombrar la carpeta</string>
-    <string name="rename_folder_empty">El nombre de carpeta no puede estar vacío</string>
-    <string name="rename_folder_exists">A folder with that name already exists</string>
-    <string name="rename_folder_root">Cannot rename the root folder of a storage</string>
-    <string name="rename_folder_ok">Carpeta renombrada correctamente</string>
-    <string name="renaming_folder">Renombrando carpeta</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Save</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dacc1c984..5c50012fb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Seitenverhältnis beibehalten</string>
     <string name="invalid_values">Bitte gib eine korrekte Auflösung ein</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Datei umbenennen</string>
-    <string name="rename_folder">Ordner umbenennen</string>
-    <string name="rename_file_error">Konnte die Datei nicht umbenennen</string>
-    <string name="rename_folder_error">Konnte den Ordner nicht umbenennen</string>
-    <string name="rename_folder_empty">Ordnername darf nicht leer sein</string>
-    <string name="rename_folder_exists">Ein Ordner mit diesem Namen existiert bereits</string>
-    <string name="rename_folder_root">Root-Ordner des Speichers kann nicht umbenannt werden</string>
-    <string name="rename_folder_ok">Ordner erfolgreich umbenannt</string>
-    <string name="renaming_folder">Ordner umbennenen</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Speichern</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index d63124950..f932c8818 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -42,20 +42,6 @@
     <string name="keep_aspect_ratio">Keep aspect ratio</string>
     <string name="invalid_values">Please enter a valid resolution</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Renombrar archivo</string>
-    <string name="rename_folder">Renombrar carpeta</string>
-    <string name="rename_file_error">No se pudo renombrar el archivo</string>
-    <string name="rename_folder_error">No se pudo renombrar la carpeta</string>
-    <string name="rename_folder_empty">El nombre de carpeta no puede estar vacío</string>
-    <string name="rename_folder_exists">A folder with that name already exists</string>
-    <string name="rename_folder_root">Cannot rename the root folder of a storage</string>
-    <string name="rename_folder_ok">Carpeta renombrada correctamente</string>
-    <string name="renaming_folder">Renombrando carpeta</string>
-    <string name="filename_cannot_be_empty">El nombre de archivo no puede estar vacío</string>
-    <string name="filename_invalid_characters">Filename contains invalid characters</string>
-    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Save</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 15a735229..edd155602 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Garder le ratio</string>
     <string name="invalid_values">Veuillez entrez une résolution valide</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Renommer le fichier</string>
-    <string name="rename_folder">Renommer le dossier</string>
-    <string name="rename_file_error">Impossible de renommer le fichier</string>
-    <string name="rename_folder_error">Impossible de renommer le dossier.</string>
-    <string name="rename_folder_empty">Le nom de dossier ne peut pas être vide.</string>
-    <string name="rename_folder_exists">Un dossier homonyme existe déjà.</string>
-    <string name="rename_folder_root">Impossible de renommer le dossier racine de la mémoire.</string>
-    <string name="rename_folder_ok">Dossier renommé avec succès</string>
-    <string name="renaming_folder">Renommage du dossier</string>
-
     <!-- Editor -->
     <string name="editor">Éditeur</string>
     <string name="save">Sauvegarder</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index d63124950..f932c8818 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -42,20 +42,6 @@
     <string name="keep_aspect_ratio">Keep aspect ratio</string>
     <string name="invalid_values">Please enter a valid resolution</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Renombrar archivo</string>
-    <string name="rename_folder">Renombrar carpeta</string>
-    <string name="rename_file_error">No se pudo renombrar el archivo</string>
-    <string name="rename_folder_error">No se pudo renombrar la carpeta</string>
-    <string name="rename_folder_empty">El nombre de carpeta no puede estar vacío</string>
-    <string name="rename_folder_exists">A folder with that name already exists</string>
-    <string name="rename_folder_root">Cannot rename the root folder of a storage</string>
-    <string name="rename_folder_ok">Carpeta renombrada correctamente</string>
-    <string name="renaming_folder">Renombrando carpeta</string>
-    <string name="filename_cannot_be_empty">El nombre de archivo no puede estar vacío</string>
-    <string name="filename_invalid_characters">Filename contains invalid characters</string>
-    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Save</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 863dedd78..f2b23bab1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Keep aspect ratio</string>
     <string name="invalid_values">Please enter a valid resolution</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Rename file</string>
-    <string name="rename_folder">Rename folder</string>
-    <string name="rename_file_error">Could not rename the file</string>
-    <string name="rename_folder_error">Could not rename the folder</string>
-    <string name="rename_folder_empty">Folder name must not be empty</string>
-    <string name="rename_folder_exists">A folder with that name already exists</string>
-    <string name="rename_folder_root">Cannot rename the root folder of a storage</string>
-    <string name="rename_folder_ok">Folder renamed successfully</string>
-    <string name="renaming_folder">Renaming folder</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Save</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a4eede504..da56fa6a5 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Keep aspect ratio</string>
     <string name="invalid_values">Please enter a valid resolution</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Rinomina file</string>
-    <string name="rename_folder">Rinomina cartella</string>
-    <string name="rename_file_error">Impossibile rinominare il file</string>
-    <string name="rename_folder_error">Impossibile rinominare la cartella</string>
-    <string name="rename_folder_empty">Il nome della cartella non deve essere vuoto</string>
-    <string name="rename_folder_exists">Esiste già una cartella con questo nome</string>
-    <string name="rename_folder_root">Non è possibile rinominare la cartella principale</string>
-    <string name="rename_folder_ok">Cartella rinominata correttamente</string>
-    <string name="renaming_folder">Rinominazione cartella</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Salva</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4dd537034..bdb89e5a1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Keep aspect ratio</string>
     <string name="invalid_values">Please enter a valid resolution</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">ファイルの名前を変更</string>
-    <string name="rename_folder">フォルダーの名前を変更</string>
-    <string name="rename_file_error">ファイルの名前を変更できませんでした</string>
-    <string name="rename_folder_error">フォルダーの名前を変更できませんでした</string>
-    <string name="rename_folder_empty">フォルダー名は空にできません</string>
-    <string name="rename_folder_exists">その名前のフォルダーは既に存在します</string>
-    <string name="rename_folder_root">ストレージのルートフォルダーの名前を変更できません</string>
-    <string name="rename_folder_ok">フォルダーの名前を正常に変更しました</string>
-    <string name="renaming_folder">フォルダーの名前を変更中</string>
-
     <!-- Editor -->
     <string name="editor">エディター</string>
     <string name="save">保存</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7fcb6dbfa..86070687e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Zachowaj proporcje</string>
     <string name="invalid_values">Wpisz poprawną rozdzielczość</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Zmień nazwę</string>
-    <string name="rename_folder">Zmień nazwę folderu</string>
-    <string name="rename_file_error">Nie można zmienić nazwy pliku</string>
-    <string name="rename_folder_error">Nie można zmienić nazwy folderu</string>
-    <string name="rename_folder_empty">Nazwa folderu nie może być pusta</string>
-    <string name="rename_folder_exists">Folder o tej nazwie już istnieje</string>
-    <string name="rename_folder_root">Nie można zmienić nazwy folderu głównego</string>
-    <string name="rename_folder_ok">Zmieniono nazwę folderu</string>
-    <string name="renaming_folder">Zmiana nazwy folderu</string>
-
     <!-- Editor -->
     <string name="editor">Edycja</string>
     <string name="save">zapisz</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index f886aa695..c70c02393 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Manter rácio de tamanho</string>
     <string name="invalid_values">Digite uma resolução válida</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Renomear ficheiro</string>
-    <string name="rename_folder">Renomear pasta</string>
-    <string name="rename_file_error">Não foi possível renomear o ficheiro</string>
-    <string name="rename_folder_error">Não foi possível renomear a pasta</string>
-    <string name="rename_folder_empty">O nome da pasta não pode estar vazio</string>
-    <string name="rename_folder_exists">Já existe uma pasta com este nome</string>
-    <string name="rename_folder_root">Não pode renomear a pasta raiz de um armazenamento</string>
-    <string name="rename_folder_ok">A pasta foi renomeada com sucesso</string>
-    <string name="renaming_folder">A renomear pasta</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Guardar</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fd0d03755..19d356f0b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Сохранить соотношение сторон</string>
     <string name="invalid_values">Указано недопустимое разрешение</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Изменение имени файла</string>
-    <string name="rename_folder">Изменение имени папки</string>
-    <string name="rename_file_error">Невозможно переименовать файл</string>
-    <string name="rename_folder_error">Невозможно переименовать папку</string>
-    <string name="rename_folder_empty">Имя папки не должно быть пустым</string>
-    <string name="rename_folder_exists">Папка с таким именем уже существует</string>
-    <string name="rename_folder_root">Невозможно переименовать корневую папку хранения</string>
-    <string name="rename_folder_ok">Папка переименована успешно</string>
-    <string name="renaming_folder">Изменение имени папки</string>
-
     <!-- Editor -->
     <string name="editor">Редактор</string>
     <string name="save">Сохранить</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 63690198a..d5ceababf 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Zachovať pomer strán</string>
     <string name="invalid_values">Prosím zadajte platné rozlíšenie</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Premenovať súbor</string>
-    <string name="rename_folder">Premenovať priečinok</string>
-    <string name="rename_file_error">Nepodarilo sa premenovať súbor</string>
-    <string name="rename_folder_error">Nepodarilo sa premenovať priečinok</string>
-    <string name="rename_folder_empty">Názov priečinka nemôže byť prázdny</string>
-    <string name="rename_folder_exists">Priečinok s daným názvom už existuje</string>
-    <string name="rename_folder_root">Nepodarilo sa premenovať základný priečinok úložiska</string>
-    <string name="rename_folder_ok">Priečinok bol úspešne premenovaný</string>
-    <string name="renaming_folder">Premenúva sa priečinok</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Uložiť</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 07e3cc927..897e91cfd 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Behåll bildförhållande</string>
     <string name="invalid_values">Ange en giltig bildupplösning</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Döp om fil</string>
-    <string name="rename_folder">Döp om mapp</string>
-    <string name="rename_file_error">Det gick inte att döpa om filen</string>
-    <string name="rename_folder_error">Det gick inte att döpa om mappen</string>
-    <string name="rename_folder_empty">Du måste ange ett mappnamn</string>
-    <string name="rename_folder_exists">En mapp med det namnet finns redan</string>
-    <string name="rename_folder_root">Det går inte att döpa om rotmappen på lagringsutrymmet</string>
-    <string name="rename_folder_ok">Mappen döptes om</string>
-    <string name="renaming_folder">Döper om mappen</string>
-
     <!-- Editor -->
     <string name="editor">Redigera</string>
     <string name="save">Spara</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ab364b203..0944ddffb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">En-boy oranını koru</string>
     <string name="invalid_values">Lütfen geçerli bir çözüm önerisi girin</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Dosyayı yeniden adlandır</string>
-    <string name="rename_folder">Klasörü yeniden adlandır</string>
-    <string name="rename_file_error">Dosya yeniden adlandırılamadı</string>
-    <string name="rename_folder_error">Klasör yeniden adlandırılamadı</string>
-    <string name="rename_folder_empty">Klasör adı boş olmamalıdır</string>
-    <string name="rename_folder_exists">Bu ada sahip bir klasör zaten var</string>
-    <string name="rename_folder_root">Depolama kök klasörü yeniden adlandırılamıyor</string>
-    <string name="rename_folder_ok">Klasör başarıyla yeniden adlandırıldı</string>
-    <string name="renaming_folder">Klasörü yeniden adlandır</string>
-
     <!-- Editor -->
     <string name="editor">Editör</string>
     <string name="save">Kaydet</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f83d629d6..5b46d99cc 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">保持纵横比</string>
     <string name="invalid_values">请输入合法的分辨率</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">重命名文件</string>
-    <string name="rename_folder">重命名文件夹</string>
-    <string name="rename_file_error">文件无法重命名</string>
-    <string name="rename_folder_error">Could not rename the folder</string>
-    <string name="rename_folder_empty">文件夹名不能为空</string>
-    <string name="rename_folder_exists">文件夹名已存在</string>
-    <string name="rename_folder_root">存储器的根目录无法重命名</string>
-    <string name="rename_folder_ok">文件夹重命名成功</string>
-    <string name="renaming_folder">重命名中...</string>
-
     <!-- Editor -->
     <string name="editor">编辑器</string>
     <string name="save">保存</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 863dedd78..f2b23bab1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,17 +42,6 @@
     <string name="keep_aspect_ratio">Keep aspect ratio</string>
     <string name="invalid_values">Please enter a valid resolution</string>
 
-    <!-- Renaming -->
-    <string name="rename_file">Rename file</string>
-    <string name="rename_folder">Rename folder</string>
-    <string name="rename_file_error">Could not rename the file</string>
-    <string name="rename_folder_error">Could not rename the folder</string>
-    <string name="rename_folder_empty">Folder name must not be empty</string>
-    <string name="rename_folder_exists">A folder with that name already exists</string>
-    <string name="rename_folder_root">Cannot rename the root folder of a storage</string>
-    <string name="rename_folder_ok">Folder renamed successfully</string>
-    <string name="renaming_folder">Renaming folder</string>
-
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Save</string>