diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 6952c945e..ed41ca45b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -95,6 +95,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.sort -> showSortingDialog()
+            R.id.filter -> showFilterMediaDialog()
             R.id.open_camera -> launchCamera()
             R.id.show_all -> showAllMedia()
             R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
@@ -201,6 +202,10 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         }
     }
 
+    private fun showFilterMediaDialog() {
+
+    }
+
     private fun showAllMedia() {
         config.showAll = true
         Intent(this, MediaActivity::class.java).apply {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 6229ffce7..87417c774 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -210,6 +210,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.sort -> showSortingDialog()
+            R.id.filter -> showFilterMediaDialog()
             R.id.toggle_filename -> toggleFilenameVisibility()
             R.id.open_camera -> launchCamera()
             R.id.folder_view -> switchToFolderView()
@@ -227,18 +228,22 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         return true
     }
 
-    private fun toggleFilenameVisibility() {
-        config.displayFileNames = !config.displayFileNames
-        if (media_grid.adapter != null)
-            getRecyclerAdapter().updateDisplayFilenames(config.displayFileNames)
-    }
-
     private fun showSortingDialog() {
         ChangeSortingDialog(this, false, !config.showAll, mPath) {
             getMedia()
         }
     }
 
+    private fun showFilterMediaDialog() {
+
+    }
+
+    private fun toggleFilenameVisibility() {
+        config.displayFileNames = !config.displayFileNames
+        if (media_grid.adapter != null)
+            getRecyclerAdapter().updateDisplayFilenames(config.displayFileNames)
+    }
+
     private fun switchToFolderView() {
         config.showAll = false
         startActivity(Intent(this, MainActivity::class.java))
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index b5125dff1..65205b02f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -11,7 +11,9 @@ import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.extensions.config
-import com.simplemobiletools.gallery.helpers.*
+import com.simplemobiletools.gallery.helpers.ROTATE_BY_ASPECT_RATIO
+import com.simplemobiletools.gallery.helpers.ROTATE_BY_DEVICE_ROTATION
+import com.simplemobiletools.gallery.helpers.ROTATE_BY_SYSTEM_SETTING
 import kotlinx.android.synthetic.main.activity_settings.*
 
 class SettingsActivity : SimpleActivity() {
@@ -40,7 +42,6 @@ class SettingsActivity : SimpleActivity() {
         setupScreenRotation()
         setupReplaceShare()
         setupPasswordProtection()
-        setupShowMedia()
         setupHideSystemUI()
         updateTextColors(settings_holder)
     }
@@ -187,25 +188,4 @@ class SettingsActivity : SimpleActivity() {
         ROTATE_BY_DEVICE_ROTATION -> R.string.screen_rotation_device_rotation
         else -> R.string.screen_rotation_aspect_ratio
     })
-
-    private fun setupShowMedia() {
-        settings_show_media.text = getShowMediaText()
-        settings_show_media_holder.setOnClickListener {
-            val items = arrayListOf(
-                    RadioItem(IMAGES_AND_VIDEOS, res.getString(R.string.images_and_videos)),
-                    RadioItem(IMAGES, res.getString(R.string.images)),
-                    RadioItem(VIDEOS, res.getString(R.string.videos)))
-
-            RadioGroupDialog(this@SettingsActivity, items, config.showMedia) {
-                config.showMedia = it as Int
-                settings_show_media.text = getShowMediaText()
-            }
-        }
-    }
-
-    private fun getShowMediaText() = getString(when (config.showMedia) {
-        IMAGES_AND_VIDEOS -> R.string.images_and_videos
-        IMAGES -> R.string.images
-        else -> R.string.videos
-    })
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
index 2fd607c32..5dc6c7dc3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
@@ -73,13 +73,13 @@ fun Context.getFilesFrom(curPath: String, isPickImage: Boolean, isPickVideo: Boo
 private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isPickVideo: Boolean, curPath: String): ArrayList<Medium> {
     val curMedia = ArrayList<Medium>()
     val config = context.config
-    val showMedia = config.showMedia
+    val filterMedia = config.filterMedia
     val showHidden = config.shouldShowHidden
     val includedFolders = config.includedFolders
     val excludedFolders = config.excludedFolders
     val noMediaFolders = context.getNoMediaFolders()
 
-    cur.use { cur ->
+    cur.use {
         if (cur.moveToFirst()) {
             do {
                 try {
@@ -103,10 +103,10 @@ private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isP
                     if (!isImage && !isVideo)
                         continue
 
-                    if (isVideo && (isPickImage || showMedia == IMAGES))
+                    if (isVideo && (isPickImage || filterMedia and VIDEOS == 0))
                         continue
 
-                    if (isImage && (isPickVideo || showMedia == VIDEOS))
+                    if (isImage && (isPickVideo || filterMedia and IMAGES == 0))
                         continue
 
                     if (!showHidden && filename.startsWith('.'))
@@ -164,10 +164,10 @@ private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isP
             if (!isImage && !isVideo)
                 continue
 
-            if (isVideo && (isPickImage || showMedia == IMAGES))
+            if (isVideo && (isPickImage || filterMedia and VIDEOS == 0))
                 continue
 
-            if (isImage && (isPickVideo || showMedia == VIDEOS))
+            if (isImage && (isPickVideo || filterMedia and IMAGES == 0))
                 continue
 
             val dateTaken = file.lastModified()
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index 167988674..8ce4a8457 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -156,9 +156,9 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(DARK_BACKGROUND, false)
         set(darkBackground) = prefs.edit().putBoolean(DARK_BACKGROUND, darkBackground).apply()
 
-    var showMedia: Int
-        get() = prefs.getInt(SHOW_MEDIA, IMAGES_AND_VIDEOS)
-        set(showMedia) = prefs.edit().putInt(SHOW_MEDIA, showMedia).apply()
+    var filterMedia: Int
+        get() = prefs.getInt(FILTER_MEDIA, IMAGES or VIDEOS or GIFS)
+        set(filterMedia) = prefs.edit().putInt(FILTER_MEDIA, filterMedia).apply()
 
     var dirColumnCnt: Int
         get() = prefs.getInt(getDirectoryColumnsField(), getDefaultDirectoryColumnCount())
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
index 3efd48714..72ab0bc18 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -15,6 +15,7 @@ val SCREEN_ROTATION = "screen_rotation"
 val DISPLAY_FILE_NAMES = "display_file_names"
 val DARK_BACKGROUND = "dark_background"
 val PINNED_FOLDERS = "pinned_folders"
+val FILTER_MEDIA = "filter_media"
 val DIR_COLUMN_CNT = "dir_column_cnt"
 val DIR_LANDSCAPE_COLUMN_CNT = "dir_landscape_column_cnt"
 val DIR_HORIZONTAL_COLUMN_CNT = "dir_horizontal_column_cnt"
@@ -24,7 +25,6 @@ val MEDIA_LANDSCAPE_COLUMN_CNT = "media_landscape_column_cnt"
 val MEDIA_HORIZONTAL_COLUMN_CNT = "media_horizontal_column_cnt"
 val MEDIA_LANDSCAPE_HORIZONTAL_COLUMN_CNT = "media_landscape_horizontal_column_cnt"
 val SHOW_ALL = "show_all"                           // display images and videos from all folders together
-val SHOW_MEDIA = "show_media"
 val SAVE_FOLDER_PREFIX = "folder2_"
 val HIDE_FOLDER_TOOLTIP_SHOWN = "hide_folder_tooltip_shown"
 val EXCLUDED_FOLDERS = "excluded_folders"
@@ -57,11 +57,6 @@ val IS_VIEW_INTENT = "is_view_intent"
 val REQUEST_EDIT_IMAGE = 1
 val REQUEST_SET_AS = 2
 
-// show media
-val IMAGES_AND_VIDEOS = 0
-val IMAGES = 1
-val VIDEOS = 2
-
 // rotations
 val ROTATE_BY_SYSTEM_SETTING = 0
 val ROTATE_BY_DEVICE_ROTATION = 1
@@ -70,4 +65,8 @@ val ROTATE_BY_ASPECT_RATIO = 2
 val ORIENT_PORTRAIT = 0
 val ORIENT_LANDSCAPE_LEFT = 1
 val ORIENT_LANDSCAPE_RIGHT = 2
-val ORIENT_UPSIDE_DOWN = 3
+
+// filter media
+val IMAGES = 1
+val VIDEOS = 2
+val GIFS = 4
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ae31ddb62..db2c3fb3b 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -322,40 +322,5 @@
                 android:clickable="false"/>
 
         </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/settings_show_media_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/bigger_margin"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
-            android:paddingTop="@dimen/bigger_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_show_media_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/settings_show_media"
-                android:layout_toStartOf="@+id/settings_show_media"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
-                android:text="@string/show_media"/>
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_show_media"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginEnd="@dimen/small_margin"
-                android:layout_marginRight="@dimen/small_margin"
-                android:background="@null"
-                android:clickable="false"/>
-
-        </RelativeLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index c32d48135..93770fe35 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -11,6 +11,11 @@
         android:icon="@drawable/ic_camera"
         android:title="@string/open_camera"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/filter"
+        android:icon="@drawable/ic_filter"
+        android:title="@string/filter_media"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/show_all"
         android:title="@string/show_all"
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index b8b9b53c5..73c9474e8 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -11,6 +11,11 @@
         android:icon="@drawable/ic_label"
         android:title="@string/toggle_filename"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/filter"
+        android:icon="@drawable/ic_filter"
+        android:title="@string/filter_media"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/folder_view"
         android:title="@string/folder_view"
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 496fb5445..a1f884953 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
     <string name="exclude">Exclude</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Show hidden media</string>
     <string name="autoplay_videos">Play videos automatically</string>
     <string name="toggle_filename">Toggle filename visibility</string>
-    <string name="show_media">Show media</string>
-    <string name="images">Images only</string>
-    <string name="videos">Videos only</string>
-    <string name="gifs">GIFs only</string>
-    <string name="images_videos_gifs">Images, videos, GIFs</string>
-    <string name="images_and_videos">Images and videos</string>
     <string name="loop_videos">Loop videos</string>
     <string name="animate_gifs">Animate GIFs at thumbnails</string>
     <string name="max_brightness">Max brightness when viewing media</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 3b88dc92d..0d5b5652c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Tato funkce skryje složku, včetně podsložek, přidáním souboru \'.nomedia\'. Zobrazíte je zvolením možnosti \'Zobrazit skryté složky\' v nastavení. Pokračovat?</string>
     <string name="exclude">Vyloučit</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Zobrazit skryté média</string>
     <string name="autoplay_videos">Automaticky přehrávat videa</string>
     <string name="toggle_filename">Přepnout viditelnost názvů souborů</string>
-    <string name="show_media">Zobrazit média</string>
-    <string name="images">Jen obrázky</string>
-    <string name="videos">Jen videa</string>
-    <string name="gifs">GIFs only</string>
-    <string name="images_videos_gifs">Images, videos, GIFs</string>
-    <string name="images_and_videos">Obrázky i videa</string>
     <string name="loop_videos">Přehrávat videa ve smyčce</string>
     <string name="animate_gifs">Animovat náhledy souborů GIF</string>
     <string name="max_brightness">Nastavit jas obrazovky na max při zobrazení médií</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ba4a39d71..205a86c71 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Lautstärke</string>
     <string name="brightness">Helligkeit</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Diese Funktion versteckt ausgewählte Ordner (auch für andere Apps), indem dort im Dateisystem eine \'.nomedia\'-Datei abgelegt wird. Dadurch werden auch deren Unterordner versteckt. Solche Ordner werden nur gezeigt, wenn die Einstellung \'Versteckte Ordner zeigen\' aktiv ist (auch andere Apps bieten üblicherweise eine solche Option). Fortfahren?</string>
     <string name="exclude">Ordner ausblenden</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Versteckte Ordner zeigen</string>
     <string name="autoplay_videos">Videos automatisch abspielen</string>
     <string name="toggle_filename">Beschriftungen ein/aus</string>
-    <string name="show_media">Medien auswählen</string>
-    <string name="images">Nur Bilder</string>
-    <string name="videos">Nur Videos</string>
-    <string name="gifs">Nur GIFs</string>
-    <string name="images_videos_gifs">Bilder, Videos und GIFs</string>
-    <string name="images_and_videos">Bilder und Videos</string>
     <string name="loop_videos">Videos in Endlosschleife spielen</string>
     <string name="animate_gifs">Kacheln von GIFs animieren</string>
     <string name="max_brightness">Helligkeit beim Betrachten maximieren</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b5bc78a3a..a56b9ba8c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Esta función oculta la carpeta agregando un archivo \'.nomedia\' en ella, y ocultará también las subcarpetas. Puede mostrarlas cambiando la opción \'Mostrar carpetas ocultas\' en los Ajustes. ¿Continuar?</string>
     <string name="exclude">Excluir</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Mostrar carpetas ocultas</string>
     <string name="autoplay_videos">Reproducir vídeos automáticamente</string>
     <string name="toggle_filename">Cambiar la visibilidad del nombre de archivo</string>
-    <string name="show_media">Mostrar multimedia</string>
-    <string name="images">Solo imágenes</string>
-    <string name="videos">Solo vídeos</string>
-    <string name="gifs">solo GIFs</string>
-    <string name="images_videos_gifs">Imágenes, vídeos, GIFs</string>
-    <string name="images_and_videos">Imágenes y vídeos</string>
     <string name="loop_videos">Reproducción continua de vídeos</string>
     <string name="animate_gifs">Animar las miniaturas de GIFs</string>
     <string name="max_brightness">Brillo máximo cuando se muestra multimedia</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 09c8d563c..556037f3f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Luminosité</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Cette option masque le dossier en ajoutant un fichier \'.nomedia\' à l\'intérieur, cela masquera aussi tous les sous-dossiers. Vous pouvez les voir en modifiant l\'option \'Afficher les dossiers cachés\' dans les Paramètres. Continuer ?</string>
     <string name="exclude">Exclure</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Afficher les dossiers cachés</string>
     <string name="autoplay_videos">Lecture automatique des vidéos</string>
     <string name="toggle_filename">Permuter la visibilité des noms de fichier</string>
-    <string name="show_media">Afficher les médias</string>
-    <string name="images">Seulement les images</string>
-    <string name="videos">Vidéos uniquement</string>
-    <string name="gifs">GIFs seulement</string>
-    <string name="images_videos_gifs">Images, vidéos, GIFs</string>
-    <string name="images_and_videos">Images et vidéos</string>
     <string name="loop_videos">Tourner en boucle les vidéos</string>
     <string name="animate_gifs">GIFs animés sur les miniatures</string>
     <string name="max_brightness">Luminosité maximale lors de l\'affichage de media</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8921e7214..1c4b04c34 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
     <string name="exclude">Exclude</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Show hidden media</string>
     <string name="autoplay_videos">Play videos automatically</string>
     <string name="toggle_filename">Toggle filename visibility</string>
-    <string name="show_media">Show media</string>
-    <string name="images">Images only</string>
-    <string name="videos">Videos only</string>
-    <string name="gifs">GIFs only</string>
-    <string name="images_videos_gifs">Images, videos, GIFs</string>
-    <string name="images_and_videos">Images and videos</string>
     <string name="loop_videos">Loop videos</string>
     <string name="animate_gifs">Animate GIFs at thumbnails</string>
     <string name="max_brightness">Max brightness when viewing media</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b70a13b6c..a1b48cf8c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Luminosità</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Questa funzione nasconde la cartella aggiungendo un file \'.nomedia\' all\'interno, nasconderà anche tutte le sottocartelle. Puoi vederle attivando l\'opzione \'Mostra cartelle nascoste\' nelle impostazioni. Continuare?</string>
     <string name="exclude">Escludi</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Mostra cartelle nascoste</string>
     <string name="autoplay_videos">Riproduci video automaticamente</string>
     <string name="toggle_filename">Visibilità nome del file</string>
-    <string name="show_media">Mostra tipo di media</string>
-    <string name="images">Solo immagini</string>
-    <string name="videos">Solo video</string>
-    <string name="gifs">Solo GIF</string>
-    <string name="images_videos_gifs">Immagini, video, GIF</string>
-    <string name="images_and_videos">Immagini e video</string>
     <string name="loop_videos">Ripeti i video</string>
     <string name="animate_gifs">Anima le GIF in miniatura</string>
     <string name="max_brightness">Luminosità max durante visualizzazione</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a1f649c3a..0a56bc8bd 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
     <string name="exclude">Exclude</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">非表示フォルダーを表示</string>
     <string name="autoplay_videos">自動的にビデオを再生</string>
     <string name="toggle_filename">ファイル名の表示を切り替え</string>
-    <string name="show_media">Show media</string>
-    <string name="images">Images only</string>
-    <string name="videos">Videos only</string>
-    <string name="gifs">GIFs only</string>
-    <string name="images_videos_gifs">Images, videos, GIFs</string>
-    <string name="images_and_videos">Images and videos</string>
     <string name="loop_videos">Loop videos</string>
     <string name="animate_gifs">Animate GIFs at thumbnails</string>
     <string name="max_brightness">Max brightness when viewing media</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 81cbaaae6..722416c06 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Głośność</string>
     <string name="brightness">Jasność</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Ta funkcja ukrywa foldery dodając do nich pusty plik .nomedia. Aby móc je zobaczyć, należy włączyć opcję \'Pokazuj ukryte foldery\' w ustawieniach. Kontyntynuować?</string>
     <string name="exclude">Wyklucz</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Pokazuj ukryte foldery</string>
     <string name="autoplay_videos">Odtwarzaj filmy automatycznie</string>
     <string name="toggle_filename">Pokazuj / ukrywaj nazwy plików</string>
-    <string name="show_media">Pokazywane typy multimediów</string>
-    <string name="images">Tylko obrazy</string>
-    <string name="videos">Tylko filmy</string>
-    <string name="gifs">Tylko GIFy</string>
-    <string name="images_videos_gifs">Obrazy, filmy i GIFy</string>
-    <string name="images_and_videos">Obrazy i filmy</string>
     <string name="loop_videos">Zapętlaj odtwarzanie filmów</string>
     <string name="animate_gifs">Animowane miniatury GIFów</string>
     <string name="max_brightness">Maksymalna jasność podczas wyświetlania multimediów</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ab1b9691c..24b7e10d4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -5,8 +5,7 @@
     <string name="edit">Editar</string>
     <string name="open_camera">Abrir câmera</string>
     <string name="open_with">Abrir com</string>
-    <string name="no_app_found">Nenhum aplicativo encontrado</string>
-       
+    <string name="no_app_found">Nenhum aplicativo encontrado</string>       
     <string name="hidden">(oculto)</string>
     <string name="pin_folder">Fixar pasta</string>
     <string name="unpin_folder">Desfixar pasta</string>
@@ -27,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Esta opção oculta uma pasta com a adição de um arquivo \'.nomedia\' dentro dela, e irá ocultar todas as subpastas que estejam dentro da mesma. Você poderá rever essas pastas com a opção \'Mostrar pastas ocultas\'. Continuar?</string>
     <string name="exclude">Excluir</string>
@@ -97,12 +102,6 @@
     <string name="show_hidden_media">Mostrar pastas ocultas</string>
     <string name="autoplay_videos">Reproduzir vídeos automaticamente</string>
     <string name="toggle_filename">Mostrar/ocultar nome do arquivo</string>
-    <string name="show_media">Mostrar mídia</string>
-    <string name="images">Apenas imagens</string>
-    <string name="videos">Apenas vídeos</string>
-    <string name="gifs">Apenas GIFS</string>
-    <string name="images_videos_gifs">Imagens, vídeos, GIFs</string>
-    <string name="images_and_videos">Imagens e vídeos</string>
     <string name="loop_videos">Reproduzir vídeos em ciclo</string>
     <string name="animate_gifs">Animação de GIFs nas miniaturas</string>
     <string name="max_brightness">Brilho máximo ao visualizar mídia</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 300f156b1..d70a29e5b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brilho</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Esta opção oculta uma pasta com a adição de um ficheiro \'.nomedia\' na pasta, e irá ocultar todas as subpastas existentes. Pode ver as pastas com a opção \'Mostrar pastas ocultas\'. Continuar?</string>
     <string name="exclude">Exclusão</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Mostrar pastas ocultas</string>
     <string name="autoplay_videos">Reproduzir vídeos automaticamente</string>
     <string name="toggle_filename">Mostrar/ocultar nome do ficheiro</string>
-    <string name="show_media">Mostrar multimédia</string>
-    <string name="images">Apenas imagens</string>
-    <string name="videos">Apenas vídeos</string>
-    <string name="gifs">Apenas GIFs</string>
-    <string name="images_videos_gifs">Imagens, vídeos e GIFs</string>
-    <string name="images_and_videos">Imagens e vídeos</string>
     <string name="loop_videos">Vídeos em ciclo</string>
     <string name="animate_gifs">Animação de GIFs nas miniaturas</string>
     <string name="max_brightness">Brilho máximo permitido</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 700fc831e..1071d67d1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Эта опция скрывает папку, добавляя в неё файл \'.nomedia\'; будут скрыты все подпапки. Можно показывать их, переключая \'Показать скрытые папки\' в настройках. Продолжить?</string>
     <string name="exclude">Исключить</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Показать скрытые папки</string>
     <string name="autoplay_videos">Воспроизводить видео автоматически</string>
     <string name="toggle_filename">Переключить отображение имени файла</string>
-    <string name="show_media">Отображать</string>
-    <string name="images">Только изображения</string>
-    <string name="videos">Только видео</string>
-    <string name="gifs">GIFs only</string>
-    <string name="images_videos_gifs">Images, videos, GIFs</string>
-    <string name="images_and_videos">Изображения и видео</string>
     <string name="loop_videos">Повторять видео</string>
     <string name="animate_gifs">Анимировать эскизы GIF-файлов</string>
     <string name="max_brightness">Максимальная яркость при просмотре файлов</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index b9b0ea85c..9b6c25cd4 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Hlasitosť</string>
     <string name="brightness">Jas</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter médií</string>
+    <string name="images">Obrázky</string>
+    <string name="videos">Videá</string>
+    <string name="gifs">GIFká</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Táto funkcia skryje priečinok pridaním súboru \'.nomedia\', skryté budú aj podpriečinky. Môžete ich vidieť zvolením možnosti \'Zobraziť skryté priečinky\' v nastaveniach. Pokračovať?</string>
     <string name="exclude">Vylúčiť</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Zobraziť skryté médiá</string>
     <string name="autoplay_videos">Spúšťať videá automaticky</string>
     <string name="toggle_filename">Prepnúť viditeľnosť názvov súborov</string>
-    <string name="show_media">Zobraziť médiá</string>
-    <string name="images">Iba obrázky</string>
-    <string name="videos">Iba videá</string>
-    <string name="gifs">Iba GIFká</string>
-    <string name="images_videos_gifs">Obrázky, videá, GIFká</string>
-    <string name="images_and_videos">Obrázky aj videá</string>
     <string name="loop_videos">Automaticky reštartovať videá</string>
     <string name="animate_gifs">Animovať GIF súbory pri náhľade</string>
     <string name="max_brightness">Maximálny jas pri prezeraní médií</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 68558ac8c..d709b0a1c 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Denna funktion döljer mappen och alla dess undermappar genom att lägga till en \'.nomedia\'-fil i den. Du kan se dem genom att växla \'Visa dolda mappar\'-alternativet i Inställningar. Vill du fortsätta?</string>
     <string name="exclude">Uteslut</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Visa dolda mappar</string>
     <string name="autoplay_videos">Spela upp videos automatiskt</string>
     <string name="toggle_filename">Visa/dölj filnamnen</string>
-    <string name="show_media">Visa media</string>
-    <string name="images">Endast bilder</string>
-    <string name="videos">Endast videos</string>
-    <string name="gifs">Bara GIF-bilder</string>
-    <string name="images_videos_gifs">Bilder, videor, GIF-bilder</string>
-    <string name="images_and_videos">Bilder och videos</string>
     <string name="loop_videos">Återspela videos</string>
     <string name="animate_gifs">Animera GIF-bilders miniatyrer</string>
     <string name="max_brightness">Maximal ljusstyrka när media visas</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 087a7d896..f8d3f75d8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Bu işlev, klasöre\'.medya yok\'dosyası ekleyerek gizler; tüm alt klasörleri de gizler. Bunları Ayarlar\'da\'Gizli klasörleri göster\'seçeneğine basarak görebilirsiniz. Devam et?</string>
     <string name="exclude">Dışlama</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Gizli klasörleri göster</string>
     <string name="autoplay_videos">Videoları otomatik olarak oynat</string>
     <string name="toggle_filename">Dosya adı görünürlüğünü değiştir</string>
-    <string name="show_media">Medyayı göster</string>
-    <string name="images">Yalnızca resimler</string>
-    <string name="videos">Yalnızca videolar</string>
-    <string name="gifs">GIFs only</string>
-    <string name="images_videos_gifs">Images, videos, GIFs</string>
-    <string name="images_and_videos">Resimler ve videolar</string>
     <string name="loop_videos">Videolar döngüsü</string>
     <string name="animate_gifs">Küçük resimlerde GIF\'leri canlandırın</string>
     <string name="max_brightness">Ortam görüntülerken azami parlaklık</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0dcda3787..52ad95db9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">音量</string>
     <string name="brightness">亮度</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">通过添加文件 \'.nomedia\' 到目录，可以防止目录及其子目录下的所有媒体被扫描。您可以通过设置中的 \'显示隐藏目录\' 选项改变设置，是否继续？</string>
     <string name="exclude">排除</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">显示所有</string>
     <string name="autoplay_videos">自动播放</string>
     <string name="toggle_filename">显示文件名</string>
-    <string name="show_media">显示多媒体文件</string>
-    <string name="images">仅图片</string>
-    <string name="videos">仅视频</string>
-    <string name="gifs">仅 GIF </string>
-    <string name="images_videos_gifs">图片，视频，GIF</string>
-    <string name="images_and_videos">图片和视频</string>
     <string name="loop_videos">循环播放视频</string>
     <string name="animate_gifs">GIF 缩略图</string>
     <string name="max_brightness">浏览时最大亮度</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 61cc68907..e21f9c4ec 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">音量</string>
     <string name="brightness">亮度</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">這功能藉由添加一個\'.nomedia\'檔案，來隱藏資料夾和所有子資料夾。您可以透過設定中的「顯示隱藏的資料夾」選項來查看。\n是否繼續?</string>
     <string name="exclude">排除</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">顯示隱藏的媒體檔案</string>
     <string name="autoplay_videos">自動播放影片</string>
     <string name="toggle_filename">顯示檔案名稱</string>
-    <string name="show_media">顯示媒體檔案</string>
-    <string name="images">只有圖片</string>
-    <string name="videos">只有影片</string>
-    <string name="gifs">只有GIF</string>
-    <string name="images_videos_gifs">圖片、影片、GIF</string>
-    <string name="images_and_videos">圖片和影片</string>
     <string name="loop_videos">影片循環播放</string>
     <string name="animate_gifs">縮圖顯示GIF動畫</string>
     <string name="max_brightness">瀏覽時最大亮度</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 496fb5445..a1f884953 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,12 @@
     <string name="volume">Volume</string>
     <string name="brightness">Brightness</string>
 
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
     <string name="exclude">Exclude</string>
@@ -96,12 +102,6 @@
     <string name="show_hidden_media">Show hidden media</string>
     <string name="autoplay_videos">Play videos automatically</string>
     <string name="toggle_filename">Toggle filename visibility</string>
-    <string name="show_media">Show media</string>
-    <string name="images">Images only</string>
-    <string name="videos">Videos only</string>
-    <string name="gifs">GIFs only</string>
-    <string name="images_videos_gifs">Images, videos, GIFs</string>
-    <string name="images_and_videos">Images and videos</string>
     <string name="loop_videos">Loop videos</string>
     <string name="animate_gifs">Animate GIFs at thumbnails</string>
     <string name="max_brightness">Max brightness when viewing media</string>