diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bbd911e6..cf36805a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+- Added support for custom fonts
 - Long press gesture to play videos at 2x speed in separate video player ([#830])
 
 ### Fixed
diff --git a/app/src/main/kotlin/org/fossify/gallery/adapters/ManageFoldersAdapter.kt b/app/src/main/kotlin/org/fossify/gallery/adapters/ManageFoldersAdapter.kt
index 31e0a6457..21a25943c 100644
--- a/app/src/main/kotlin/org/fossify/gallery/adapters/ManageFoldersAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/adapters/ManageFoldersAdapter.kt
@@ -1,7 +1,7 @@
 package org.fossify.gallery.adapters
 
 import android.view.*
-import android.widget.PopupMenu
+import androidx.appcompat.widget.PopupMenu
 import org.fossify.commons.activities.BaseSimpleActivity
 import org.fossify.commons.adapters.MyRecyclerViewAdapter
 import org.fossify.commons.extensions.getPopupMenuTheme
diff --git a/app/src/main/kotlin/org/fossify/gallery/adapters/ManageHiddenFoldersAdapter.kt b/app/src/main/kotlin/org/fossify/gallery/adapters/ManageHiddenFoldersAdapter.kt
index e909429d5..f3e9cdbbd 100644
--- a/app/src/main/kotlin/org/fossify/gallery/adapters/ManageHiddenFoldersAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/adapters/ManageHiddenFoldersAdapter.kt
@@ -5,7 +5,7 @@ import android.view.Gravity
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
-import android.widget.PopupMenu
+import androidx.appcompat.widget.PopupMenu
 import org.fossify.commons.activities.BaseSimpleActivity
 import org.fossify.commons.adapters.MyRecyclerViewAdapter
 import org.fossify.commons.extensions.getPopupMenuTheme