diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 25690886c..c0c0685d3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -67,6 +67,16 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
                     editDir()
                     true
                 }
+                R.id.cab_pin -> {
+                    pinFolder()
+                    mode.finish()
+                    true
+                }
+                R.id.cab_unpin -> {
+                    unpinFolder()
+                    mode.finish()
+                    true
+                }
                 R.id.cab_hide -> {
                     hideDirs()
                     mode.finish()
@@ -163,6 +173,14 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
         listener?.refreshItems()
     }
 
+    private fun pinFolder() {
+
+    }
+
+    private fun unpinFolder() {
+
+    }
+
     private fun displayCopyDialog() {
         val files = ArrayList<File>()
         val positions = multiSelector.selectedPositions
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 df84fe545..21ec1083b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -39,6 +39,10 @@ class Config private constructor(context: Context) {
         get() = mPrefs.getBoolean(SHOW_HIDDEN_FOLDERS, false)
         set(showHiddenFolders) = mPrefs.edit().putBoolean(SHOW_HIDDEN_FOLDERS, showHiddenFolders).apply()
 
+    var pinnedFolders: Set<String>
+        get() = mPrefs.getStringSet(PINNED_FOLDERS, HashSet<String>())
+        set(pinnedFolders) = mPrefs.edit().putStringSet(PINNED_FOLDERS, pinnedFolders).apply()
+
     fun addHiddenDirectory(path: String) {
         val currHiddenFolders = HashSet<String>(hiddenFolders)
         currHiddenFolders.add(path)
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 d1a5fb32b..0aedfe75e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -12,6 +12,7 @@ val SHOW_HIDDEN_FOLDERS = "show_hidden_folders"
 val AUTOPLAY_VIDEOS = "autoplay_videos"
 val TREE_URI = "tree_uri"
 val DISPLAY_FILE_NAMES = "display_file_names"
+val PINNED_FOLDERS = "pinned_folders"
 
 // sorting
 val SORT_BY_NAME = 1
diff --git a/app/src/main/res/layout/directory_item.xml b/app/src/main/res/layout/directory_item.xml
index d8f9f1bd8..d371745f3 100644
--- a/app/src/main/res/layout/directory_item.xml
+++ b/app/src/main/res/layout/directory_item.xml
@@ -8,6 +8,16 @@
 
     <include layout="@layout/directory_tmb"/>
 
+    <ImageView
+        android:id="@+id/dir_pin"
+        android:layout_width="@dimen/pin_size"
+        android:layout_height="@dimen/pin_size"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_margin="@dimen/small_padding"
+        android:src="@mipmap/pin"/>
+
     <RelativeLayout
         android:id="@+id/dir_shadow_holder"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/photo_video_item.xml b/app/src/main/res/layout/photo_video_item.xml
index 7bd0a67c5..374fe0159 100644
--- a/app/src/main/res/layout/photo_video_item.xml
+++ b/app/src/main/res/layout/photo_video_item.xml
@@ -12,6 +12,7 @@
         android:id="@+id/play_outline"
         android:layout_width="@dimen/play_outline_size"
         android:layout_height="@dimen/play_outline_size"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/tiny_margin"
diff --git a/app/src/main/res/menu/cab_directories.xml b/app/src/main/res/menu/cab_directories.xml
index 140044515..23d85c904 100644
--- a/app/src/main/res/menu/cab_directories.xml
+++ b/app/src/main/res/menu/cab_directories.xml
@@ -6,6 +6,16 @@
         android:icon="@mipmap/info"
         android:title="@string/properties"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/cab_pin"
+        android:icon="@mipmap/pin"
+        android:title="@string/pin_folder"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/cab_unpin"
+        android:icon="@mipmap/unpin"
+        android:title="@string/unpin_folder"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_edit"
         android:icon="@mipmap/rename"
diff --git a/app/src/main/res/mipmap-hdpi/pin.png b/app/src/main/res/mipmap-hdpi/pin.png
new file mode 100644
index 000000000..a535b3ee2
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/pin.png differ
diff --git a/app/src/main/res/mipmap-hdpi/unpin.png b/app/src/main/res/mipmap-hdpi/unpin.png
new file mode 100644
index 000000000..91845ba74
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/unpin.png differ
diff --git a/app/src/main/res/mipmap-mdpi/pin.png b/app/src/main/res/mipmap-mdpi/pin.png
new file mode 100644
index 000000000..134fac48d
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/pin.png differ
diff --git a/app/src/main/res/mipmap-mdpi/unpin.png b/app/src/main/res/mipmap-mdpi/unpin.png
new file mode 100644
index 000000000..7e26bc45f
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/unpin.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/pin.png b/app/src/main/res/mipmap-xhdpi/pin.png
new file mode 100644
index 000000000..a18e7dda5
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/pin.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/unpin.png b/app/src/main/res/mipmap-xhdpi/unpin.png
new file mode 100644
index 000000000..fee0ef4bc
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/unpin.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pin.png b/app/src/main/res/mipmap-xxhdpi/pin.png
new file mode 100644
index 000000000..6067d4dcf
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pin.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/unpin.png b/app/src/main/res/mipmap-xxhdpi/unpin.png
new file mode 100644
index 000000000..e5936d1c4
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/unpin.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/pin.png b/app/src/main/res/mipmap-xxxhdpi/pin.png
new file mode 100644
index 000000000..a7cd80df6
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/pin.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/unpin.png b/app/src/main/res/mipmap-xxxhdpi/unpin.png
new file mode 100644
index 000000000..94f5fa49a
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/unpin.png differ
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c4392bfe4..1812c93e9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -40,6 +40,8 @@
     <string name="hidden">(versteckt)</string>
     <string name="save_as">Save as</string>
     <string name="file_saved">File saved successfully</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">Kopieren</string>
     <string name="move">Verschieben</string>
     <string name="copy_move">Kopieren/Verschieben</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0d5ea5ecf..8534517a3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -40,6 +40,8 @@
     <string name="hidden">(hidden)</string>
     <string name="save_as">Salvar como</string>
     <string name="file_saved">Archivo guardado con éxito</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">Copy</string>
     <string name="move">Move</string>
     <string name="copy_move">Copy/Move</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f3727e408..3f8299692 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -40,6 +40,8 @@
     <string name="hidden">(nascosta)</string>
     <string name="save_as">Salva come </string>
     <string name="file_saved">File salvato correttamente</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">Copia</string>
     <string name="move">Sposta</string>
     <string name="copy_move">Copia/Sposta</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index bbc0b823d..27a70bd9c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -40,6 +40,8 @@
     <string name="hidden">(非表示)</string>
     <string name="save_as">名前を付けて保存</string>
     <string name="file_saved">ファイルを正常に保存しました</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">コピー</string>
     <string name="move">移動</string>
     <string name="copy_move">コピー/移動</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 6b34a2dd4..05e80bb20 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -40,6 +40,8 @@
     <string name="hidden">(oculta)</string>
     <string name="save_as">Guardar como</string>
     <string name="file_saved">Ficheiro guardado com sucesso</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">Copiar</string>
     <string name="move">Mover</string>
     <string name="copy_move">Copiar/mover para</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c8681db93..12d1a176e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,6 +41,8 @@
     <string name="hidden">(Скрытый)</string>
     <string name="save_as">Сохранить как</string>
     <string name="file_saved">Файл успешно сохранен</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">Копировать</string>
     <string name="move">Переместить</string>
     <string name="copy_move">Копировать / Переместить</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 60e0dc0b8..4145ac3b4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -40,6 +40,8 @@
     <string name="hidden">(hidden)</string>
     <string name="save_as">Save as</string>
     <string name="file_saved">File saved successfully</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">Kopiera</string>
     <string name="move">Flytta</string>
     <string name="copy_move">Copy/Move</string>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index eea6e7722..4f23bc132 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,6 +1,7 @@
 <resources>
     <dimen name="dir_tmb_size">150dp</dimen>
     <dimen name="medium_tmb_size">120dp</dimen>
+    <dimen name="pin_size">30dp</dimen>
     <dimen name="play_outline_size">60dp</dimen>
     <dimen name="play_outline_size_big">240dp</dimen>
     <dimen name="undo_padding">16dp</dimen>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 95ec4d3ab..0f25a5790 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -41,6 +41,8 @@
     <string name="hidden">(隐藏)</string>
     <string name="save_as">保存</string>
     <string name="file_saved">文件保存成功</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">复制</string>
     <string name="move">移动</string>
     <string name="copy_move">复制/移动</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 88a5aff64..52566ba0d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,6 +5,7 @@
     <dimen name="medium_padding">8dp</dimen>
     <dimen name="dir_tmb_size">150dp</dimen>
     <dimen name="medium_tmb_size">100dp</dimen>
+    <dimen name="pin_size">20dp</dimen>
     <dimen name="play_outline_size">40dp</dimen>
     <dimen name="play_outline_size_big">160dp</dimen>
     <dimen name="undo_padding">8dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 70898e37e..d76f37c20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,6 +40,8 @@
     <string name="hidden">(hidden)</string>
     <string name="save_as">Save as</string>
     <string name="file_saved">File saved successfully</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
     <string name="copy">Copy</string>
     <string name="move">Move</string>
     <string name="copy_move">Copy/Move</string>