diff --git a/app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt b/app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt
index 61a9698025c..b2e56062b58 100644
--- a/app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt
+++ b/app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt
@@ -71,7 +71,7 @@ object JavaScriptActionHandler {
     }
 
     fun scrollToAnchor(anchorLink: String): String {
-        val anchor = if (anchorLink.contains("#")) anchorLink.substring(anchorLink.indexOf("#") + 1) else anchorLink
+        val anchor = anchorLink.substringAfter('#')
         return "var el = document.getElementById('$anchor');" +
                 "window.scrollTo(0, el.offsetTop - (screen.height / 2));" +
                 "setTimeout(function(){ el.style.backgroundColor='#fc3';" +
diff --git a/app/src/main/java/org/wikipedia/categories/CategoryActivity.kt b/app/src/main/java/org/wikipedia/categories/CategoryActivity.kt
index 89b3da15b12..e4043e88a1a 100644
--- a/app/src/main/java/org/wikipedia/categories/CategoryActivity.kt
+++ b/app/src/main/java/org/wikipedia/categories/CategoryActivity.kt
@@ -33,7 +33,8 @@ import org.wikipedia.page.Namespace
 import org.wikipedia.page.PageTitle
 import org.wikipedia.page.linkpreview.LinkPreviewDialog
 import org.wikipedia.readinglist.database.ReadingList
-import org.wikipedia.util.*
+import org.wikipedia.util.ResourceUtil
+import org.wikipedia.util.StringUtil
 import org.wikipedia.views.DrawableItemDecoration
 import org.wikipedia.views.PageItemView
 import org.wikipedia.views.WikiErrorView
@@ -138,7 +139,7 @@ class CategoryActivity : BaseActivity() {
             startActivity(newIntent(this, title))
         } else {
             val entry = HistoryEntry(title, HistoryEntry.SOURCE_CATEGORY)
-            ExclusiveBottomSheetPresenter.show(supportFragmentManager, LinkPreviewDialog.newInstance(entry, null))
+            ExclusiveBottomSheetPresenter.show(supportFragmentManager, LinkPreviewDialog.newInstance(entry))
         }
     }
 
diff --git a/app/src/main/java/org/wikipedia/dataclient/Service.kt b/app/src/main/java/org/wikipedia/dataclient/Service.kt
index d6827a1fd60..a41fc636eaa 100644
--- a/app/src/main/java/org/wikipedia/dataclient/Service.kt
+++ b/app/src/main/java/org/wikipedia/dataclient/Service.kt
@@ -49,9 +49,8 @@ interface Service {
     )
     suspend fun fullTextSearch(
         @Query("gsrsearch") searchTerm: String?,
-        @Query("gsroffset") gsrOffset: String?,
         @Query("gsrlimit") gsrLimit: Int,
-        @Query("continue") cont: String?
+        @Query("gsroffset") gsrOffset: Int?
     ): MwQueryResponse
 
     @GET(MW_API_PREFIX + "action=query&list=allusers&auwitheditsonly=1")
@@ -65,10 +64,9 @@ interface Service {
                 "&gsrnamespace=6&iiurlwidth=" + PREFERRED_THUMB_SIZE
     )
     suspend fun fullTextSearchCommons(
-        @Query("gsrsearch") searchTerm: String?,
-        @Query("gsroffset") gsrOffset: String?,
+        @Query("gsrsearch") searchTerm: String,
         @Query("gsrlimit") gsrLimit: Int,
-        @Query("continue") cont: String?
+        @Query("gsroffset") gsrOffset: Int?,
     ): MwQueryResponse
 
     @GET(
diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResponse.kt b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResponse.kt
index fcb9111b52a..0fa68e64689 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResponse.kt
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResponse.kt
@@ -15,9 +15,9 @@ open class MwQueryResponse : MwResponse() {
 
     @Serializable
     class Continuation {
-        val sroffset = 0
-        val gsroffset = 0
-        val gpsoffset = 0
+        val sroffset: Int? = null
+        val gsroffset: Int? = null
+        val gpsoffset: Int? = null
         @SerialName("continue") val continuation: String? = null
         @SerialName("uccontinue") val ucContinuation: String? = null
         @SerialName("rccontinue") val rcContinuation: String? = null
diff --git a/app/src/main/java/org/wikipedia/dataclient/okhttp/OfflineCacheInterceptor.kt b/app/src/main/java/org/wikipedia/dataclient/okhttp/OfflineCacheInterceptor.kt
index c13c64651b2..86f48b086d4 100644
--- a/app/src/main/java/org/wikipedia/dataclient/okhttp/OfflineCacheInterceptor.kt
+++ b/app/src/main/java/org/wikipedia/dataclient/okhttp/OfflineCacheInterceptor.kt
@@ -78,7 +78,7 @@ class OfflineCacheInterceptor : Interceptor {
                     val name = line.substring(0, pos).trim()
                     val value = line.substring(pos + 1).trim()
                     builder.header(name, value)
-                    if (name.lowercase(Locale.getDefault()) == "content-type") {
+                    if (name.equals("content-type", true)) {
                         contentType = value
                     }
                 }
diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.kt b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.kt
index 5b05ce6961b..0a39621ad20 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.kt
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.kt
@@ -3,13 +3,14 @@ package org.wikipedia.descriptions
 import android.content.Context
 import android.net.Uri
 import android.text.SpannableString
-import android.text.Spanned
 import android.text.TextUtils
 import android.text.method.LinkMovementMethod
 import android.text.style.BulletSpan
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.ScrollView
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.databinding.ViewDescriptionEditRevertHelpBinding
@@ -31,14 +32,18 @@ class DescriptionEditRevertHelpView constructor(context: Context, attrs: Attribu
                 .replace(":revertSubtitle".toRegex(), context.getString(R.string.description_edit_revert_subtitle))
                 .replace(":revertIntro".toRegex(), context.getString(R.string.description_edit_revert_intro))
                 .replace(":revertHistory".toRegex(), context.getString(R.string.description_edit_revert_history, getHistoryUri(qNumber))))
-        val gapWidth = DimenUtil.roundedDpToPx(8f)
-        val revertReason1 = SpannableString(StringUtil.fromHtml(context.getString(R.string.description_edit_revert_reason1, context.getString(R.string.wikidata_description_guide_url))))
-        val revertReason2 = SpannableString(StringUtil.fromHtml(context.getString(R.string.description_edit_revert_reason2)))
-        revertReason1.setSpan(BulletSpan(gapWidth), 0, revertReason1.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        revertReason2.setSpan(BulletSpan(gapWidth), 0, revertReason2.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        val revertReason1 = createReason(context.getString(R.string.description_edit_revert_reason1,
+            context.getString(R.string.wikidata_description_guide_url)))
+        val revertReason2 = createReason(context.getString(R.string.description_edit_revert_reason2))
         binding.helpText.text = SpannableString(TextUtils.expandTemplate(helpStr, revertReason1, revertReason2))
     }
 
+    private fun createReason(htmlString: String) = buildSpannedString {
+        inSpans(BulletSpan(DimenUtil.roundedDpToPx(8f))) {
+            append(StringUtil.fromHtml(htmlString))
+        }
+    }
+
     private fun getHistoryUri(qNumber: String): Uri {
         return Uri.Builder()
                 .scheme(WikipediaApp.instance.wikiSite.scheme())
diff --git a/app/src/main/java/org/wikipedia/diff/ArticleEditDetailsFragment.kt b/app/src/main/java/org/wikipedia/diff/ArticleEditDetailsFragment.kt
index b1ca56f8a06..49388c289d0 100644
--- a/app/src/main/java/org/wikipedia/diff/ArticleEditDetailsFragment.kt
+++ b/app/src/main/java/org/wikipedia/diff/ArticleEditDetailsFragment.kt
@@ -273,7 +273,7 @@ class ArticleEditDetailsFragment : Fragment(), WatchlistExpiryDialog.Callback, M
                 startActivity(FilePageActivity.newIntent(requireContext(), viewModel.pageTitle))
             } else {
                 ExclusiveBottomSheetPresenter.show(childFragmentManager, LinkPreviewDialog.newInstance(
-                        HistoryEntry(viewModel.pageTitle, HistoryEntry.SOURCE_EDIT_DIFF_DETAILS), null))
+                        HistoryEntry(viewModel.pageTitle, HistoryEntry.SOURCE_EDIT_DIFF_DETAILS)))
             }
         }
         binding.newerIdButton.setOnClickListener {
diff --git a/app/src/main/java/org/wikipedia/diff/DiffUtil.kt b/app/src/main/java/org/wikipedia/diff/DiffUtil.kt
index 209e351630f..c3be9d3b72d 100644
--- a/app/src/main/java/org/wikipedia/diff/DiffUtil.kt
+++ b/app/src/main/java/org/wikipedia/diff/DiffUtil.kt
@@ -9,6 +9,9 @@ import android.text.style.StrikethroughSpan
 import android.text.style.StyleSpan
 import android.view.ViewGroup
 import androidx.core.graphics.ColorUtils
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
+import androidx.core.text.set
 import androidx.recyclerview.widget.RecyclerView
 import org.wikipedia.R
 import org.wikipedia.dataclient.restbase.DiffResponse
@@ -31,10 +34,10 @@ object DiffUtil {
                 if (it.lineNumber > lastItem!!.lineEnd) {
                     lastItem!!.lineEnd = it.lineNumber
                 }
-                val str = SpannableStringBuilder(lastItem!!.parsedText)
-                str.append("\n")
-                str.append(item.parsedText)
-                lastItem!!.parsedText = str
+                lastItem!!.parsedText = buildSpannedString {
+                    appendLine(lastItem!!.parsedText)
+                    append(item.parsedText)
+                }
             } else {
                 items.add(item)
                 lastItem = item
@@ -81,54 +84,43 @@ object DiffUtil {
     }
 
     private fun createSpannableDiffText(context: Context, diff: DiffResponse.DiffItem): CharSequence {
-        val spannableString = SpannableStringBuilder(diff.text.ifEmpty { "\n" })
-        if (diff.text.isEmpty()) {
-            spannableString.setSpan(EmptyLineSpan(ResourceUtil.getThemedColor(context, android.R.attr.colorBackground),
-                    ResourceUtil.getThemedColor(context, R.attr.placeholder_color)), 0, spannableString.length, 0)
-            return spannableString
-        }
-        when (diff.type) {
-            DiffResponse.DIFF_TYPE_LINE_ADDED -> {
-                updateDiffTextDecor(context, spannableString, true, 0, diff.text.length)
-            }
-            DiffResponse.DIFF_TYPE_LINE_REMOVED -> {
-                updateDiffTextDecor(context, spannableString, false, 0, diff.text.length)
-            }
-            DiffResponse.DIFF_TYPE_PARAGRAPH_MOVED_FROM -> {
-                updateDiffTextDecor(context, spannableString, false, 0, diff.text.length)
-            }
-            DiffResponse.DIFF_TYPE_PARAGRAPH_MOVED_TO -> {
-                updateDiffTextDecor(context, spannableString, true, 0, diff.text.length)
-            }
-        }
-        if (diff.highlightRanges.isNotEmpty()) {
-            for (highlightRange in diff.highlightRanges) {
-                val indices = StringUtil.utf8Indices(diff.text)
-                val highlightRangeStart = indices[highlightRange.start].coerceIn(0, diff.text.length)
-                val highlightRangeEnd = (indices.getOrElse(highlightRange.start + highlightRange.length) { indices.last() + 1 }).coerceIn(0, diff.text.length)
+        return buildSpannedString {
+            if (diff.text.isEmpty()) {
+                inSpans(EmptyLineSpan(ResourceUtil.getThemedColor(context, android.R.attr.colorBackground),
+                    ResourceUtil.getThemedColor(context, R.attr.placeholder_color))) {
+                    appendLine()
+                }
+            } else {
+                append(diff.text)
+
+                when (diff.type) {
+                    DiffResponse.DIFF_TYPE_LINE_ADDED, DiffResponse.DIFF_TYPE_PARAGRAPH_MOVED_TO -> {
+                        updateDiffTextDecor(context, true, 0, diff.text.length)
+                    }
+                    DiffResponse.DIFF_TYPE_LINE_REMOVED, DiffResponse.DIFF_TYPE_PARAGRAPH_MOVED_FROM -> {
+                        updateDiffTextDecor(context, false, 0, diff.text.length)
+                    }
+                }
+
+                for (highlightRange in diff.highlightRanges) {
+                    val indices = StringUtil.utf8Indices(diff.text)
+                    val highlightRangeStart = indices[highlightRange.start].coerceIn(0, diff.text.length)
+                    val highlightRangeEnd = (indices.getOrElse(highlightRange.start + highlightRange.length) { indices.last() + 1 }).coerceIn(0, diff.text.length)
+                    val isAddition = highlightRange.type == DiffResponse.HIGHLIGHT_TYPE_ADD
 
-                if (highlightRange.type == DiffResponse.HIGHLIGHT_TYPE_ADD) {
-                    updateDiffTextDecor(context, spannableString, true, highlightRangeStart, highlightRangeEnd)
-                } else {
-                    updateDiffTextDecor(context, spannableString, false, highlightRangeStart, highlightRangeEnd)
+                    updateDiffTextDecor(context, isAddition, highlightRangeStart, highlightRangeEnd)
                 }
             }
         }
-        return spannableString
     }
 
-    private fun updateDiffTextDecor(context: Context, spannableText: SpannableStringBuilder, isAddition: Boolean, start: Int, end: Int) {
-        val boldStyle = StyleSpan(Typeface.BOLD)
-        val foregroundAddedColor = ForegroundColorSpan(ResourceUtil.getThemedColor(context, R.attr.primary_color))
-        val foregroundRemovedColor = ForegroundColorSpan(ResourceUtil.getThemedColor(context, R.attr.primary_color))
-        spannableText.setSpan(BackgroundColorSpan(ColorUtils.setAlphaComponent(ResourceUtil.getThemedColor(context,
-                if (isAddition) R.attr.success_color else R.attr.destructive_color), 48)), start, end, 0)
-        spannableText.setSpan(boldStyle, start, end, 0)
-        if (isAddition) {
-            spannableText.setSpan(foregroundAddedColor, start, end, 0)
-        } else {
-            spannableText.setSpan(foregroundRemovedColor, start, end, 0)
-            spannableText.setSpan(StrikethroughSpan(), start, end, 0)
+    private fun SpannableStringBuilder.updateDiffTextDecor(context: Context, isAddition: Boolean, start: Int, end: Int) {
+        this[start, end] = BackgroundColorSpan(ColorUtils.setAlphaComponent(ResourceUtil.getThemedColor(context,
+            if (isAddition) R.attr.success_color else R.attr.destructive_color), 48))
+        this[start, end] = StyleSpan(Typeface.BOLD)
+        this[start, end] = ForegroundColorSpan(ResourceUtil.getThemedColor(context, R.attr.primary_color))
+        if (!isAddition) {
+            this[start, end] = StrikethroughSpan()
         }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/edit/FindInEditorActionProvider.kt b/app/src/main/java/org/wikipedia/edit/FindInEditorActionProvider.kt
index 7d70a50a347..e3d81417de3 100644
--- a/app/src/main/java/org/wikipedia/edit/FindInEditorActionProvider.kt
+++ b/app/src/main/java/org/wikipedia/edit/FindInEditorActionProvider.kt
@@ -7,9 +7,9 @@ import android.view.View
 import org.wikipedia.edit.richtext.SyntaxHighlighter
 import org.wikipedia.util.DeviceUtil
 import org.wikipedia.util.DimenUtil
+import org.wikipedia.util.StringUtil
 import org.wikipedia.views.FindInPageActionProvider
 import org.wikipedia.views.FindInPageActionProvider.FindInPageListener
-import java.util.*
 
 class FindInEditorActionProvider(private val scrollView: View,
                                  private val textView: SyntaxHighlightableEditText,
@@ -59,21 +59,13 @@ class FindInEditorActionProvider(private val scrollView: View,
     }
 
     override fun onSearchTextChanged(text: String?) {
-        searchQuery = if (text.isNullOrEmpty()) null else text
+        searchQuery = text?.ifEmpty { null }
         currentResultIndex = 0
         resultPositions.clear()
 
         searchQuery?.let {
-            val searchTextLower = it.lowercase(Locale.getDefault())
-            val textLower = textView.text.toString().lowercase(Locale.getDefault())
-            var position = 0
-            do {
-                position = textLower.indexOf(searchTextLower, position)
-                if (position >= 0) {
-                    resultPositions.add(position)
-                    position += searchTextLower.length
-                }
-            } while (position >= 0)
+            resultPositions += it.toRegex(StringUtil.SEARCH_REGEX_OPTIONS).findAll(textView.text)
+                .map { it.range.first }
         }
         scrollToCurrentResult()
     }
diff --git a/app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt b/app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt
index 83d4a6e2c2f..675508a74a3 100644
--- a/app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt
+++ b/app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt
@@ -62,7 +62,7 @@ class SyntaxHighlightViewAdapter(
     }
 
     override fun onPreviewLink(title: String) {
-        val dialog = LinkPreviewDialog.newInstance(HistoryEntry(PageTitle(title, pageTitle.wikiSite), HistoryEntry.SOURCE_INTERNAL_LINK), null)
+        val dialog = LinkPreviewDialog.newInstance(HistoryEntry(PageTitle(title, pageTitle.wikiSite), HistoryEntry.SOURCE_INTERNAL_LINK))
         ExclusiveBottomSheetPresenter.show(activity.supportFragmentManager, dialog)
         editText.post {
             dialog.dialog?.setOnDismissListener {
diff --git a/app/src/main/java/org/wikipedia/edit/WikiTextKeyboardView.kt b/app/src/main/java/org/wikipedia/edit/WikiTextKeyboardView.kt
index 5efe6019e5e..eb813ba1151 100644
--- a/app/src/main/java/org/wikipedia/edit/WikiTextKeyboardView.kt
+++ b/app/src/main/java/org/wikipedia/edit/WikiTextKeyboardView.kt
@@ -90,34 +90,27 @@ class WikiTextKeyboardView constructor(context: Context, attrs: AttributeSet?) :
         binding.wikitextButtonPreviewLink.setOnClickListener {
             editText?.inputConnection?.let { inputConnection ->
                 var title: String? = null
-                val selection = inputConnection.getSelectedText(0)
-                if (!selection.isNullOrEmpty() && !selection.toString().contains("[[")) {
-                    title = trimPunctuation(selection.toString())
+                val selection = inputConnection.getSelectedText(0)?.toString()
+                if (!selection.isNullOrEmpty() && "[[" !in selection) {
+                    title = selection.trim('.', ',', ';', '?', '!')
                 } else {
-                    val before: String
-                    val after: String
-                    if (selection != null && selection.length > 1) {
-                        val selectionStr = selection.toString()
-                        before = selectionStr.substring(0, selectionStr.length / 2)
-                        after = selectionStr.substring(selectionStr.length / 2)
+                    val (before, after) = if (selection != null && selection.length > 1) {
+                        selection.substring(0, selection.length / 2) to
+                                selection.substring(selection.length / 2)
                     } else {
                         val peekLength = 64
-                        before = inputConnection.getTextBeforeCursor(peekLength, 0).toString()
-                        after = inputConnection.getTextAfterCursor(peekLength, 0).toString()
+                        inputConnection.getTextBeforeCursor(peekLength, 0)?.toString() to
+                                inputConnection.getTextAfterCursor(peekLength, 0)?.toString()
                     }
 
-                    if (before.isNotEmpty() && after.isNotEmpty()) {
-                        var str = before + after
-                        val i1 = lastIndexOf(before, "[[")
-                        val i2 = after.indexOf("]]") + before.length
-                        if (i1 >= 0 && i2 > 0 && i2 > i1) {
-                            str = str.substring(i1 + 2, i2).trim()
-                            if (str.isNotEmpty()) {
-                                if (str.contains("|")) {
-                                    str = str.split("\\|".toRegex()).toTypedArray()[0]
-                                }
-                                title = str
-                            }
+                    if (!before.isNullOrEmpty() && !after.isNullOrEmpty()) {
+                        val str = before + after
+                        val i1 = before.lastIndexOf("[[")
+                        if (i1 >= 0) {
+                            title = str.substring(i1 + 2).substringBefore("]]")
+                                .trim()
+                                .splitToSequence('|')
+                                .firstOrNull()?.ifEmpty { null }
                         }
                     }
                 }
@@ -173,7 +166,6 @@ class WikiTextKeyboardView constructor(context: Context, attrs: AttributeSet?) :
     }
 
     companion object {
-
         fun toggleSyntaxAroundCurrentSelection(editText: EditText?, ic: InputConnection, prefix: String, suffix: String) {
             editText?.let {
                 if (it.selectionStart == it.selectionEnd) {
@@ -201,32 +193,5 @@ class WikiTextKeyboardView constructor(context: Context, attrs: AttributeSet?) :
                 }
             }
         }
-
-        @Suppress("SameParameterValue")
-        fun lastIndexOf(str: String, subStr: String): Int {
-            var index = -1
-            var a = 0
-            while (a < str.length) {
-                val i = str.indexOf(subStr, a)
-                if (i >= 0) {
-                    index = i
-                    a = i + 1
-                } else {
-                    break
-                }
-            }
-            return index
-        }
-
-        fun trimPunctuation(str: String): String {
-            var newStr = str
-            while (newStr.startsWith(".") || newStr.startsWith(",") || newStr.startsWith(";") || newStr.startsWith("?") || newStr.startsWith("!")) {
-                newStr = newStr.substring(1)
-            }
-            while (newStr.endsWith(".") || newStr.endsWith(",") || newStr.endsWith(";") || newStr.endsWith("?") || newStr.endsWith("!")) {
-                newStr = newStr.substring(0, newStr.length - 1)
-            }
-            return newStr
-        }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/edit/insertmedia/InsertMediaViewModel.kt b/app/src/main/java/org/wikipedia/edit/insertmedia/InsertMediaViewModel.kt
index 10995516af0..c26e59d2fb9 100644
--- a/app/src/main/java/org/wikipedia/edit/insertmedia/InsertMediaViewModel.kt
+++ b/app/src/main/java/org/wikipedia/edit/insertmedia/InsertMediaViewModel.kt
@@ -15,7 +15,6 @@ import org.wikipedia.Constants
 import org.wikipedia.dataclient.Service
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.WikiSite
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
 import org.wikipedia.extensions.parcelable
 import org.wikipedia.extensions.serializable
 import org.wikipedia.page.PageTitle
@@ -43,14 +42,12 @@ class InsertMediaViewModel(bundle: Bundle) : ViewModel() {
         loadMagicWords()
     }
 
-    class InsertMediaPagingSource(
-        val searchQuery: String,
-    ) : PagingSource<MwQueryResponse.Continuation, PageTitle>() {
-        override suspend fun load(params: LoadParams<MwQueryResponse.Continuation>): LoadResult<MwQueryResponse.Continuation, PageTitle> {
+    class InsertMediaPagingSource(val searchQuery: String) : PagingSource<Int, PageTitle>() {
+        override suspend fun load(params: LoadParams<Int>): LoadResult<Int, PageTitle> {
             return try {
                 val wikiSite = WikiSite(Service.COMMONS_URL)
                 val response = ServiceFactory.get(WikiSite(Service.COMMONS_URL))
-                    .fullTextSearchCommons(searchQuery, params.key?.gsroffset?.toString(), params.loadSize, params.key?.continuation)
+                    .fullTextSearchCommons(searchQuery, params.loadSize, params.key)
 
                 return response.query?.pages?.let { list ->
                     val results = list.sortedBy { it.index }.filter { it.imageInfo() != null }.map {
@@ -63,7 +60,7 @@ class InsertMediaViewModel(bundle: Bundle) : ViewModel() {
                         }
                         pageTitle
                     }
-                    LoadResult.Page(results, null, response.continuation)
+                    LoadResult.Page(results, null, response.continuation?.gsroffset)
                 } ?: run {
                     LoadResult.Page(emptyList(), null, null)
                 }
@@ -72,11 +69,12 @@ class InsertMediaViewModel(bundle: Bundle) : ViewModel() {
             }
         }
 
-        override fun getRefreshKey(state: PagingState<MwQueryResponse.Continuation, PageTitle>): MwQueryResponse.Continuation? {
+        override fun getRefreshKey(state: PagingState<Int, PageTitle>): Int? {
             return null
         }
     }
 
+    @Suppress("KotlinConstantConditions")
     private fun loadMagicWords() {
         if (magicWordsLang == wikiSite.languageCode) {
             return
diff --git a/app/src/main/java/org/wikipedia/extensions/Enum.kt b/app/src/main/java/org/wikipedia/extensions/Enum.kt
new file mode 100644
index 00000000000..c6d61c28831
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/extensions/Enum.kt
@@ -0,0 +1,8 @@
+package org.wikipedia.extensions
+
+import org.wikipedia.model.EnumCode
+import kotlin.enums.EnumEntries
+
+fun <E> EnumEntries<E>.getByCode(code: Int): E where E : Enum<E>, E : EnumCode {
+    return getOrNull(binarySearchBy(code) { it.code() }) ?: throw IllegalArgumentException("code=$code")
+}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedContentType.kt b/app/src/main/java/org/wikipedia/feed/FeedContentType.kt
index 5296392759a..f366811868e 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedContentType.kt
+++ b/app/src/main/java/org/wikipedia/feed/FeedContentType.kt
@@ -12,7 +12,6 @@ import org.wikipedia.feed.mainpage.MainPageClient
 import org.wikipedia.feed.random.RandomClient
 import org.wikipedia.feed.suggestededits.SuggestedEditsFeedClient
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.DeviceUtil
 
@@ -85,15 +84,11 @@ enum class FeedContentType(private val code: Int,
     }
 
     companion object {
-        private val MAP = EnumCodeMap(FeedContentType::class.java)
-
-        fun of(code: Int): FeedContentType { return MAP[code] }
-
         val aggregatedLanguages: List<String>
             get() {
                 val appLangCodes = WikipediaApp.instance.languageState.appLanguageCodes
                 val list = mutableListOf<String>()
-                values().filter { it.isEnabled }.forEach { type ->
+                entries.filter { it.isEnabled }.forEach { type ->
                     list.addAll(appLangCodes.filter {
                         (type.langCodesSupported.isEmpty() || type.langCodesSupported.contains(it)) &&
                                 !type.langCodesDisabled.contains(it) && !list.contains(it)
@@ -107,7 +102,7 @@ enum class FeedContentType(private val code: Int,
             val orderList = mutableListOf<Int>()
             val langSupportedMap = mutableMapOf<Int, List<String>>()
             val langDisabledMap = mutableMapOf<Int, List<String>>()
-            values().forEach {
+            entries.forEach {
                 enabledList.add(it.isEnabled)
                 orderList.add(it.order)
                 langSupportedMap[it.code] = it.langCodesSupported
@@ -124,7 +119,7 @@ enum class FeedContentType(private val code: Int,
             val orderList = Prefs.feedCardsOrder
             val langSupportedMap = Prefs.feedCardsLangSupported
             val langDisabledMap = Prefs.feedCardsLangDisabled
-            values().forEachIndexed { i, type ->
+            entries.forEachIndexed { i, type ->
                 type.isEnabled = enabledList.getOrElse(i) { true }
                 type.order = orderList.getOrElse(i) { i }
                 type.langCodesSupported.clear()
diff --git a/app/src/main/java/org/wikipedia/feed/model/CardType.kt b/app/src/main/java/org/wikipedia/feed/model/CardType.kt
index 5f0795e9a49..d562fb1f042 100644
--- a/app/src/main/java/org/wikipedia/feed/model/CardType.kt
+++ b/app/src/main/java/org/wikipedia/feed/model/CardType.kt
@@ -1,6 +1,7 @@
 package org.wikipedia.feed.model
 
 import android.content.Context
+import org.wikipedia.extensions.getByCode
 import org.wikipedia.feed.FeedContentType
 import org.wikipedia.feed.accessibility.AccessibilityCardView
 import org.wikipedia.feed.announcement.AnnouncementCardView
@@ -19,7 +20,6 @@ import org.wikipedia.feed.suggestededits.SuggestedEditsCardView
 import org.wikipedia.feed.topread.TopReadCardView
 import org.wikipedia.feed.view.FeedCardView
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 
 enum class CardType constructor(private val code: Int,
                                 private val contentType: FeedContentType? = null) : EnumCode {
@@ -139,10 +139,8 @@ enum class CardType constructor(private val code: Int,
     }
 
     companion object {
-        private val MAP = EnumCodeMap(CardType::class.java)
-
         fun of(code: Int): CardType {
-            return MAP[code]
+            return entries.getByCode(code)
         }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardFooterView.kt b/app/src/main/java/org/wikipedia/feed/view/CardFooterView.kt
index debba938abb..a474a8328b2 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardFooterView.kt
+++ b/app/src/main/java/org/wikipedia/feed/view/CardFooterView.kt
@@ -1,14 +1,14 @@
 package org.wikipedia.feed.view
 
 import android.content.Context
-import android.text.SpannableStringBuilder
-import android.text.Spanned
 import android.text.style.ImageSpan
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.databinding.ViewCardFooterBinding
@@ -30,19 +30,20 @@ class CardFooterView constructor(context: Context, attrs: AttributeSet? = null)
     }
 
     fun setFooterActionText(actionText: String, langCode: String?) {
-        val actionTextWithSpace = "$actionText  "
-        val spannableStringBuilder = SpannableStringBuilder(actionTextWithSpace)
         val isRTL = L10nUtil.isLangRTL(langCode ?: WikipediaApp.instance.languageState.systemLanguageCode)
         val iconColor = ResourceUtil.getThemedColor(context, R.attr.progressive_color)
         // TODO: revisit this after the ImageSpan can render drawable instead of converting it to bitmap.
-        val arrowLeftDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_baseline_arrow_left_alt_24px)?.apply {
-            setTint(iconColor)
-        }?.toBitmap()!!
-        val arrowRightDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_baseline_arrow_right_alt_24px)?.apply {
-            setTint(iconColor)
-        }?.toBitmap()!!
-        val arrowImageSpan = ImageSpan(context, if (isRTL) arrowLeftDrawable else arrowRightDrawable)
-        spannableStringBuilder.setSpan(arrowImageSpan, actionTextWithSpace.length - 1, actionTextWithSpace.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        binding.footerActionButton.text = spannableStringBuilder
+        val arrowLeftDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_baseline_arrow_left_alt_24px)!!
+            .apply { setTint(iconColor) }
+            .toBitmap()
+        val arrowRightDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_baseline_arrow_right_alt_24px)!!
+            .apply { setTint(iconColor) }
+            .toBitmap()
+        binding.footerActionButton.text = buildSpannedString {
+            append("$actionText ")
+            inSpans(ImageSpan(context, if (isRTL) arrowLeftDrawable else arrowRightDrawable)) {
+                append(" ")
+            }
+        }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.kt b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.kt
index 0f5e30077ed..9cd783ad052 100644
--- a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.kt
+++ b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.kt
@@ -401,7 +401,7 @@ class GalleryActivity : BaseActivity(), LinkPreviewDialog.LoadPageCallback, Gall
 
     private fun showLinkPreview(title: PageTitle) {
         ExclusiveBottomSheetPresenter.show(supportFragmentManager,
-            LinkPreviewDialog.newInstance(HistoryEntry(title, HistoryEntry.SOURCE_GALLERY), null))
+            LinkPreviewDialog.newInstance(HistoryEntry(title, HistoryEntry.SOURCE_GALLERY)))
     }
 
     fun setViewPagerEnabled(enabled: Boolean) {
diff --git a/app/src/main/java/org/wikipedia/gallery/ImageLicense.kt b/app/src/main/java/org/wikipedia/gallery/ImageLicense.kt
index be8fe90f653..a7c4073be76 100644
--- a/app/src/main/java/org/wikipedia/gallery/ImageLicense.kt
+++ b/app/src/main/java/org/wikipedia/gallery/ImageLicense.kt
@@ -4,7 +4,6 @@ import androidx.annotation.DrawableRes
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.wikipedia.R
-import java.util.Locale
 
 @Serializable
 class ImageLicense(
@@ -16,11 +15,11 @@ class ImageLicense(
     constructor(metadata: ExtMetadata) : this(metadata.license(), metadata.licenseShortName(), metadata.licenseUrl())
 
     private val isLicenseCC: Boolean
-        get() = (licenseName.lowercase(Locale.ENGLISH).startsWith(CREATIVE_COMMONS_PREFIX) || licenseShortName.lowercase(Locale.ENGLISH).startsWith(CREATIVE_COMMONS_PREFIX))
+        get() = (licenseName.startsWith(CREATIVE_COMMONS_PREFIX, true) || licenseShortName.startsWith(CREATIVE_COMMONS_PREFIX, true))
     private val isLicensePD: Boolean
-        get() = (licenseName.lowercase(Locale.ENGLISH).startsWith(PUBLIC_DOMAIN_PREFIX) || licenseShortName.lowercase(Locale.ENGLISH).startsWith(PUBLIC_DOMAIN_PREFIX))
+        get() = (licenseName.startsWith(PUBLIC_DOMAIN_PREFIX, true) || licenseShortName.startsWith(PUBLIC_DOMAIN_PREFIX, true))
     private val isLicenseCCBySa: Boolean
-        get() = (licenseName.lowercase(Locale.ENGLISH).replace("-", "").startsWith(CC_BY_SA) || licenseShortName.lowercase(Locale.ENGLISH).replace("-", "").startsWith(CC_BY_SA))
+        get() = (licenseName.replace("-", "").startsWith(CC_BY_SA, true) || licenseShortName.replace("-", "").startsWith(CC_BY_SA, true))
 
     @get:DrawableRes
     val licenseIcon: Int
diff --git a/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.kt b/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.kt
index 8c94db4ac4a..bfad040ad79 100644
--- a/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.kt
+++ b/app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.kt
@@ -140,7 +140,7 @@ class MediaDownloadReceiver : BroadcastReceiver() {
         private const val FILE_NAMESPACE = "File:"
 
         private fun trimFileNamespace(filename: String): String {
-            return if (filename.startsWith(FILE_NAMESPACE)) filename.substring(FILE_NAMESPACE.length) else filename
+            return filename.substringAfter(FILE_NAMESPACE)
         }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/history/db/HistoryEntryWithImageDao.kt b/app/src/main/java/org/wikipedia/history/db/HistoryEntryWithImageDao.kt
index 81bf5d97d36..d29620cd79e 100644
--- a/app/src/main/java/org/wikipedia/history/db/HistoryEntryWithImageDao.kt
+++ b/app/src/main/java/org/wikipedia/history/db/HistoryEntryWithImageDao.kt
@@ -9,7 +9,8 @@ import org.wikipedia.search.SearchResult
 import org.wikipedia.search.SearchResults
 import org.wikipedia.util.StringUtil
 import java.text.DateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 @Dao
 interface HistoryEntryWithImageDao {
@@ -26,7 +27,7 @@ interface HistoryEntryWithImageDao {
     fun findEntriesBy(excludeSource1: Int, excludeSource2: Int, excludeSource3: Int, minTimeSpent: Int, limit: Int): List<HistoryEntryWithImage>
 
     fun findHistoryItem(searchQuery: String): SearchResults {
-        var normalizedQuery = StringUtils.stripAccents(searchQuery).lowercase(Locale.getDefault())
+        var normalizedQuery = StringUtils.stripAccents(searchQuery)
         if (normalizedQuery.isEmpty()) {
             return SearchResults()
         }
@@ -34,7 +35,7 @@ interface HistoryEntryWithImageDao {
             .replace("%", "\\%").replace("_", "\\_")
 
         val entries = findEntriesBySearchTerm("%$normalizedQuery%")
-                .filter { StringUtil.fromHtml(it.displayTitle).toString().lowercase().contains(normalizedQuery) }
+                .filter { StringUtil.fromHtml(it.displayTitle).contains(normalizedQuery, true) }
 
         return if (entries.isEmpty()) SearchResults()
         else SearchResults(entries.take(3).map { SearchResult(toHistoryEntry(it).title, SearchResult.SearchResultType.HISTORY) }.toMutableList())
diff --git a/app/src/main/java/org/wikipedia/language/LangLinksActivity.kt b/app/src/main/java/org/wikipedia/language/LangLinksActivity.kt
index aed171338c1..fe78a2b4450 100644
--- a/app/src/main/java/org/wikipedia/language/LangLinksActivity.kt
+++ b/app/src/main/java/org/wikipedia/language/LangLinksActivity.kt
@@ -20,7 +20,6 @@ import org.wikipedia.util.DeviceUtil
 import org.wikipedia.util.Resource
 import org.wikipedia.util.StringUtil
 import org.wikipedia.views.ViewAnimations
-import java.util.*
 
 class LangLinksActivity : BaseActivity() {
     private lateinit var binding: ActivityLanglinksBinding
@@ -203,13 +202,11 @@ class LangLinksActivity : BaseActivity() {
         fun setFilterText(filterText: String) {
             isSearching = true
             languageEntries.clear()
-            val filter = filterText.lowercase(Locale.getDefault())
             for (entry in originalLanguageEntries) {
                 val languageCode = entry.wikiSite.languageCode
                 val canonicalName = app.languageState.getAppLanguageCanonicalName(languageCode).orEmpty()
                 val localizedName = app.languageState.getAppLanguageLocalizedName(languageCode).orEmpty()
-                if (canonicalName.lowercase(Locale.getDefault()).contains(filter) ||
-                        localizedName.lowercase(Locale.getDefault()).contains(filter)) {
+                if (canonicalName.contains(filterText, true) || localizedName.contains(filterText, true)) {
                     languageEntries.add(entry)
                 }
             }
diff --git a/app/src/main/java/org/wikipedia/language/LanguagesListViewModel.kt b/app/src/main/java/org/wikipedia/language/LanguagesListViewModel.kt
index 913fa1ce676..1e508732392 100644
--- a/app/src/main/java/org/wikipedia/language/LanguagesListViewModel.kt
+++ b/app/src/main/java/org/wikipedia/language/LanguagesListViewModel.kt
@@ -13,7 +13,6 @@ import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.mwapi.SiteMatrix
 import org.wikipedia.util.Resource
 import org.wikipedia.util.log.L
-import java.util.*
 
 class LanguagesListViewModel : ViewModel() {
 
@@ -42,7 +41,7 @@ class LanguagesListViewModel : ViewModel() {
 
     fun getListBySearchTerm(context: Context, searchTerm: String?): List<LanguageListItem> {
         val results = mutableListOf<LanguageListItem>()
-        val filter = StringUtils.stripAccents(searchTerm.orEmpty()).lowercase(Locale.getDefault())
+        val filter = StringUtils.stripAccents(searchTerm.orEmpty())
 
         addFilteredLanguageListItems(filter, suggestedLanguageCodes,
                 context.getString(R.string.languages_list_suggested_text), results)
@@ -59,9 +58,9 @@ class LanguagesListViewModel : ViewModel() {
         for (code in codes) {
             val localizedName = StringUtils.stripAccents(WikipediaApp.instance.languageState.getAppLanguageLocalizedName(code).orEmpty())
             val canonicalName = StringUtils.stripAccents(getCanonicalName(code).orEmpty())
-            if (filter.isEmpty() || code.contains(filter) ||
-                    localizedName.lowercase(Locale.getDefault()).contains(filter) ||
-                    canonicalName.lowercase(Locale.getDefault()).contains(filter)) {
+            if (filter.isEmpty() || code.contains(filter, true) ||
+                    localizedName.contains(filter, true) ||
+                    canonicalName.contains(filter, true)) {
                 if (first) {
                     results.add(LanguageListItem(headerText, true))
                     first = false
diff --git a/app/src/main/java/org/wikipedia/model/EnumCodeMap.kt b/app/src/main/java/org/wikipedia/model/EnumCodeMap.kt
deleted file mode 100644
index 22ac0591703..00000000000
--- a/app/src/main/java/org/wikipedia/model/EnumCodeMap.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.wikipedia.model
-
-import android.util.SparseArray
-import androidx.core.util.valueIterator
-
-class EnumCodeMap<T>(enumeration: Class<T>) where T : Enum<T>, T : EnumCode {
-    private val map: SparseArray<T>
-
-    init {
-        map = codeToEnumMap(enumeration)
-    }
-
-    operator fun get(code: Int): T {
-        return map.get(code) ?: throw IllegalArgumentException("code=$code")
-    }
-
-    private fun codeToEnumMap(enumeration: Class<T>): SparseArray<T> {
-        val ret = SparseArray<T>()
-        for (value in enumeration.enumConstants!!) {
-            ret.put(value.code(), value)
-        }
-        return ret
-    }
-
-    fun size(): Int {
-        return map.size()
-    }
-
-    fun valueIterator(): Iterator<T> {
-        return map.valueIterator()
-    }
-}
diff --git a/app/src/main/java/org/wikipedia/model/EnumStr.kt b/app/src/main/java/org/wikipedia/model/EnumStr.kt
deleted file mode 100644
index 8e201a9852e..00000000000
--- a/app/src/main/java/org/wikipedia/model/EnumStr.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.wikipedia.model
-
-interface EnumStr {
-    fun str(): String
-}
diff --git a/app/src/main/java/org/wikipedia/navtab/NavTab.kt b/app/src/main/java/org/wikipedia/navtab/NavTab.kt
index e499c83669f..18580889d49 100644
--- a/app/src/main/java/org/wikipedia/navtab/NavTab.kt
+++ b/app/src/main/java/org/wikipedia/navtab/NavTab.kt
@@ -7,7 +7,6 @@ import org.wikipedia.R
 import org.wikipedia.feed.FeedFragment
 import org.wikipedia.history.HistoryFragment
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 import org.wikipedia.readinglist.ReadingListsFragment
 import org.wikipedia.suggestededits.SuggestedEditsTasksFragment
 
@@ -47,15 +46,8 @@ enum class NavTab constructor(
     }
 
     companion object {
-
-        private val MAP = EnumCodeMap(NavTab::class.java)
-
         fun of(code: Int): NavTab {
-            return MAP[code]
-        }
-
-        fun size(): Int {
-            return MAP.size()
+            return entries[code]
         }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/navtab/NavTabFragmentPagerAdapter.kt b/app/src/main/java/org/wikipedia/navtab/NavTabFragmentPagerAdapter.kt
index 73de8f531b1..af540ef0453 100644
--- a/app/src/main/java/org/wikipedia/navtab/NavTabFragmentPagerAdapter.kt
+++ b/app/src/main/java/org/wikipedia/navtab/NavTabFragmentPagerAdapter.kt
@@ -9,6 +9,6 @@ class NavTabFragmentPagerAdapter(fragment: Fragment) : PositionAwareFragmentStat
     }
 
     override fun getItemCount(): Int {
-        return NavTab.size()
+        return NavTab.entries.size
     }
 }
diff --git a/app/src/main/java/org/wikipedia/navtab/NavTabLayout.kt b/app/src/main/java/org/wikipedia/navtab/NavTabLayout.kt
index f51d1f11b1c..eb90565926c 100644
--- a/app/src/main/java/org/wikipedia/navtab/NavTabLayout.kt
+++ b/app/src/main/java/org/wikipedia/navtab/NavTabLayout.kt
@@ -8,9 +8,8 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
 class NavTabLayout constructor(context: Context, attrs: AttributeSet) : BottomNavigationView(context, attrs) {
     init {
         menu.clear()
-        for (i in 0 until NavTab.size()) {
-            val navTab = NavTab.of(i)
-            menu.add(Menu.NONE, navTab.id, i, navTab.text).setIcon(navTab.icon)
+        NavTab.entries.forEachIndexed { index, tab ->
+            menu.add(Menu.NONE, tab.id, index, tab.text).setIcon(tab.icon)
         }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/notifications/NotificationCategory.kt b/app/src/main/java/org/wikipedia/notifications/NotificationCategory.kt
index 9f840fa96e2..19df7f755cd 100644
--- a/app/src/main/java/org/wikipedia/notifications/NotificationCategory.kt
+++ b/app/src/main/java/org/wikipedia/notifications/NotificationCategory.kt
@@ -10,7 +10,6 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import org.wikipedia.R
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 import org.wikipedia.util.log.L
 
 private const val GROUP_WIKIPEDIA_NOTIFICATIONS: String = "WIKIPEDIA_NOTIFICATIONS"
@@ -45,18 +44,11 @@ enum class NotificationCategory constructor(val id: String,
     }
 
     companion object {
-
         private val MENTIONS_GROUP = listOf(MENTION, EDIT_USER_TALK, EMAIL_USER, USER_RIGHTS, REVERTED)
         val FILTERS_GROUP = listOf(EDIT_USER_TALK, MENTION, EMAIL_USER, REVERTED, USER_RIGHTS, EDIT_THANK, MILESTONE_EDIT, LOGIN_FAIL, SYSTEM, ARTICLE_LINKED)
 
-        private val MAP = EnumCodeMap(NotificationCategory::class.java)
-
-        private fun findOrNull(id: String): NotificationCategory? {
-            return MAP.valueIterator().asSequence().firstOrNull { id == it.id || id.startsWith(it.id) }
-        }
-
         fun find(id: String): NotificationCategory {
-            return findOrNull(id) ?: MAP[0]
+            return entries.find { id == it.id || id.startsWith(it.id) } ?: entries[0]
         }
 
         fun isMentionsGroup(category: String): Boolean {
@@ -97,7 +89,7 @@ enum class NotificationCategory constructor(val id: String,
             notificationManagerCompat.deleteNotificationChannel("READING_LIST_SYNCING_CHANNEL")
             notificationManagerCompat.deleteNotificationChannel("SYNCING_CHANNEL")
 
-            val notificationChannels = MAP.valueIterator().asSequence().toList().mapNotNull {
+            val notificationChannels = entries.mapNotNull {
                 val notificationChannelCompat = notificationManagerCompat.getNotificationChannelCompat(it.id)
                 if (notificationChannelCompat == null) {
                     NotificationChannelCompat.Builder(it.id, it.importance)
diff --git a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.kt b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.kt
index 5ff7c5eeb7a..c88b8cce972 100644
--- a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.kt
+++ b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.kt
@@ -15,7 +15,6 @@ import org.wikipedia.R
 import org.wikipedia.activity.FragmentUtil
 import org.wikipedia.login.LoginActivity
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 import org.wikipedia.settings.Prefs
 import org.wikipedia.settings.languages.WikipediaLanguagesActivity
 import org.wikipedia.util.FeedbackUtil
@@ -70,7 +69,7 @@ class InitialOnboardingFragment : OnboardingFragment(), OnboardingPageView.Callb
         }
 
         override fun getItemCount(): Int {
-            return OnboardingPage.size()
+            return OnboardingPage.entries.size
         }
     }
 
@@ -106,13 +105,8 @@ class InitialOnboardingFragment : OnboardingFragment(), OnboardingPageView.Callb
         }
 
         companion object {
-            private val MAP = EnumCodeMap(OnboardingPage::class.java)
             fun of(code: Int): OnboardingPage {
-                return MAP[code]
-            }
-
-            fun size(): Int {
-                return MAP.size()
+                return entries[code]
             }
         }
     }
diff --git a/app/src/main/java/org/wikipedia/page/ExtendedBottomSheetDialogFragment.kt b/app/src/main/java/org/wikipedia/page/ExtendedBottomSheetDialogFragment.kt
index 07e7d3de3e7..cc762bc21e4 100644
--- a/app/src/main/java/org/wikipedia/page/ExtendedBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/wikipedia/page/ExtendedBottomSheetDialogFragment.kt
@@ -5,9 +5,11 @@ import android.content.Context
 import android.os.Bundle
 import android.view.MotionEvent
 import androidx.annotation.StyleRes
+import androidx.core.view.WindowInsetsControllerCompat
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.wikipedia.R
+import org.wikipedia.WikipediaApp
 import org.wikipedia.analytics.BreadcrumbsContextHelper
 import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
 import org.wikipedia.util.DeviceUtil
@@ -15,7 +17,12 @@ import org.wikipedia.util.ResourceUtil
 
 open class ExtendedBottomSheetDialogFragment : BottomSheetDialogFragment() {
     protected fun disableBackgroundDim() {
-        requireDialog().window?.setDimAmount(0f)
+        requireDialog().window?.let {
+            WindowInsetsControllerCompat(it, it.decorView).run {
+                isAppearanceLightStatusBars = !WikipediaApp.instance.currentTheme.isDark
+            }
+            it.setDimAmount(0f)
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/wikipedia/page/Namespace.kt b/app/src/main/java/org/wikipedia/page/Namespace.kt
index 0836dcacb5e..9af6496e46e 100644
--- a/app/src/main/java/org/wikipedia/page/Namespace.kt
+++ b/app/src/main/java/org/wikipedia/page/Namespace.kt
@@ -1,9 +1,9 @@
 package org.wikipedia.page
 
 import org.wikipedia.dataclient.WikiSite
+import org.wikipedia.extensions.getByCode
 import org.wikipedia.language.AppLanguageLookUpTable
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 import org.wikipedia.staticdata.*
 import java.util.*
 
@@ -168,7 +168,6 @@ enum class Namespace(private val code: Int) : EnumCode {
 
     companion object {
         private const val TALK_MASK = 0x1
-        private val MAP = EnumCodeMap(Namespace::class.java)
 
         @JvmStatic
         fun fromLegacyString(wiki: WikiSite, name: String?): Namespace {
@@ -196,7 +195,7 @@ enum class Namespace(private val code: Int) : EnumCode {
 
         @JvmStatic
         fun of(code: Int): Namespace {
-            return MAP[code]
+            return entries.getByCode(code)
         }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.kt b/app/src/main/java/org/wikipedia/page/PageActivity.kt
index 3eb0ebc3ea2..7d56127501d 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.kt
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.kt
@@ -380,7 +380,7 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
     }
 
     override fun onPageShowLinkPreview(entry: HistoryEntry) {
-        ExclusiveBottomSheetPresenter.show(supportFragmentManager, LinkPreviewDialog.newInstance(entry, null))
+        ExclusiveBottomSheetPresenter.show(supportFragmentManager, LinkPreviewDialog.newInstance(entry))
     }
 
     override fun onPageLoadMainPageInForegroundTab() {
diff --git a/app/src/main/java/org/wikipedia/page/action/PageActionItem.kt b/app/src/main/java/org/wikipedia/page/action/PageActionItem.kt
index d7c27868ab6..5def032eb80 100644
--- a/app/src/main/java/org/wikipedia/page/action/PageActionItem.kt
+++ b/app/src/main/java/org/wikipedia/page/action/PageActionItem.kt
@@ -4,7 +4,6 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import org.wikipedia.R
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 
 @Suppress("unused")
 enum class PageActionItem constructor(val id: Int,
@@ -105,18 +104,8 @@ enum class PageActionItem constructor(val id: Int,
     }
 
     companion object {
-        val MAP = EnumCodeMap(PageActionItem::class.java)
-
-        fun size(): Int {
-            return MAP.size()
-        }
-
-        private fun findOrNull(id: Int): PageActionItem? {
-            return MAP.valueIterator().asSequence().firstOrNull { id == it.id || id == it.viewId }
-        }
-
         fun find(id: Int): PageActionItem {
-            return findOrNull(id = id) ?: MAP[0]
+            return entries.find { id == it.id || id == it.viewId } ?: entries[0]
         }
 
         @DrawableRes
diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.kt b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.kt
index ab19f00af95..05f3d3b8478 100644
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.kt
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.kt
@@ -8,9 +8,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -18,6 +20,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.launch
 import org.wikipedia.Constants
 import org.wikipedia.R
+import org.wikipedia.activity.BaseActivity
 import org.wikipedia.activity.FragmentUtil.getCallback
 import org.wikipedia.analytics.eventplatform.ArticleLinkPreviewInteractionEvent
 import org.wikipedia.analytics.metricsplatform.ArticleLinkPreviewInteraction
@@ -27,11 +30,14 @@ import org.wikipedia.dataclient.page.PageSummary
 import org.wikipedia.gallery.GalleryActivity
 import org.wikipedia.gallery.GalleryThumbnailScrollView.GalleryViewListener
 import org.wikipedia.history.HistoryEntry
+import org.wikipedia.page.ExclusiveBottomSheetPresenter
 import org.wikipedia.page.ExtendedBottomSheetDialogFragment
 import org.wikipedia.page.Namespace
 import org.wikipedia.page.PageActivity
 import org.wikipedia.page.PageTitle
+import org.wikipedia.readinglist.LongPressMenu
 import org.wikipedia.readinglist.ReadingListBehaviorsUtil
+import org.wikipedia.readinglist.database.ReadingListPage
 import org.wikipedia.util.ClipboardUtil
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.GeoUtil
@@ -41,6 +47,9 @@ import org.wikipedia.util.ShareUtil
 import org.wikipedia.util.StringUtil
 import org.wikipedia.util.log.L
 import org.wikipedia.views.ViewUtil
+import org.wikipedia.watchlist.WatchlistExpiry
+import org.wikipedia.watchlist.WatchlistExpiryDialog
+import java.util.Locale
 
 class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorView.Callback, DialogInterface.OnDismissListener {
     interface LoadPageCallback {
@@ -69,12 +78,35 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
                 ShareUtil.shareText(requireContext(), viewModel.pageTitle)
                 true
             }
+            R.id.menu_link_preview_watch -> {
+                viewModel.watchOrUnwatch(viewModel.isWatched)
+                true
+            }
+            R.id.menu_link_preview_open_in_new_tab -> {
+                goToLinkedPage(true)
+                true
+            }
             R.id.menu_link_preview_copy_link -> {
                 ClipboardUtil.setPlainText(requireActivity(), text = viewModel.pageTitle.uri)
                 FeedbackUtil.showMessage(requireActivity(), R.string.address_copied)
                 dismiss()
                 true
             }
+            R.id.menu_link_preview_view_on_map -> {
+                viewModel.location?.let {
+                    // TODO: implement this in Places branch
+                    // startActivity(PlacesActivity.newIntent(requireContext(), viewModel.pageTitle, it))
+                    GeoUtil.sendGeoIntent(requireActivity(), it, StringUtil.fromHtml(viewModel.pageTitle.displayText).toString())
+                }
+                dismiss()
+                true
+            }
+            R.id.menu_link_preview_get_directions -> {
+                viewModel.location?.let {
+                    GeoUtil.sendGeoIntent(requireActivity(), it, StringUtil.fromHtml(viewModel.pageTitle.displayText).toString())
+                }
+                true
+            }
             else -> false
         }
     }
@@ -101,11 +133,7 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
         _binding = DialogLinkPreviewBinding.inflate(inflater, container, false)
         binding.linkPreviewToolbar.setOnClickListener { goToLinkedPage(false) }
         binding.linkPreviewOverflowButton.setOnClickListener {
-            PopupMenu(requireActivity(), binding.linkPreviewOverflowButton).run {
-                inflate(R.menu.menu_link_preview)
-                setOnMenuItemClickListener(menuListener)
-                show()
-            }
+            setupOverflowMenu()
         }
         L10nUtil.setConditionalLayoutDirection(binding.root, viewModel.pageTitle.wikiSite.languageCode)
 
@@ -125,6 +153,10 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
                         is LinkPreviewViewState.Gallery -> {
                             renderGalleryState(it)
                         }
+                        is LinkPreviewViewState.Watch -> {
+                            showWatchlistSnackbar(requireActivity() as BaseActivity, viewModel.pageTitle)
+                            dismiss()
+                        }
                         is LinkPreviewViewState.Completed -> {
                             binding.linkPreviewProgress.visibility = View.GONE
                         }
@@ -135,6 +167,20 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
         return binding.root
     }
 
+    private fun setupOverflowMenu() {
+        val popupMenu = PopupMenu(requireActivity(), binding.linkPreviewOverflowButton)
+        popupMenu.inflate(R.menu.menu_link_preview)
+        popupMenu.menu.findItem(R.id.menu_link_preview_add_to_list).isVisible = !viewModel.fromPlaces
+        popupMenu.menu.findItem(R.id.menu_link_preview_share_page).isVisible = !viewModel.fromPlaces
+        popupMenu.menu.findItem(R.id.menu_link_preview_watch).isVisible = viewModel.fromPlaces
+        popupMenu.menu.findItem(R.id.menu_link_preview_watch).title = getString(if (viewModel.isWatched) R.string.menu_page_unwatch else R.string.menu_page_watch)
+        popupMenu.menu.findItem(R.id.menu_link_preview_open_in_new_tab).isVisible = viewModel.fromPlaces
+        popupMenu.menu.findItem(R.id.menu_link_preview_view_on_map).isVisible = !viewModel.fromPlaces && viewModel.location != null
+        popupMenu.menu.findItem(R.id.menu_link_preview_get_directions).isVisible = viewModel.fromPlaces
+        popupMenu.setOnMenuItemClickListener(menuListener)
+        popupMenu.show()
+    }
+
     private fun renderGalleryState(it: LinkPreviewViewState.Gallery) {
         binding.linkPreviewThumbnailGallery.setGalleryList(it.data)
         binding.linkPreviewThumbnailGallery.listener = galleryViewListener
@@ -159,6 +205,14 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
         revision = summary.revision
 
         binding.linkPreviewTitle.text = StringUtil.fromHtml(summary.displayTitle)
+        if (viewModel.fromPlaces) {
+            viewModel.location?.let { startLocation ->
+                viewModel.lastKnownLocation?.let { endLocation ->
+                    binding.linkPreviewDistance.isVisible = true
+                    binding.linkPreviewDistance.text = GeoUtil.getDistanceWithUnit(startLocation, endLocation, Locale.getDefault())
+                }
+            }
+        }
         showPreview(LinkPreviewContents(summary, viewModel.pageTitle.wikiSite))
     }
 
@@ -168,26 +222,42 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
         showError(throwable)
     }
 
+    override fun onStart() {
+        super.onStart()
+        if (viewModel.fromPlaces) {
+            disableBackgroundDim()
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         val containerView = requireDialog().findViewById<ViewGroup>(R.id.container)
         if (overlayView == null && containerView != null) {
             LinkPreviewOverlayView(requireContext()).let {
                 overlayView = it
-                it.callback = OverlayViewCallback()
-                it.setPrimaryButtonText(
-                        L10nUtil.getStringForArticleLanguage(
-                                viewModel.pageTitle,
-                                if (viewModel.pageTitle.namespace() === Namespace.TALK || viewModel.pageTitle.namespace() === Namespace.USER_TALK) R.string.button_continue_to_talk_page else R.string.button_continue_to_article
-                        )
-                )
-                it.setSecondaryButtonText(
-                        L10nUtil.getStringForArticleLanguage(
-                                viewModel.pageTitle,
-                                R.string.menu_long_press_open_in_new_tab
+                if (viewModel.fromPlaces) {
+                    it.callback = OverlayViewPlacesCallback()
+                    it.setPrimaryButtonText(
+                        L10nUtil.getStringForArticleLanguage(viewModel.pageTitle, R.string.link_preview_dialog_share_button)
+                    )
+                    it.setSecondaryButtonText(
+                        L10nUtil.getStringForArticleLanguage(viewModel.pageTitle, R.string.link_preview_dialog_save_button)
+                    )
+                    it.setTertiaryButtonText(
+                        L10nUtil.getStringForArticleLanguage(viewModel.pageTitle, R.string.link_preview_dialog_read_button)
+                    )
+                } else {
+                    it.callback = OverlayViewCallback()
+                    it.setPrimaryButtonText(
+                        L10nUtil.getStringForArticleLanguage(viewModel.pageTitle,
+                            if (viewModel.pageTitle.namespace() === Namespace.TALK || viewModel.pageTitle.namespace() === Namespace.USER_TALK) R.string.button_continue_to_talk_page else R.string.button_continue_to_article
                         )
-                )
-                it.showTertiaryButton(viewModel.location != null)
+                    )
+                    it.setSecondaryButtonText(
+                        L10nUtil.getStringForArticleLanguage(viewModel.pageTitle, R.string.menu_long_press_open_in_new_tab)
+                    )
+                    it.showTertiaryButton(false)
+                }
                 containerView.addView(it)
             }
         }
@@ -221,11 +291,55 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
         dismiss()
     }
 
+    private fun showWatchlistSnackbar(activity: AppCompatActivity, pageTitle: PageTitle) {
+        viewModel.pageTitle.let {
+            if (!viewModel.isWatched) {
+                FeedbackUtil.showMessage(this, getString(R.string.watchlist_page_removed_from_watchlist_snackbar, it.displayText))
+            } else if (viewModel.isWatched) {
+                val snackbar = FeedbackUtil.makeSnackbar(requireActivity(),
+                getString(R.string.watchlist_page_add_to_watchlist_snackbar, it.displayText, getString(WatchlistExpiry.NEVER.stringId)))
+                snackbar.setAction(R.string.watchlist_page_add_to_watchlist_snackbar_action) {
+                        ExclusiveBottomSheetPresenter.show(activity.supportFragmentManager, WatchlistExpiryDialog.newInstance(pageTitle, WatchlistExpiry.NEVER))
+                }
+                snackbar.show()
+            }
+        }
+    }
+
     private fun doAddToList() {
         ReadingListBehaviorsUtil.addToDefaultList(requireActivity(), viewModel.pageTitle, true, Constants.InvokeSource.LINK_PREVIEW_MENU)
         dialog?.dismiss()
     }
 
+    private fun showReadingListPopupMenu(anchorView: View) {
+        if (viewModel.isInReadingList) {
+            LongPressMenu(anchorView, object : LongPressMenu.Callback {
+                override fun onOpenLink(entry: HistoryEntry) { }
+
+                override fun onOpenInNewTab(entry: HistoryEntry) { }
+
+                override fun onAddRequest(entry: HistoryEntry, addToDefault: Boolean) {
+                    ReadingListBehaviorsUtil.addToDefaultList(requireActivity(), viewModel.pageTitle, addToDefault, Constants.InvokeSource.LINK_PREVIEW_MENU)
+                    dismiss()
+                }
+
+                override fun onMoveRequest(page: ReadingListPage?, entry: HistoryEntry) {
+                    page?.let { readingListPage ->
+                        ReadingListBehaviorsUtil.moveToList(requireActivity(), readingListPage.listId, viewModel.pageTitle, Constants.InvokeSource.LINK_PREVIEW_MENU)
+                    }
+                    dismiss()
+                }
+
+                override fun onRemoveRequest() {
+                    dismiss()
+                }
+            }).show(HistoryEntry(viewModel.pageTitle, HistoryEntry.SOURCE_INTERNAL_LINK))
+        } else {
+            ReadingListBehaviorsUtil.addToDefaultList(requireActivity(), viewModel.pageTitle, true, Constants.InvokeSource.LINK_PREVIEW_MENU)
+            dismiss()
+        }
+    }
+
     private fun showPreview(contents: LinkPreviewContents) {
         viewModel.loadGallery(revision)
         setPreviewContents(contents)
@@ -276,21 +390,19 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
             ViewUtil.loadImage(binding.linkPreviewThumbnail, it)
         }
         overlayView?.run {
-            setPrimaryButtonText(
+            if (!viewModel.fromPlaces) {
+                setPrimaryButtonText(
                     L10nUtil.getStringForArticleLanguage(
-                            viewModel.pageTitle,
-                            if (contents.isDisambiguation) R.string.button_continue_to_disambiguation
-                            else if (viewModel.pageTitle.namespace() === Namespace.TALK || viewModel.pageTitle.namespace() === Namespace.USER_TALK) R.string.button_continue_to_talk_page
-                            else R.string.button_continue_to_article
+                        viewModel.pageTitle,
+                        if (contents.isDisambiguation) R.string.button_continue_to_disambiguation
+                        else if (viewModel.pageTitle.namespace() === Namespace.TALK || viewModel.pageTitle.namespace() === Namespace.USER_TALK) R.string.button_continue_to_talk_page
+                        else R.string.button_continue_to_article
                     )
-            )
-        }
-    }
-
-    private fun goToExternalMapsApp() {
-        viewModel.location?.let {
-            dismiss()
-            GeoUtil.sendGeoIntent(requireActivity(), it, viewModel.pageTitle.displayText)
+                )
+            } else if (viewModel.fromPlaces) {
+                setSecondaryButtonText(L10nUtil.getStringForArticleLanguage(viewModel.pageTitle,
+                    if (viewModel.isInReadingList) R.string.link_preview_dialog_saved_button else R.string.link_preview_dialog_save_button))
+            }
         }
     }
 
@@ -325,17 +437,40 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
         }
 
         override fun onTertiaryClick() {
-            goToExternalMapsApp()
+            // ignore
+        }
+    }
+
+    private inner class OverlayViewPlacesCallback : LinkPreviewOverlayView.Callback {
+        override fun onPrimaryClick() {
+            ShareUtil.shareText(requireContext(), viewModel.pageTitle)
+        }
+
+        override fun onSecondaryClick() {
+            overlayView?.let {
+                showReadingListPopupMenu(it.secondaryButtonView)
+            }
+        }
+
+        override fun onTertiaryClick() {
+            goToLinkedPage(false)
         }
     }
 
     companion object {
         const val ARG_ENTRY = "entry"
         const val ARG_LOCATION = "location"
+        const val ARG_LAST_KNOWN_LOCATION = "lastKnownLocation"
+        const val ARG_FROM_PLACES = "fromPlaces"
 
-        fun newInstance(entry: HistoryEntry, location: Location?): LinkPreviewDialog {
+        fun newInstance(entry: HistoryEntry, location: Location? = null, lastKnownLocation: Location? = null, fromPlaces: Boolean = false): LinkPreviewDialog {
             return LinkPreviewDialog().apply {
-                arguments = bundleOf(ARG_ENTRY to entry, ARG_LOCATION to location)
+                arguments = bundleOf(
+                    ARG_ENTRY to entry,
+                    ARG_LOCATION to location,
+                    ARG_LAST_KNOWN_LOCATION to lastKnownLocation,
+                    ARG_FROM_PLACES to fromPlaces
+                )
             }
         }
     }
diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewOverlayView.kt b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewOverlayView.kt
index c7ec02d04fb..50eeb8ddf66 100644
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewOverlayView.kt
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewOverlayView.kt
@@ -19,6 +19,7 @@ class LinkPreviewOverlayView : FrameLayout {
 
     private val binding = ViewLinkPreviewOverlayBinding.inflate(LayoutInflater.from(context), this, true)
     var callback: Callback? = null
+    val secondaryButtonView get() = binding.linkPreviewSecondaryButton
 
     init {
         binding.linkPreviewPrimaryButton.setOnClickListener {
@@ -47,4 +48,8 @@ class LinkPreviewOverlayView : FrameLayout {
     fun showTertiaryButton(show: Boolean) {
         binding.linkPreviewTertiaryButton.visibility = if (show) VISIBLE else GONE
     }
+
+    fun setTertiaryButtonText(text: CharSequence?) {
+        binding.linkPreviewTertiaryButton.text = text
+    }
 }
diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewModel.kt b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewModel.kt
index 1dafda2daa7..58ead3af395 100644
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewModel.kt
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewModel.kt
@@ -6,28 +6,37 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import org.wikipedia.analytics.eventplatform.WatchlistAnalyticsHelper
+import org.wikipedia.database.AppDatabase
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.extensions.parcelable
 import org.wikipedia.history.HistoryEntry
 import org.wikipedia.page.PageTitle
-import org.wikipedia.page.linkpreview.LinkPreviewDialog.Companion.ARG_LOCATION
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.log.L
+import org.wikipedia.watchlist.WatchlistExpiry
 
 class LinkPreviewViewModel(bundle: Bundle) : ViewModel() {
     private val _uiState = MutableStateFlow<LinkPreviewViewState>(LinkPreviewViewState.Loading)
     val uiState = _uiState.asStateFlow()
     val historyEntry = bundle.parcelable<HistoryEntry>(LinkPreviewDialog.ARG_ENTRY)!!
     var pageTitle = historyEntry.title
-    val location = bundle.parcelable<Location>(ARG_LOCATION)
+    var location = bundle.parcelable<Location>(LinkPreviewDialog.ARG_LOCATION)
+    val fromPlaces = bundle.getBoolean(LinkPreviewDialog.ARG_FROM_PLACES, false)
+    val lastKnownLocation = bundle.parcelable<Location>(LinkPreviewDialog.ARG_LAST_KNOWN_LOCATION)
+    var isInReadingList = false
+
+    var isWatched = false
+    var hasWatchlistExpiry = false
 
     init {
         loadContent()
     }
 
-    fun loadContent() {
+    private fun loadContent() {
         viewModelScope.launch(CoroutineExceptionHandler { _, throwable ->
             _uiState.value = LinkPreviewViewState.Error(throwable)
         }) {
@@ -49,6 +58,19 @@ class LinkPreviewViewModel(bundle: Bundle) : ViewModel() {
             } else if (!oldFragment.isNullOrEmpty()) {
                 pageTitle.fragment = oldFragment
             }
+
+            if (fromPlaces) {
+                val watchStatus = ServiceFactory.get(pageTitle.wikiSite).getWatchedStatus(pageTitle.prefixedText).query?.firstPage()
+                isWatched = watchStatus?.watched ?: false
+
+                val readingList = AppDatabase.instance.readingListPageDao().findPageInAnyList(pageTitle)
+                isInReadingList = readingList != null
+            }
+
+            if (location == null) {
+                location = summary.coordinates
+            }
+
             _uiState.value = LinkPreviewViewState.Content(summary)
         }
     }
@@ -82,6 +104,31 @@ class LinkPreviewViewModel(bundle: Bundle) : ViewModel() {
         }
     }
 
+    fun watchOrUnwatch(unwatch: Boolean) {
+        if (isWatched) {
+            WatchlistAnalyticsHelper.logRemovedFromWatchlist(pageTitle)
+        } else {
+            WatchlistAnalyticsHelper.logAddedToWatchlist(pageTitle)
+        }
+        viewModelScope.launch(CoroutineExceptionHandler { _, throwable ->
+            L.w("Failed to fetch watch status.", throwable)
+        }) {
+            val token = ServiceFactory.get(pageTitle.wikiSite).getWatchToken().query?.watchToken()
+            val response = ServiceFactory.get(pageTitle.wikiSite)
+                .watch(if (unwatch) 1 else null, null, pageTitle.prefixedText, WatchlistExpiry.NEVER.expiry, token!!)
+
+            if (unwatch) {
+                WatchlistAnalyticsHelper.logRemovedFromWatchlistSuccess(pageTitle)
+            } else {
+                WatchlistAnalyticsHelper.logAddedToWatchlistSuccess(pageTitle)
+            }
+            response.getFirst()?.let {
+                isWatched = it.watched
+                _uiState.value = LinkPreviewViewState.Watch(isWatched)
+            }
+        }
+    }
+
     class Factory(private val bunble: Bundle) : ViewModelProvider.Factory {
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewState.kt b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewState.kt
index b1ff79bfbfd..6eb1e6791e0 100644
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewState.kt
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewState.kt
@@ -4,9 +4,10 @@ import org.wikipedia.dataclient.mwapi.MwQueryPage
 import org.wikipedia.dataclient.page.PageSummary
 
 sealed class LinkPreviewViewState {
-    object Loading : LinkPreviewViewState()
-    object Completed : LinkPreviewViewState()
+    data object Loading : LinkPreviewViewState()
+    data object Completed : LinkPreviewViewState()
     data class Error(val throwable: Throwable) : LinkPreviewViewState()
     data class Content(val data: PageSummary) : LinkPreviewViewState()
     data class Gallery(val data: List<MwQueryPage>) : LinkPreviewViewState()
+    data class Watch(val isWatch: Boolean) : LinkPreviewViewState()
 }
diff --git a/app/src/main/java/org/wikipedia/readinglist/LongPressMenu.kt b/app/src/main/java/org/wikipedia/readinglist/LongPressMenu.kt
index 5bea4fe40ee..8fa8372b66c 100644
--- a/app/src/main/java/org/wikipedia/readinglist/LongPressMenu.kt
+++ b/app/src/main/java/org/wikipedia/readinglist/LongPressMenu.kt
@@ -28,6 +28,7 @@ class LongPressMenu(private val anchorView: View, private val existsInAnyList: B
         fun onOpenInNewTab(entry: HistoryEntry)
         fun onAddRequest(entry: HistoryEntry, addToDefault: Boolean)
         fun onMoveRequest(page: ReadingListPage?, entry: HistoryEntry)
+        fun onRemoveRequest() { /* ignore by default */ }
     }
 
     @MenuRes
@@ -89,7 +90,7 @@ class LongPressMenu(private val anchorView: View, private val existsInAnyList: B
         listsContainingPage?.let { list ->
             RemoveFromReadingListsDialog(list).deleteOrShowDialog(getActivity()) { readingLists, _ ->
                 entry?.let {
-                    if (anchorView.isAttachedToWindow) {
+                    if (!getActivity().isDestroyed) {
                         val readingListNames = readingLists.map { readingList -> readingList.title }.run {
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                 ListFormatter.getInstance().format(this)
@@ -139,6 +140,7 @@ class LongPressMenu(private val anchorView: View, private val existsInAnyList: B
                 }
                 R.id.menu_long_press_remove_from_lists -> {
                     deleteOrShowDialog()
+                    callback?.onRemoveRequest()
                     true
                 }
                 R.id.menu_long_press_share_page -> {
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListBehaviorsUtil.kt b/app/src/main/java/org/wikipedia/readinglist/ReadingListBehaviorsUtil.kt
index 4bdc3ae7181..a18bbd2cace 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListBehaviorsUtil.kt
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListBehaviorsUtil.kt
@@ -29,7 +29,6 @@ import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.StringUtil
 import org.wikipedia.util.log.L
 import org.wikipedia.views.CircularProgressBar.Companion.MIN_PROGRESS
-import java.util.Locale
 
 object ReadingListBehaviorsUtil {
 
@@ -385,14 +384,14 @@ object ReadingListBehaviorsUtil {
             return result
         }
 
-        val normalizedQuery = StringUtils.stripAccents(searchQuery).lowercase(Locale.getDefault())
+        val normalizedQuery = StringUtils.stripAccents(searchQuery)
         var lastListItemIndex = 0
         lists.forEach { list ->
-            if (StringUtils.stripAccents(list.title).lowercase(Locale.getDefault()).contains(normalizedQuery)) {
+            if (StringUtils.stripAccents(list.title).contains(normalizedQuery, true)) {
                 result.add(lastListItemIndex++, list)
             }
             list.pages.forEach { page ->
-                if (page.accentAndCaseInvariantTitle().contains(normalizedQuery)) {
+                if (page.accentInvariantTitle.contains(normalizedQuery, true)) {
                     if (result.none { it is ReadingListPage && it.lang == page.lang && it.apiTitle == page.apiTitle }) {
                         result.add(page)
                     }
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.kt b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.kt
index acea1c769f4..b3d6d0c2829 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.kt
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.kt
@@ -5,14 +5,14 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.text.SpannableString
-import android.text.style.ForegroundColorSpan
 import android.view.*
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.core.graphics.ColorUtils
+import androidx.core.text.buildSpannedString
+import androidx.core.text.color
 import androidx.core.view.MenuItemCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -598,10 +598,11 @@ class ReadingListsFragment : Fragment(), SortReadingListsDialog.Callback, Readin
             val deleteItem = menu.findItem(R.id.menu_delete_selected)
             val exportItem = menu.findItem(R.id.menu_export_selected)
             val exportItemTitleColor = ResourceUtil.getThemedColor(requireContext(), R.attr.progressive_color)
-            val exportItemAlphaColor = ColorUtils.setAlphaComponent(exportItemTitleColor, alpha)
-            val spanString = SpannableString(exportItem.title.toString())
-            spanString.setSpan(ForegroundColorSpan(exportItemAlphaColor), 0, spanString.length, 0)
-            exportItem.title = spanString
+            exportItem.title = buildSpannedString {
+                color(ColorUtils.setAlphaComponent(exportItemTitleColor, alpha)) {
+                    append(exportItem.title)
+                }
+            }
             deleteItem.icon?.alpha = alpha
             exportItem.isEnabled = isEnabled
             deleteItem.isEnabled = isEnabled
diff --git a/app/src/main/java/org/wikipedia/readinglist/database/ReadingList.kt b/app/src/main/java/org/wikipedia/readinglist/database/ReadingList.kt
index 93a2d7b07d9..f5cd56775b8 100644
--- a/app/src/main/java/org/wikipedia/readinglist/database/ReadingList.kt
+++ b/app/src/main/java/org/wikipedia/readinglist/database/ReadingList.kt
@@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import java.io.Serializable
-import java.util.*
 
 // TODO: create default reading list upon initial DB creation.
 
@@ -26,8 +25,10 @@ class ReadingList(
     @Ignore
     val pages = mutableListOf<ReadingListPage>()
 
-    @Transient
-    private var accentAndCaseInvariantTitle: String? = null
+    @delegate:Transient
+    val accentInvariantTitle: String by lazy {
+        StringUtils.stripAccents(title)
+    }
 
     @Transient
     var selected = false
@@ -45,13 +46,6 @@ class ReadingList(
     val sizeBytesFromPages
         get() = pages.sumOf { if (it.offline) it.sizeBytes else 0 }
 
-    fun accentAndCaseInvariantTitle(): String {
-        if (accentAndCaseInvariantTitle == null) {
-            accentAndCaseInvariantTitle = StringUtils.stripAccents(title).lowercase(Locale.getDefault())
-        }
-        return accentAndCaseInvariantTitle!!
-    }
-
     fun touch() {
         atime = System.currentTimeMillis()
     }
@@ -73,8 +67,8 @@ class ReadingList(
 
         fun sort(list: ReadingList, sortMode: Int) {
             when (sortMode) {
-                SORT_BY_NAME_ASC -> list.pages.sortWith { lhs: ReadingListPage, rhs: ReadingListPage -> lhs.accentAndCaseInvariantTitle().compareTo(rhs.accentAndCaseInvariantTitle()) }
-                SORT_BY_NAME_DESC -> list.pages.sortWith { lhs: ReadingListPage, rhs: ReadingListPage -> rhs.accentAndCaseInvariantTitle().compareTo(lhs.accentAndCaseInvariantTitle()) }
+                SORT_BY_NAME_ASC -> list.pages.sortWith { lhs: ReadingListPage, rhs: ReadingListPage -> lhs.accentInvariantTitle.compareTo(rhs.accentInvariantTitle, true) }
+                SORT_BY_NAME_DESC -> list.pages.sortWith { lhs: ReadingListPage, rhs: ReadingListPage -> rhs.accentInvariantTitle.compareTo(lhs.accentInvariantTitle, true) }
                 SORT_BY_RECENT_ASC -> list.pages.sortWith { lhs: ReadingListPage, rhs: ReadingListPage -> lhs.mtime.compareTo(rhs.mtime) }
                 SORT_BY_RECENT_DESC -> list.pages.sortWith { lhs: ReadingListPage, rhs: ReadingListPage -> rhs.mtime.compareTo(lhs.mtime) }
             }
@@ -82,8 +76,8 @@ class ReadingList(
 
         fun sort(lists: MutableList<ReadingList>, sortMode: Int) {
             when (sortMode) {
-                SORT_BY_NAME_ASC -> lists.sortWith { lhs: ReadingList, rhs: ReadingList -> lhs.accentAndCaseInvariantTitle().compareTo(rhs.accentAndCaseInvariantTitle()) }
-                SORT_BY_NAME_DESC -> lists.sortWith { lhs: ReadingList, rhs: ReadingList -> rhs.accentAndCaseInvariantTitle().compareTo(lhs.accentAndCaseInvariantTitle()) }
+                SORT_BY_NAME_ASC -> lists.sortWith { lhs: ReadingList, rhs: ReadingList -> lhs.accentInvariantTitle.compareTo(rhs.accentInvariantTitle, true) }
+                SORT_BY_NAME_DESC -> lists.sortWith { lhs: ReadingList, rhs: ReadingList -> rhs.accentInvariantTitle.compareTo(lhs.accentInvariantTitle, true) }
                 SORT_BY_RECENT_ASC -> lists.sortWith { lhs: ReadingList, rhs: ReadingList -> rhs.mtime.compareTo(lhs.mtime) }
                 SORT_BY_RECENT_DESC -> lists.sortWith { lhs: ReadingList, rhs: ReadingList -> lhs.mtime.compareTo(rhs.mtime) }
             }
@@ -98,14 +92,14 @@ class ReadingList(
             when (sortMode) {
                 SORT_BY_NAME_ASC -> lists.sortWith { lhs: Any?, rhs: Any? ->
                     if (lhs is ReadingList && rhs is ReadingList) {
-                        lhs.accentAndCaseInvariantTitle().compareTo(rhs.accentAndCaseInvariantTitle())
+                        lhs.accentInvariantTitle.compareTo(rhs.accentInvariantTitle, true)
                     } else {
                         0
                     }
                 }
                 SORT_BY_NAME_DESC -> lists.sortWith { lhs: Any?, rhs: Any? ->
                     if (lhs is ReadingList && rhs is ReadingList) {
-                        rhs.accentAndCaseInvariantTitle().compareTo(lhs.accentAndCaseInvariantTitle())
+                        rhs.accentInvariantTitle.compareTo(lhs.accentInvariantTitle, true)
                     } else {
                         0
                     }
diff --git a/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPage.kt b/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPage.kt
index 55b85e7e054..eb90b41baa6 100644
--- a/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPage.kt
+++ b/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPage.kt
@@ -10,7 +10,6 @@ import org.wikipedia.page.PageTitle
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.StringUtil
 import java.io.Serializable
-import java.util.*
 
 @Entity
 data class ReadingListPage(
@@ -40,7 +39,10 @@ data class ReadingListPage(
         atime = now
     }
 
-    @Transient private var accentAndCaseInvariantTitle: String? = null
+    @delegate:Transient
+    val accentInvariantTitle: String by lazy {
+        StringUtils.stripAccents(StringUtil.fromHtml(displayTitle).toString())
+    }
 
     @Transient var downloadProgress = 0
 
@@ -48,13 +50,6 @@ data class ReadingListPage(
 
     val saving get() = offline && (status == STATUS_QUEUE_FOR_SAVE || status == STATUS_QUEUE_FOR_FORCED_SAVE)
 
-    fun accentAndCaseInvariantTitle(): String {
-        if (accentAndCaseInvariantTitle == null) {
-            accentAndCaseInvariantTitle = StringUtils.stripAccents(StringUtil.fromHtml(displayTitle).toString()).lowercase(Locale.getDefault())
-        }
-        return accentAndCaseInvariantTitle!!
-    }
-
     fun touch() {
         atime = System.currentTimeMillis()
     }
diff --git a/app/src/main/java/org/wikipedia/readinglist/db/ReadingListPageDao.kt b/app/src/main/java/org/wikipedia/readinglist/db/ReadingListPageDao.kt
index 0feba1b9861..657bcb23c29 100644
--- a/app/src/main/java/org/wikipedia/readinglist/db/ReadingListPageDao.kt
+++ b/app/src/main/java/org/wikipedia/readinglist/db/ReadingListPageDao.kt
@@ -14,7 +14,6 @@ import org.wikipedia.savedpages.SavedPageSyncService
 import org.wikipedia.search.SearchResult
 import org.wikipedia.search.SearchResults
 import org.wikipedia.util.StringUtil
-import java.util.*
 
 @Dao
 interface ReadingListPageDao {
@@ -139,7 +138,7 @@ interface ReadingListPageDao {
     }
 
     fun findPageForSearchQueryInAnyList(searchQuery: String): SearchResults {
-        var normalizedQuery = StringUtils.stripAccents(searchQuery).lowercase(Locale.getDefault())
+        var normalizedQuery = StringUtils.stripAccents(searchQuery)
         if (normalizedQuery.isEmpty()) {
             return SearchResults()
         }
@@ -147,7 +146,7 @@ interface ReadingListPageDao {
             .replace("%", "\\%").replace("_", "\\_")
 
         val pages = findPageBySearchTerm("%$normalizedQuery%")
-                .filter { StringUtil.fromHtml(it.accentAndCaseInvariantTitle()).contains(normalizedQuery) }
+                .filter { StringUtil.fromHtml(it.accentInvariantTitle).contains(normalizedQuery, true) }
 
         return if (pages.isEmpty()) SearchResults()
         else SearchResults(pages.take(2).map {
diff --git a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.kt b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.kt
index 7e2bda8f6aa..46cce6cc2e6 100644
--- a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.kt
+++ b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.kt
@@ -154,9 +154,7 @@ class SearchResultsFragment : Fragment() {
 
     private inner class SearchResultsDiffCallback : DiffUtil.ItemCallback<SearchResult>() {
         override fun areItemsTheSame(oldItem: SearchResult, newItem: SearchResult): Boolean {
-            return oldItem.pageTitle.prefixedText == newItem.pageTitle.prefixedText &&
-                    oldItem.pageTitle.namespace == newItem.pageTitle.namespace &&
-                    oldItem.pageTitle.description == newItem.pageTitle.description
+            return false
         }
 
         override fun areContentsTheSame(oldItem: SearchResult, newItem: SearchResult): Boolean {
diff --git a/app/src/main/java/org/wikipedia/search/SearchResultsViewModel.kt b/app/src/main/java/org/wikipedia/search/SearchResultsViewModel.kt
index dac1ffd363d..7f3b5b8b117 100644
--- a/app/src/main/java/org/wikipedia/search/SearchResultsViewModel.kt
+++ b/app/src/main/java/org/wikipedia/search/SearchResultsViewModel.kt
@@ -12,7 +12,6 @@ import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.mwapi.MwQueryResponse
 import org.wikipedia.util.StringUtil
-import java.util.*
 
 class SearchResultsViewModel : ViewModel() {
 
@@ -45,16 +44,17 @@ class SearchResultsViewModel : ViewModel() {
         private val languageCode: String?,
         private var resultsCount: MutableList<Int>?,
         private var totalResults: MutableList<SearchResult>?
-    ) : PagingSource<MwQueryResponse.Continuation, SearchResult>() {
+    ) : PagingSource<Int, SearchResult>() {
 
         private var prefixSearch = true
 
-        override suspend fun load(params: LoadParams<MwQueryResponse.Continuation>): LoadResult<MwQueryResponse.Continuation, SearchResult> {
+        override suspend fun load(params: LoadParams<Int>): LoadResult<Int, SearchResult> {
             return try {
                 if (searchTerm.isNullOrEmpty() || languageCode.isNullOrEmpty()) {
                     return LoadResult.Page(emptyList(), null, null)
                 }
 
+                var continuation: Int? = null
                 val wikiSite = WikiSite.forLanguageCode(languageCode)
                 var response: MwQueryResponse? = null
                 val resultList = mutableListOf<SearchResult>()
@@ -72,7 +72,8 @@ class SearchResultsViewModel : ViewModel() {
                             }
                         }
                     }
-                    response = ServiceFactory.get(wikiSite).prefixSearch(searchTerm, params.loadSize, params.key?.gpsoffset)
+                    response = ServiceFactory.get(wikiSite).prefixSearch(searchTerm, params.loadSize, 0)
+                    continuation = 0
                     prefixSearch = false
                 }
 
@@ -81,10 +82,9 @@ class SearchResultsViewModel : ViewModel() {
                 } ?: emptyList())
 
                 if (resultList.size < params.loadSize) {
-                    // Prevent using continuation string from prefix search after the first round of LoadResult.
-                    val continuation = if (params.key?.continuation?.contains("description") == true) null else params.key?.continuation
                     response = ServiceFactory.get(wikiSite)
-                        .fullTextSearch(searchTerm, params.key?.gsroffset?.toString(), params.loadSize, continuation)
+                        .fullTextSearch(searchTerm, params.loadSize, params.key)
+                    continuation = response.continuation?.gsroffset
 
                     resultList.addAll(response.query?.pages?.let { list ->
                         list.sortedBy { it.index }.map { SearchResult(it, wikiSite) }
@@ -105,7 +105,7 @@ class SearchResultsViewModel : ViewModel() {
                             }
                             if (countResultSize == 0) {
                                 val fullTextSearchResponse = ServiceFactory.get(WikiSite.forLanguageCode(langCode))
-                                        .fullTextSearch(searchTerm, null, params.loadSize, null)
+                                        .fullTextSearch(searchTerm, params.loadSize, null)
                                 countResultSize = fullTextSearchResponse.query?.pages?.size ?: 0
                             }
                             resultsCount?.add(countResultSize)
@@ -117,13 +117,13 @@ class SearchResultsViewModel : ViewModel() {
                     }
                 }
 
-                return LoadResult.Page(resultList.distinctBy { it.pageTitle.prefixedText }, null, response?.continuation)
+                return LoadResult.Page(resultList.distinctBy { it.pageTitle.prefixedText }, null, continuation)
             } catch (e: Exception) {
                 LoadResult.Error(e)
             }
         }
 
-        override fun getRefreshKey(state: PagingState<MwQueryResponse.Continuation, SearchResult>): MwQueryResponse.Continuation? {
+        override fun getRefreshKey(state: PagingState<Int, SearchResult>): Int? {
             prefixSearch = true
             totalResults?.clear()
             return null
@@ -133,9 +133,7 @@ class SearchResultsViewModel : ViewModel() {
             if (searchTerm.length >= 2) {
                 WikipediaApp.instance.tabList.forEach { tab ->
                     tab.backStackPositionTitle?.let {
-                        if (StringUtil.fromHtml(it.displayText).toString()
-                                .lowercase(Locale.getDefault())
-                                .contains(searchTerm.lowercase(Locale.getDefault()))) {
+                        if (StringUtil.fromHtml(it.displayText).contains(searchTerm, true)) {
                             return SearchResults(mutableListOf(SearchResult(it, SearchResult.SearchResultType.TAB_LIST)))
                         }
                     }
diff --git a/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsRecentEditsFilterTypes.kt b/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsRecentEditsFilterTypes.kt
index 9fa6d7cfccf..61615d7f146 100644
--- a/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsRecentEditsFilterTypes.kt
+++ b/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsRecentEditsFilterTypes.kt
@@ -3,7 +3,6 @@ package org.wikipedia.suggestededits
 import androidx.annotation.StringRes
 import org.wikipedia.R
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 
 @Suppress("unused")
 enum class SuggestedEditsRecentEditsFilterTypes constructor(val id: String,
@@ -80,14 +79,8 @@ enum class SuggestedEditsRecentEditsFilterTypes constructor(val id: String,
 
         val DEFAULT_FILTER_TYPE_SET = DEFAULT_FILTER_OTHERS + DEFAULT_FILTER_USER_STATUS
 
-        private val MAP = EnumCodeMap(SuggestedEditsRecentEditsFilterTypes::class.java)
-
-        private fun findOrNull(id: String): SuggestedEditsRecentEditsFilterTypes? {
-            return MAP.valueIterator().asSequence().firstOrNull { id == it.id || id.startsWith(it.id) }
-        }
-
         fun find(id: String): SuggestedEditsRecentEditsFilterTypes {
-            return findOrNull(id) ?: MAP[0]
+            return entries.firstOrNull { id == it.id || id.startsWith(it.id) } ?: entries[0]
         }
 
         fun findGroup(id: String): List<SuggestedEditsRecentEditsFilterTypes> {
diff --git a/app/src/main/java/org/wikipedia/talk/TalkTopicActivity.kt b/app/src/main/java/org/wikipedia/talk/TalkTopicActivity.kt
index 36a05a67195..3255353a88d 100644
--- a/app/src/main/java/org/wikipedia/talk/TalkTopicActivity.kt
+++ b/app/src/main/java/org/wikipedia/talk/TalkTopicActivity.kt
@@ -29,10 +29,19 @@ import org.wikipedia.edit.EditSectionActivity
 import org.wikipedia.history.HistoryEntry
 import org.wikipedia.history.SearchActionModeCallback
 import org.wikipedia.login.LoginActivity
-import org.wikipedia.page.*
+import org.wikipedia.page.LinkHandler
+import org.wikipedia.page.LinkMovementMethodExt
+import org.wikipedia.page.PageTitle
 import org.wikipedia.settings.Prefs
 import org.wikipedia.staticdata.UserAliasData
-import org.wikipedia.util.*
+import org.wikipedia.util.DeviceUtil
+import org.wikipedia.util.FeedbackUtil
+import org.wikipedia.util.L10nUtil
+import org.wikipedia.util.Resource
+import org.wikipedia.util.ResourceUtil
+import org.wikipedia.util.ShareUtil
+import org.wikipedia.util.StringUtil
+import org.wikipedia.util.UriUtil
 import org.wikipedia.views.SearchActionProvider
 import org.wikipedia.views.ViewUtil
 
diff --git a/app/src/main/java/org/wikipedia/talk/UserTalkPopupHelper.kt b/app/src/main/java/org/wikipedia/talk/UserTalkPopupHelper.kt
index a5d5320a0dd..8c27754fc13 100644
--- a/app/src/main/java/org/wikipedia/talk/UserTalkPopupHelper.kt
+++ b/app/src/main/java/org/wikipedia/talk/UserTalkPopupHelper.kt
@@ -72,7 +72,7 @@ object UserTalkPopupHelper {
             helper.show()
         } else {
             ExclusiveBottomSheetPresenter.show(activity.supportFragmentManager,
-                    LinkPreviewDialog.newInstance(HistoryEntry(title, historySource), null))
+                    LinkPreviewDialog.newInstance(HistoryEntry(title, historySource)))
         }
     }
 
diff --git a/app/src/main/java/org/wikipedia/theme/Theme.kt b/app/src/main/java/org/wikipedia/theme/Theme.kt
index 0f34135f303..8a863cd4c57 100644
--- a/app/src/main/java/org/wikipedia/theme/Theme.kt
+++ b/app/src/main/java/org/wikipedia/theme/Theme.kt
@@ -28,7 +28,7 @@ enum class Theme(val marshallingId: Int, val tag: String, @field:StyleRes @get:S
             get() = LIGHT
 
         fun ofMarshallingId(id: Int): Theme? {
-            return values().find { it.marshallingId == id }
+            return entries.find { it.marshallingId == id }
         }
     }
 }
diff --git a/app/src/main/java/org/wikipedia/util/GeoUtil.kt b/app/src/main/java/org/wikipedia/util/GeoUtil.kt
index fa8786de929..98a97a6a7aa 100644
--- a/app/src/main/java/org/wikipedia/util/GeoUtil.kt
+++ b/app/src/main/java/org/wikipedia/util/GeoUtil.kt
@@ -8,6 +8,8 @@ import android.net.Uri
 import org.wikipedia.R
 import org.wikipedia.feed.announcement.GeoIPCookieUnmarshaller
 import org.wikipedia.settings.Prefs
+import java.text.DecimalFormat
+import java.util.Locale
 
 object GeoUtil {
     @Suppress("UnsafeImplicitIntentLaunch")
@@ -37,4 +39,16 @@ object GeoUtil {
             // For our purposes, don't care about malformations in the GeoIP cookie for now.
             null
         }
+
+    fun getDistanceWithUnit(startLocation: Location, endLocation: Location, locale: Locale): String {
+        val countriesUsingMiles = listOf("US", "GB", "LR", "MM")
+        val milesInKilometers = 0.62137119
+        val distance = startLocation.distanceTo(endLocation) / 1000.0 // in Kilometers
+        val formatter = DecimalFormat("#.##")
+        return if (countriesUsingMiles.contains(locale.country)) {
+            "${formatter.format(distance * milesInKilometers)} mi"
+        } else {
+            "${formatter.format(distance)} km"
+        }
+    }
 }
diff --git a/app/src/main/java/org/wikipedia/util/StringUtil.kt b/app/src/main/java/org/wikipedia/util/StringUtil.kt
index 078c8f7ca64..56ec753d5d6 100644
--- a/app/src/main/java/org/wikipedia/util/StringUtil.kt
+++ b/app/src/main/java/org/wikipedia/util/StringUtil.kt
@@ -30,7 +30,7 @@ import kotlin.math.roundToInt
 
 object StringUtil {
     private const val CSV_DELIMITER = ","
-    private val HIGHLIGHT_REGEX_OPTIONS = EnumSet.of(RegexOption.LITERAL, RegexOption.IGNORE_CASE)
+    val SEARCH_REGEX_OPTIONS: Set<RegexOption> = EnumSet.of(RegexOption.LITERAL, RegexOption.IGNORE_CASE)
 
     fun listToCsv(list: List<String?>): String {
         return list.joinToString(CSV_DELIMITER)
@@ -67,22 +67,15 @@ object StringUtil {
     }
 
     fun dbNameToLangCode(wikiDbName: String): String {
-        return (if (wikiDbName.endsWith("wiki")) wikiDbName.substring(0, wikiDbName.length - "wiki".length) else wikiDbName)
-                .replace("_", "-")
+        return wikiDbName.substringBefore("wiki").replace("_", "-")
     }
 
     fun removeSectionAnchor(text: String?): String {
-        text.orEmpty().let {
-            return if (it.contains("#")) it.substring(0, it.indexOf("#")) else it
-        }
+        return text.orEmpty().substringBefore('#')
     }
 
     fun removeNamespace(text: String): String {
-        return if (text.length > text.indexOf(":")) {
-            text.substring(text.indexOf(":") + 1)
-        } else {
-            text
-        }
+        return text.substringAfter(':')
     }
 
     fun removeHTMLTags(text: String?): String {
@@ -148,7 +141,7 @@ object StringUtil {
         textView.text = if (query.isNullOrEmpty()) parentText else buildSpannedString {
             append(parentText)
 
-            query.toRegex(HIGHLIGHT_REGEX_OPTIONS).findAll(parentText)
+            query.toRegex(SEARCH_REGEX_OPTIONS).findAll(parentText)
                 .forEach {
                     val range = it.range
                     val (start, end) = range.first to range.last + 1
diff --git a/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.kt b/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.kt
index 984d8a8fefe..2e5bf71b002 100644
--- a/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.kt
+++ b/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.kt
@@ -19,7 +19,6 @@ import com.bumptech.glide.request.target.Target
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.CenterCropWithFaceTransformation
 import org.wikipedia.util.WhiteBackgroundTransformation
-import java.util.*
 
 class FaceAndColorDetectImageView : AppCompatImageView {
 
@@ -34,8 +33,8 @@ class FaceAndColorDetectImageView : AppCompatImageView {
 
     private fun shouldDetectFace(uri: Uri): Boolean {
         // TODO: not perfect; should ideally detect based on MIME type.
-        val path = uri.path.orEmpty().lowercase(Locale.ROOT)
-        return path.endsWith(".jpg") || path.endsWith(".jpeg")
+        val path = uri.path.orEmpty()
+        return path.endsWith(".jpg", true) || path.endsWith(".jpeg", true)
     }
 
     fun loadImage(uri: Uri?, roundedCorners: Boolean = false, cropped: Boolean = true, emptyPlaceholder: Boolean = false, listener: OnImageLoadListener? = null) {
diff --git a/app/src/main/java/org/wikipedia/views/UserMentionEditText.kt b/app/src/main/java/org/wikipedia/views/UserMentionEditText.kt
index 1045eb808f9..c9ac9e29702 100644
--- a/app/src/main/java/org/wikipedia/views/UserMentionEditText.kt
+++ b/app/src/main/java/org/wikipedia/views/UserMentionEditText.kt
@@ -1,9 +1,9 @@
 package org.wikipedia.views
 
 import android.content.Context
-import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.util.AttributeSet
+import androidx.core.text.buildSpannedString
 import androidx.core.widget.doOnTextChanged
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.edit.SyntaxHighlightableEditText
@@ -113,13 +113,14 @@ class UserMentionEditText : SyntaxHighlightableEditText {
     }
 
     fun prepopulateUserName(userName: String, wikiSite: WikiSite) {
-        val sb = SpannableStringBuilder()
-        sb.append(composeUserNameLink(userName, wikiSite))
-        sb.append(" ")
         isUserNameCommitting = true
-        text = sb
+        val spannedString = buildSpannedString {
+            append(composeUserNameLink(userName, wikiSite))
+            append(" ")
+        }
+        setText(spannedString)
         isUserNameCommitting = false
-        setSelection(sb.length)
+        setSelection(spannedString.length)
     }
 
     fun onCommitUserName(userName: String, wikiSite: WikiSite) {
@@ -130,16 +131,18 @@ class UserMentionEditText : SyntaxHighlightableEditText {
                 return
             }
 
-            val sb = SpannableStringBuilder()
-            sb.append(text.subSequence(0, userNameStartPos))
-            sb.append(composeUserNameLink(userName, wikiSite))
-            val spanEnd = sb.length
-            if (userNameEndPos < text.length) {
-                sb.append(text.subSequence(userNameEndPos, text.length - 1))
+            val initialString = text.subSequence(0, userNameStartPos)
+            val userNameString = composeUserNameLink(userName, wikiSite)
+            val spannedString = buildSpannedString {
+                append(initialString)
+                append(userNameString)
+                if (userNameEndPos < text.length) {
+                    append(text.subSequence(userNameEndPos, text.length - 1))
+                }
             }
 
-            text = sb
-            setSelection(spanEnd)
+            setText(spannedString)
+            setSelection((initialString.toString() + userNameString).length)
             onCancelUserNameEntry()
         } finally {
             isUserNameCommitting = false
diff --git a/app/src/main/java/org/wikipedia/views/UserMentionInputView.kt b/app/src/main/java/org/wikipedia/views/UserMentionInputView.kt
index a0d39060289..018218d108b 100644
--- a/app/src/main/java/org/wikipedia/views/UserMentionInputView.kt
+++ b/app/src/main/java/org/wikipedia/views/UserMentionInputView.kt
@@ -83,10 +83,10 @@ class UserMentionInputView : LinearLayout, UserMentionEditText.Listener {
     }
 
     fun maybePrepopulateUserName(currentUserName: String, currentPageTitle: PageTitle) {
-        if (binding.inputEditText.text.isNullOrEmpty() && userNameHints.isNotEmpty()) {
+        if (binding.inputEditText.text.isEmpty() && userNameHints.isNotEmpty()) {
             val candidateName = userNameHints.first()
             if (candidateName != currentUserName &&
-                    StringUtil.addUnderscores(candidateName.lowercase()) != StringUtil.addUnderscores(currentPageTitle.text.lowercase())) {
+                    !StringUtil.addUnderscores(candidateName).equals(StringUtil.addUnderscores(currentPageTitle.text), true)) {
                 binding.inputEditText.prepopulateUserName(candidateName, wikiSite)
             }
         }
diff --git a/app/src/main/java/org/wikipedia/watchlist/WatchlistFilterTypes.kt b/app/src/main/java/org/wikipedia/watchlist/WatchlistFilterTypes.kt
index 8632639a51b..94308d00a7d 100644
--- a/app/src/main/java/org/wikipedia/watchlist/WatchlistFilterTypes.kt
+++ b/app/src/main/java/org/wikipedia/watchlist/WatchlistFilterTypes.kt
@@ -3,7 +3,6 @@ package org.wikipedia.watchlist
 import androidx.annotation.StringRes
 import org.wikipedia.R
 import org.wikipedia.model.EnumCode
-import org.wikipedia.model.EnumCodeMap
 
 @Suppress("unused")
 enum class WatchlistFilterTypes constructor(val id: String,
@@ -99,14 +98,8 @@ enum class WatchlistFilterTypes constructor(val id: String,
         val DEFAULT_FILTER_OTHERS = setOf(ALL_EDITS, ALL_CHANGES, LATEST_REVISION, ALL_EDITORS, ALL_USERS)
         val DEFAULT_FILTER_TYPE_SET = DEFAULT_FILTER_OTHERS + DEFAULT_FILTER_TYPE_OF_CHANGES
 
-        private val MAP = EnumCodeMap(WatchlistFilterTypes::class.java)
-
-        private fun findOrNull(id: String): WatchlistFilterTypes? {
-            return MAP.valueIterator().asSequence().firstOrNull { id == it.id || id.startsWith(it.id) }
-        }
-
         fun find(id: String): WatchlistFilterTypes {
-            return findOrNull(id) ?: MAP[0]
+            return entries.find { id == it.id || id.startsWith(it.id) } ?: entries[0]
         }
 
         fun findGroup(id: String): List<WatchlistFilterTypes> {
diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.kt b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.kt
index da3d9dce404..8e10f74b880 100644
--- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.kt
+++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.kt
@@ -140,7 +140,7 @@ class WiktionaryDialog : ExtendedBottomSheetDialogFragment() {
     }
 
     private fun getTermFromWikiLink(url: String): String {
-        return removeLinkFragment(url.substring(url.lastIndexOf("/") + 1))
+        return removeLinkFragment(url.substringAfterLast('/'))
     }
 
     private fun removeLinkFragment(url: String): String {
diff --git a/app/src/main/res/drawable/location_gradient.xml b/app/src/main/res/drawable/location_gradient.xml
new file mode 100644
index 00000000000..bbd3e43e204
--- /dev/null
+++ b/app/src/main/res/drawable/location_gradient.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C8.13,2 5,5.13 5,9C5,14.25 12,22 12,22C12,22 19,14.25 19,9C19,5.13 15.87,2 12,2ZM12,11.5C10.62,11.5 9.5,10.38 9.5,9C9.5,7.62 10.62,6.5 12,6.5C13.38,6.5 14.5,7.62 14.5,9C14.5,10.38 13.38,11.5 12,11.5Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="15.646"
+          android:startY="22"
+          android:endX="15.646"
+          android:endY="2"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF14866D"/>
+        <item android:offset="1" android:color="#FF3366CC"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml
index a1304ee6ebf..e0ae9dc8c9f 100755
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ b/app/src/main/res/layout/dialog_link_preview.xml
@@ -35,26 +35,46 @@
                     android:layout_height="@dimen/defaultListItemSize"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp"
+                    android:layout_marginVertical="16dp"
                     android:contentDescription="@null"
                     android:visibility="gone" />
 
-                <TextView
-                    android:id="@+id/link_preview_title"
+                <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="16dp"
+                    android:layout_marginVertical="16dp"
                     android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:fontFamily="serif"
-                    android:lineSpacingMultiplier="0.9"
-                    android:maxLines="3"
-                    android:paddingBottom="4dp"
-                    android:textColor="?attr/primary_color"
-                    android:textSize="20sp"
-                    tools:text="Lorem ipsum" />
+                    android:orientation="vertical"
+                    android:paddingBottom="4dp">
+
+                    <TextView
+                        android:id="@+id/link_preview_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:fontFamily="serif"
+                        android:lineSpacingMultiplier="0.9"
+                        android:maxLines="3"
+                        android:textColor="?attr/primary_color"
+                        android:textSize="20sp"
+                        tools:text="Lorem ipsum" />
+
+                    <TextView
+                        style="@style/H4"
+                        android:id="@+id/link_preview_distance"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:textColor="?attr/success_color"
+                        android:layout_marginTop="6dp"
+                        android:layout_marginStart="-4dp"
+                        android:visibility="gone"
+                        android:gravity="center_vertical"
+                        app:drawableStartCompat="@drawable/location_gradient"
+                        tools:text="Lorem ipsum" />
+
+                </LinearLayout>
 
                 <ImageView
                     android:id="@+id/link_preview_overflow_button"
@@ -120,4 +140,11 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
 
+    <View
+        android:layout_width="32dp"
+        android:layout_height="4dp"
+        android:layout_marginVertical="8dp"
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/rounded_2dp_fill"/>
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_link_preview_overlay.xml b/app/src/main/res/layout/view_link_preview_overlay.xml
index abe7f42c466..face4cb6073 100644
--- a/app/src/main/res/layout/view_link_preview_overlay.xml
+++ b/app/src/main/res/layout/view_link_preview_overlay.xml
@@ -17,14 +17,14 @@
 
         <Button
             android:id="@+id/link_preview_tertiary_button"
-            style="@style/App.Button.Text.Secondary"
+            style="@style/App.Button.Text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:paddingStart="8dp"
             android:paddingEnd="8dp"
-            android:text="@string/button_get_directions" />
+            android:text="@string/action_item_view_on_map" />
 
         <Button
             android:id="@+id/link_preview_secondary_button"
diff --git a/app/src/main/res/menu/menu_link_preview.xml b/app/src/main/res/menu/menu_link_preview.xml
index a44abb03886..095cd8287fc 100644
--- a/app/src/main/res/menu/menu_link_preview.xml
+++ b/app/src/main/res/menu/menu_link_preview.xml
@@ -7,7 +7,19 @@
     <item android:id="@+id/menu_link_preview_share_page"
         android:title="@string/menu_page_share"
         />
+    <item android:id="@+id/menu_link_preview_watch"
+        android:title="@string/menu_page_watch"
+        />
+    <item android:id="@+id/menu_link_preview_open_in_new_tab"
+        android:title="@string/menu_long_press_open_in_new_tab"
+        />
     <item android:id="@+id/menu_link_preview_copy_link"
         android:title="@string/menu_long_press_copy_page"
         />
+    <item android:id="@+id/menu_link_preview_view_on_map"
+        android:title="@string/action_item_view_on_map"
+        />
+    <item android:id="@+id/menu_link_preview_get_directions"
+        android:title="@string/button_get_directions"
+        />
 </menu>
diff --git a/app/src/main/res/values-bew/strings.xml b/app/src/main/res/values-bew/strings.xml
index 99f47848ce9..40c37269a99 100644
--- a/app/src/main/res/values-bew/strings.xml
+++ b/app/src/main/res/values-bew/strings.xml
@@ -104,13 +104,13 @@
   <string name="edit_history_link_text">Deleng riwayat permakan</string>
   <string name="map_view_link_text">Deleng di peta</string>
   <string name="other_languages_indication_text">Baca dalem basa laèn</string>
-  <string name="language_count_link_text">Kesedia di %d basa laèn</string>
+  <string name="language_count_link_text">Derak di %d basa laèn</string>
   <string name="edit_save_action_license_logged_in">Dengen nerebitin, lu akur ama &lt;a href=\"%1$s\"&gt;Ketentuan Pemakéan&lt;/a&gt;, èn lu tetep akur bakal ngelansir lu punya sumbangsih di bawah ongji &lt;a href=\"%2$s\"&gt;CC BY-SA 4.0&lt;/a&gt;.</string>
   <string name="edit_save_action_license_anon">Dengen nerebitin, lu akur ama &lt;a href=\"%1$s\"&gt;Ketentuan Pemakéan&lt;/a&gt;, èn lu tetep akur bakal ngelansir lu punya sumbangsih di bawah ongji &lt;a href=\"%2$s\"&gt;CC BY-SA 4.0&lt;/a&gt;. Permakan bakal dinisbatin ke aderès IP lu punya peralatan. Kalo lu &lt;a href=\"https://#login\"&gt;masup&lt;/a&gt;, lu bakal ada punya keresiaan dèwèk nyang lebi.</string>
   <string name="edit_anon_warning">Permakan bakal dinisbatin ke aderès IP lu punya peralatan. Kalo lu &lt;a href=\"https://#login\"&gt;masup&lt;/a&gt;, lu bakal ada punya keresiaan lebi.</string>
   <string name="preference_title_language">Basa Wikipédi</string>
   <string name="langlinks_filter_hint">Cari</string>
-  <string name="langlinks_empty">Ni halaman kaga\' kesedia dalem laèn-laèn basa.</string>
+  <string name="langlinks_empty">Ni halaman kaga\' derak dalem laèn-laèn basa.</string>
   <string name="langlinks_no_match">Basa kaga\' ketemu</string>
   <string name="langlinks_activity_title">Laèn-laèn basa</string>
   <string name="langlinks_your_wikipedia_languages">Basa lu punya Wikipédi</string>
@@ -182,12 +182,12 @@
   <string name="create_account_generic_error">Kaga\' bisa ngeja rèkening</string>
   <string name="create_account_next">Terus</string>
   <string name="email_recommendation_dialog_title">Keja rèkening sonder aderès surlès?</string>
-  <string name="email_recommendation_dialog_message">Bagèn aderès surlès sipatnya sunah, palingan &lt;b&gt;sunah muakadah&lt;/b&gt; dah tu, sebab surlès dibutuhin pas mulihin rèkening kalo-kalo lu ilang kata sandinya.</string>
+  <string name="email_recommendation_dialog_message">Bagèn aderès surlès sipatnya sunah, palingan &lt;b&gt;sunah muakadah&lt;/b&gt; dah tu, sebab surlès dibutuhin pas mulihin rèkening bok-bok lu ilang kata sandinya.</string>
   <string name="email_recommendation_message">Disaranin sebab surlès dibutuhin bakal mulihin rèkening.</string>
   <string name="email_recommendation_dialog_create_without_email_action">Terusin sonder surlès</string>
   <string name="email_recommendation_dialog_create_with_email_action">Tambahin aderès surlès</string>
   <string name="create_account_button">Keja rèkening</string>
-  <string name="create_account_name_unavailable">Nama pemaké \"%s\" kaga\' kesedia. Padol dah, pilih nama nyang bèda.</string>
+  <string name="create_account_name_unavailable">Nama pemaké \"%s\" kaga\' derak. Padol dah, pilih nama nyang bèda.</string>
   <string name="create_account_ip_block_message">Maap, lu punya aderès IP sekarang ni lagi diblokir deri pengejaan rèkening baru.</string>
   <string name="create_account_ip_block_help_url">https://en.wikipedia.org/wiki/Help:I_have_been_blocked</string>
   <string name="create_account_ip_block_details">Tètèk bengèk</string>
@@ -238,7 +238,7 @@
   <string name="about_translators_heading">Penerjemah</string>
   <string name="about_translators_translatewiki">Ni aplikasi udah diterjemahin ama penerjemah sukarèla di &lt;a href=\"https://translatewiki.net\"&gt;translatewiki.net&lt;/a&gt;.</string>
   <string name="about_app_license_heading">Ongji</string>
-  <string name="about_app_license">Kode sumber kesedia di &lt;a href=\"https://gerrit.wikimedia.org/r/#/admin/projects/apps/android/wikipedia\"&gt;Gerrit&lt;/a&gt; èn &lt;a href=\"https://github.com/wikimedia/apps-android-wikipedia\"&gt;GitHub&lt;/a&gt; di bawah &lt;a href=\"https://www.apache.org/licenses/LICENSE-2.0\"&gt;Ongji Apache 2.0&lt;/a&gt;. Kecuali ada ketentuan tambahan nyang belakon, isi kesedia di bawahnya &lt;a href=\"\"https://creativecommons.org/licenses/by-sa/4.0\"&gt;Ongji Nisbat-DumanSetumbras Creative Commons&lt;/a&gt;.</string>
+  <string name="about_app_license">Kode sumber derak di &lt;a href=\"https://gerrit.wikimedia.org/r/#/admin/projects/apps/android/wikipedia\"&gt;Gerrit&lt;/a&gt; èn &lt;a href=\"https://github.com/wikimedia/apps-android-wikipedia\"&gt;GitHub&lt;/a&gt; di bawah &lt;a href=\"https://www.apache.org/licenses/LICENSE-2.0\"&gt;Ongji Apache 2.0&lt;/a&gt;. Kecuali ada ketentuan tambahan nyang belakon, isi derak di bawahnya &lt;a href=\"\"https://creativecommons.org/licenses/by-sa/4.0\"&gt;Ongji Nisbat-DumanSetumbras Creative Commons&lt;/a&gt;.</string>
   <string name="about_wmf">Produk deri &lt;a href=\"https://wikimediafoundation.org/\"&gt;Yayasan Wikimédia&lt;/a&gt;</string>
   <string name="about_activity_title">Pasal</string>
   <string name="edit_abandon_confirm">Ni halaman udah didandanin. Apa lu yakin pèngèn kuar sonder nyimpen lu punya perobahan?</string>
@@ -303,13 +303,13 @@
   <string name="widget_title_featured_page">Ni ari punya isi pilihan:</string>
   <string name="widget_name_search">Penyarian Wikipédi</string>
   <string name="wiktionary_no_definitions_found">Ta\'rip kaga\' ketemu.</string>
-  <string name="alpha_update_notification_title">Pembaruan alpa baru kesedia</string>
+  <string name="alpha_update_notification_title">Pembaruan tembèlan baru derak</string>
   <string name="alpha_update_notification_text">Teken bakal nyomot</string>
   <string name="dialog_close_description">Tutup</string>
   <string name="preference_title_show_images">Kasi unjuk gambar</string>
   <string name="preference_summary_show_images">Nyalain atawa matiin munggah gambar di halaman. Ilangin contrèng ni penyetèlan kalo lu punya sambungan internèt langsam, atawa kalo lu punya pakèt data kewates.</string>
   <string name="preference_title_download_only_over_wifi">Comot cuman liwat Wi-Fi</string>
-  <string name="dialog_title_download_only_over_wifi">Konpirmir comot paké pakèt data?</string>
+  <string name="dialog_title_download_only_over_wifi">Tandesin comot paké pakèt data?</string>
   <string name="dialog_text_download_only_over_wifi">Lu ada punya \"Comot cuman liwat Wi-Fi\" nyang dinyalain di penyetèlan. Apa lu pèngèn ngijinin lu punya pakèt data bakal ni comotan doang?</string>
   <string name="dialog_title_download_only_over_wifi_allow">Ijinin</string>
   <string name="read_more_section">Baca lebi lanjut</string>
@@ -332,7 +332,7 @@
   <string name="captcha_image">Gambar Captcha</string>
   <string name="gallery_fair_use_license">Pemakéan wajar</string>
   <string name="gallery_uploader_unknown">Pengangkat kaga\' ditauin</string>
-  <string name="gallery_not_available_offline_snackbar">Tampang galeré kaga\' kesedia di luar-jala.</string>
+  <string name="gallery_not_available_offline_snackbar">Tampang galeré kaga\' derak di luar-jala.</string>
   <string name="gallery_not_available_offline_snackbar_dismiss">Tutup</string>
   <string name="menu_new_tab">Lembaran baru</string>
   <string name="menu_close_all_tabs">Tutup semua lembaran</string>
@@ -372,7 +372,7 @@
   <string name="preference_title_collapse_tables">Gulung jadwal</string>
   <string name="preference_summary_collapse_tables">Otomatis gulung jadwal di makalah, kaya\' kotak inpo, ruju\'an, èn catetan.</string>
   <string name="nav_item_donate">Nyumbang</string>
-  <string name="error_voice_search_not_available">Maap, pengenalan suara kaga\' kesedia.</string>
+  <string name="error_voice_search_not_available">Maap, pengenalan suara kaga\' derak.</string>
   <string name="location_service_disabled">Ladènan lokasi dimatiin.</string>
   <string name="enable_location_service">Nyalain</string>
   <string name="location_permissions_enable_prompt">Nyalain ijin lokasi bakal ngiat tempat di sekuliling lu.</string>
@@ -393,9 +393,9 @@
   <string name="reference_list_title">Ruju\'an</string>
   <string name="theme_chooser_dialog_image_dimming_switch_label">Pengremengan gambar (di tèma Kereng)</string>
   <string name="preference_title_prefer_offline_content">Utamain isi luar-jaringan dulu</string>
-  <string name="preference_summary_prefer_offline_content">Iritin pemakéan data dengen munggah makalah nyang kesedia di luar-jala deripada munggah pèrsi mutahir deri makalahnya melulu</string>
+  <string name="preference_summary_prefer_offline_content">Iritin pemakéan data dengen munggah makalah nyang derak di luar-jala ketimbang munggah pèrsi mutahir deri makalahnya melulu</string>
   <string name="theme_chooser_dialog_match_system_theme_switch_label">Cocokin ama tèma sistim</string>
-  <string name="page_footer_license_text">Isi kesedia di bawah $1, kecuali ada catetan tambahan</string>
+  <string name="page_footer_license_text">Isi derak di bawah $1, kecuali ada catetan tambahan</string>
   <string name="empty_tab_title">Lembaran baru</string>
   <string name="menu_save_all_tabs">Simpen semua lembaran</string>
   <string name="error_blocked_title">Lu punya nama pemaké atawa aderès IP udah diblokir.</string>
@@ -461,12 +461,12 @@
     <item quantity="other">%1$d makalah, %2$.2f MB</item>
   </plurals>
   <plurals name="format_reading_list_statistical_detail_without_size">
-    <item quantity="one">%1$d deri 1 makalah kesedia di luar-jala</item>
-    <item quantity="other">%1$d deri %2$d makalah kesedia di luar-jala</item>
+    <item quantity="one">%1$d deri 1 makalah derak di luar-jala</item>
+    <item quantity="other">%1$d deri %2$d makalah derak di luar-jala</item>
   </plurals>
   <plurals name="format_reading_list_statistical_detail">
-    <item quantity="one">%1$d deri 1 makalah kesedia di luar-jala, %3$.2f MB</item>
-    <item quantity="other">%1$d deri %2$d makalah kesedia di luar-jala, %3$.2f MB</item>
+    <item quantity="one">%1$d deri 1 makalah derak di luar-jala, %3$.2f MB</item>
+    <item quantity="other">%1$d deri %2$d makalah derak di luar-jala, %3$.2f MB</item>
   </plurals>
   <string name="reading_list_sort">Sortir</string>
   <string name="reading_list_sort_ellipsis">Sortir berales...</string>
@@ -517,8 +517,8 @@
   <string name="saved_list_empty_title">Belon ada halaman kesimpen</string>
   <string name="reading_lists_empty_message">Tambahin makalah ke daptar bacaan bakal entarannya, hata lu lagi di luar-jala.</string>
   <string name="reading_list_empty">Lu kaga\' punya makalah nyang ditambahin ke ni daptar.</string>
-  <string name="reading_list_article_offline">Kesedia di luar-jala</string>
-  <string name="reading_list_article_make_offline">Keja ni makalah kesedia di luar-jala</string>
+  <string name="reading_list_article_offline">Derak di luar-jala</string>
+  <string name="reading_list_article_make_offline">Keja ni makalah derak di luar-jala</string>
   <string name="reading_list_add_to_other_list">Tambahin daptar bacaan laènnya</string>
   <string name="reading_list_move_to_other_list">Pindahin ke daptar bacaan laènnya</string>
   <string name="reading_list_move_from_to_other_list">Pindahin deri %s ke daptar bacaan laènnya</string>
@@ -527,7 +527,7 @@
   <string name="reading_list_select_item">Pilih</string>
   <string name="reading_list_confirm_remove_article_from_offline">Buang deri luar-jala</string>
   <string name="reading_list_confirm_remove_article_from_offline_title">Makalah nongol di beberapa daptar</string>
-  <string name="reading_list_confirm_remove_article_from_offline_message">%s kaga\' bakal lagi kesedia di luar-jala bakal semua daptar bacaan:</string>
+  <string name="reading_list_confirm_remove_article_from_offline_message">%s kaga\' bakal lagi derak di luar-jala bakal semua daptar bacaan:</string>
   <string name="reading_lists_sync_reminder_title">Nyalain penjuntrungan daptar bacaan?</string>
   <string name="reading_lists_sync_reminder_text">Makalah nyang disimpen di daptar bacaan sekarang bisa dijuntrungin ke lu punya rèkening Wikipédi. &lt;a href=\"https://www.mediawiki.org/wiki/Wikimedia_Apps/Android_FAQ#Synced_reading_lists\"&gt;Belajarin lebi lanjut&lt;/a&gt;</string>
   <string name="reading_lists_login_reminder_text_with_link">Daptar bacaan sekarang bisa dijuntrungin di mana-mana peralatan. Masup ke lu punya rèkening Wikipédi èn ijinin lu punya daptar disimpen. &lt;a href=\"https://www.mediawiki.org/wiki/Wikimedia_Apps/Android_FAQ#Synced_reading_lists\"&gt;Belajarin lebi lanjut&lt;/a&gt;</string>
@@ -538,7 +538,7 @@
   <string name="reading_lists_ignore_button">Entar dulu</string>
   <string name="reading_lists_confirm_remote_delete_yes">Ya</string>
   <string name="reading_lists_confirm_remote_delete_no">Kaga\'</string>
-  <string name="reading_list_article_save_in_progress">Makalah lagi dicomot, èn bakalan kesedia di luar-jala pas udah rampung.</string>
+  <string name="reading_list_article_save_in_progress">Makalah lagi dicomot, èn bakalan derak di luar-jala pas udah rampung.</string>
   <string name="reading_list_articles_added_to_named">Nambahin %1$d makalah ke %2$s</string>
   <string name="reading_list_articles_moved_to_named">Mindahin %1$d makalah ke %2$s</string>
   <string name="reading_list_delete_confirm">Apa lu yakin pèngèn ngapus %s?</string>
@@ -575,12 +575,12 @@
   <string name="reading_lists_refresh_sync_option">Segerin penjuntrungan</string>
   <string name="reading_list_preference_login_or_signup_to_enable_sync_dialog_login">Masup / daptar</string>
   <plurals name="reading_list_article_offline_message">
-    <item quantity="one">Ni makalah sekarang bakal kesedia di luar-jala.</item>
-    <item quantity="other">Ni makalah sekarang pada bakal kesedia di luar-jala.</item>
+    <item quantity="one">Ni makalah sekarang bakal derak di luar-jala.</item>
+    <item quantity="other">Ni makalah sekarang pada bakal derak di luar-jala.</item>
   </plurals>
   <plurals name="reading_list_article_not_offline_message">
-    <item quantity="one">Ni makalah sekarang kaga\' bakal lagi kesedia di luar-jala.</item>
-    <item quantity="other">Ni makalah sekarang pada kaga\' bakal lagi kesedia di luar-jala.</item>
+    <item quantity="one">Ni makalah sekarang kaga\' bakal lagi derak di luar-jala.</item>
+    <item quantity="other">Ni makalah sekarang pada kaga\' bakal lagi derak di luar-jala.</item>
   </plurals>
   <string name="reading_list_toast_last_sync">Daptar bacaan kejuntrung</string>
   <string name="reading_list_menu_last_sync">Penjuntrungan paling akir: %s</string>
@@ -673,9 +673,9 @@
   <string name="notifications_mark_unread">Tengerin belon dibaca</string>
   <string name="notifications_mark_all_as_read">Tengerin semua udah dibaca</string>
   <string name="notifications_direct_reply_action">Bales</string>
-  <string name="notifications_direct_reply_progress">Mublisir balesan ke %s...</string>
-  <string name="notifications_direct_reply_success">Jawaban dipublisir.</string>
-  <string name="notifications_direct_reply_error">Kaga\' bisa mublisir otomatis.</string>
+  <string name="notifications_direct_reply_progress">Nyeplokin balesan ke %s...</string>
+  <string name="notifications_direct_reply_success">Jawaban diceplokin.</string>
+  <string name="notifications_direct_reply_error">Kaga\' bisa nyeplokin balesan sendèwèk.</string>
   <string name="notifications_mark_all_as_read_message">%d ditengerin udah dibaca.</string>
   <string name="notifications_mark_all_as_unread_message">%d ditengerin belon dibaca.</string>
   <plurals name="notifications_mark_as_read_plural">
@@ -742,7 +742,7 @@
   <string name="notifications_all_wikis_text">Semua \"wiki\"</string>
   <string name="notifications_all_types_text">Semua \"jenis\"</string>
   <string name="notifications_menu_user_talk_page">%s punya halaman obrolan</string>
-  <string name="notifications_offline_disable_message">Pungsi kaga\' kesedia pas di luar-jala.</string>
+  <string name="notifications_offline_disable_message">Pungsi kaga\' derak pas di luar-jala.</string>
   <string name="view_because_you_read_card_title">Sebab lu baca</string>
   <string name="view_random_card_title">Penyembarang</string>
   <string name="view_random_article_card_title">Makalah sembarang</string>
@@ -780,7 +780,7 @@
   <string name="feed_configure_menu_reset">Pulihin tampang bawaan</string>
   <string name="feed_configure_menu_select_all">Kasi unjuk semua</string>
   <string name="feed_configure_menu_deselect_all">Umpetin semua</string>
-  <string name="feed_configure_language_warning">Èling baè\'-baè\' kaga\' semua jenis kartu kesedia di semua basa Wikipédi. Permak basa lu punya pilih di Penyetèlan.</string>
+  <string name="feed_configure_language_warning">Èling baè\'-baè\' kaga\' semua jenis kartu derak di semua basa Wikipédi. Permak basa lu punya pilih di Penyetèlan.</string>
   <string name="feed_item_type_news">Makalah pasal peristiwa sekarang ni</string>
   <string name="feed_item_type_on_this_day">Peristiwa dalem sejarah di ni ari</string>
   <string name="feed_item_type_because_you_read">Saran berales makalah nyang baru-baru ni dibaca deri lu punya riwayat</string>
@@ -890,7 +890,7 @@
   <string name="suggested_edits_task_translate_caption_title">Terjemahin keterangan gambar</string>
   <string name="suggested_edits_task_translate_caption_description">Terjemahin keterangan ke laèn-laèn basa</string>
   <string name="suggested_edits_task_multilingual_title">Tugas laènnya bakal pemermak anèkabasa</string>
-  <string name="suggested_edits_task_multilingual_description">Tugas terjemahan kesedia kalo lu baca èn nulis di lebi deri atu basa Wikipédi.</string>
+  <string name="suggested_edits_task_multilingual_description">Tugas terjemahan derak kalo lu baca èn nulis di lebi deri atu basa Wikipédi.</string>
   <string name="suggested_edits_task_image_caption_edit_disable_text">Kekonci ampé lu mermak %d keterangan gambar</string>
   <string name="suggested_edits_task_translate_description_edit_disable_text">Kekonci ampé lu mermak %d jabaran makalah (ditahkik)</string>
   <string name="suggested_edits_task_multilingual_negative">Bukan bakal gua</string>
@@ -1213,7 +1213,7 @@
   <string name="talk_title">Obrolan</string>
   <string name="talk_user_title">Obrolan: %s</string>
   <string name="talk_new_topic">Topik baru</string>
-  <string name="talk_new_topic_submitted">Topik dipublisir.</string>
+  <string name="talk_new_topic_submitted">Topik diceplokin.</string>
   <string name="talk_warn">Wanti-wanti</string>
   <string name="talk_warn_save_dialog_title">Simpen perobahan?</string>
   <string name="talk_warn_save_dialog_message">Simpen jadi pesen baru</string>
@@ -1236,14 +1236,14 @@
   <string name="talk_message_hint">Susun pesen</string>
   <string name="talk_message_empty">Pesen kaga\' bolé kosong.</string>
   <string name="talk_subject_empty">Perihal kaga\' bolé kosong.</string>
-  <string name="talk_response_submitted">Jawaban dipublisir.</string>
+  <string name="talk_response_submitted">Jawaban diceplokin.</string>
   <string name="talk_snackbar_undo">Balikin</string>
   <string name="talk_last_modified">&lt;b&gt;Paling akir dipermak %1$s&lt;/b&gt; ama %2$s</string>
   <string name="talk_snackbar_survey_text">Makasi ya udah maké halaman obrolan. Apa lu bisa bantu kita nyempurnain ni aplikasi dengen ikutan angkèt?</string>
   <string name="talk_snackbar_survey_action_text">Mulain</string>
   <string name="talk_share_discussion_subject">Wikipédi - perhadring di halaman obrolan pasal \"%s\"</string>
   <string name="talk_share_talk_page">Wikipédi - perhadring di halaman obrolan</string>
-  <string name="talk_edit_disclaimer">Ni – halaman obrongan. Tulung hormatin pedoman halaman obrolan, èn jangan ampé lali nèken lu punya publisiran dengen ngetik empat tenger gelombang: ~~~~ pas mublisir paké wikitext.&lt;br&gt;&lt;br&gt;&lt;a href=\"https://en.wikipedia.org/wiki/Wikipedia:Talk_page_guidelines\"&gt;Wikipédi:Pedoman halaman obrolan&lt;/a&gt;</string>
+  <string name="talk_edit_disclaimer">Ni – halaman obrongan. Tulung hormatin pedoman halaman obrolan, èn jangan ampé lali nèken lu punya publisiran dengen ngetik empat tenger gelombang: ~~~~ pas nyeplokin paké wikitext.&lt;br&gt;&lt;br&gt;&lt;a href=\"https://en.wikipedia.org/wiki/Wikipedia:Talk_page_guidelines\"&gt;Wikipédi:Pedoman halaman obrolan&lt;/a&gt;</string>
   <string name="talk_search_hint">Cari pesen</string>
   <string name="talk_search_topics_hint">Cari topik</string>
   <string name="talk_search_find_in_talk_topics_hint">Temuin di topik halaman obrolan</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index da672ca5d27..aee281c5b01 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -984,7 +984,7 @@
   <string name="suggested_edits_contributions_stat_tooltip">El vostre nombre total de contribucions fins ara.</string>
   <string name="suggested_edits_edit_streak_stat_tooltip">Quants dies seguits hi heu fet contribucions. Si no hi heu contribuït de fa temps, mostra la data de la darrera contribució.</string>
   <string name="suggested_edits_page_views_stat_tooltip">Pàgines vistes totals dels elements en què heu contribuït durant els darrers 30 dies.</string>
-  <string name="suggested_edits_edit_quality_stat_tooltip">Basta en quantes vegades s\'han revertit les vostres contribucions (desfetes per un altre editor). Edicions revertides: %d.</string>
+  <string name="suggested_edits_edit_quality_stat_tooltip">Basat en quantes vegades s\'han revertit les vostres contribucions (desfetes per un altre editor). Edicions revertides: %d.</string>
   <string name="suggested_edits_paused_message">Les edicions suggerides s\'han posat en pausa fins al %1$s. Ho sentim %2$s, però s\'han revertit algunes de les vostres darreres contribucions.</string>
   <string name="suggested_edits_disabled_message">S\'han inhabilitat les edicions suggerides. Ho sentim %s, s\'han revertit massa contribucions recents.</string>
   <string name="suggested_edits_ip_blocked_message">Sembla que la vostra adreça IP (o rang d\'adreces IP) està blocada per a editar a la Viquipèdia.</string>
diff --git a/app/src/main/res/values-ha/strings.xml b/app/src/main/res/values-ha/strings.xml
index 0d912108677..ea36600a97d 100644
--- a/app/src/main/res/values-ha/strings.xml
+++ b/app/src/main/res/values-ha/strings.xml
@@ -1113,11 +1113,15 @@
   <string name="app_shortcuts_search">Nema</string>
   <string name="on_this_day_card_title">A wannan rana</string>
   <string name="more_events_text">Karin bayani akan wannan rana</string>
-  <string name="events_count_text" fuzzy="true">%1$s abubuwan da suka faru daga %2$s–%3$d</string>
+  <string name="events_count_text">%1$s abubuwan da suka faru daga %2$s–%3$d</string>
   <string name="this_year">Wannan shekara</string>
   <string name="on_this_day_dialog_next_month">Wata mai zuwa</string>
   <string name="on_this_day_dialog_previous_month">Watan da ya gabata</string>
   <string name="on_this_day_open_date_picker">Mai karɓar kwanan wata</string>
+  <plurals name="diff_years">
+    <item quantity="one">jiya</item>
+    <item quantity="other"> %d kwanaki da suka wuce</item>
+  </plurals>
   <string name="on_this_day_end_of_scroll_message">Kun yi tafiya cikin lokaci 🚀</string>
   <string name="on_this_day_back_to_future">Koma zuwa gaba</string>
   <string name="languages_list_activity_title">Ƙara harshe</string>
@@ -1187,9 +1191,268 @@
   <string name="insert_media_advanced_settings_image_position_left">Hagu</string>
   <string name="insert_media_advanced_settings_image_position_center">Tsakkiya</string>
   <string name="insert_media_advanced_settings_image_position_none">Babu</string>
+  <string name="insert_media_advanced_settings_image_type">Irin hota</string>
+  <string name="insert_media_advanced_settings_image_type_thumbnail">Hoton hannu</string>
+  <string name="insert_media_advanced_settings_image_type_frameless">Mara tsari</string>
+  <string name="insert_media_advanced_settings_image_type_frame">Frame</string>
+  <string name="insert_media_advanced_settings_image_type_basic">Na asali</string>
+  <string name="insert_media_advanced_settings_image_type_tip">Kuna iya saita yadda batun kafofin watsa labarai ya bayyana a shafin. Wannan ya kamata ya zama tsarin ƙwanƙwasa don ya dace da wasu shafuka a kusan dukkanin lokuta.</string>
+  <string name="insert_media_advanced_settings_image_size">Girman hoto</string>
+  <string name="insert_media_advanced_settings_image_size_default">Na Asali</string>
+  <string name="insert_media_advanced_settings_image_size_custom">Custom</string>
+  <string name="insert_media_advanced_settings_image_size_custom_width">faɗi</string>
+  <string name="insert_media_advanced_settings_image_size_custom_height">Tsawo</string>
+  <string name="insert_media_advanced_settings_image_size_custom_px">px</string>
+  <string name="insert_media_insert_button">Saka</string>
+  <string name="main_drawer_help">Taimako</string>
+  <string name="main_drawer_login">Shiga / shiga Wikipedia</string>
+  <string name="main_tooltip_text">Hi %s, shin kun san cewa kowa zai iya gyara Wikipedia?</string>
+  <string name="main_tooltip_text_v2">Shin kun san cewa kowa zai iya gyara Wikipedia?</string>
+  <string name="main_tooltip_action_button">Fara</string>
+  <string name="main_tooltip_watchlist_title">Jerina na bin sawu</string>
+  <string name="main_tooltip_watchlist_text">Neman labarai da shafuka da ka kara a baya a cikin jerin abubuwan kallo a cikin More menu a ƙarƙashin Watchlist.</string>
+  <string name="custom_date_picker_dialog_ok_button_text">Yayi</string>
+  <string name="text_input_dialog_ok_button_text">Yayi</string>
+  <string name="text_input_dialog_cancel_button_text">Soke</string>
+  <string name="custom_date_picker_dialog_cancel_button_text">Soke</string>
+  <string name="talk_title">Tattaunawa</string>
+  <string name="talk_user_title">Magana: %s</string>
+  <string name="talk_new_topic">Sabon batu</string>
+  <string name="talk_new_topic_submitted">Taken da aka wallafa.</string>
+  <string name="talk_warn">Gargadi</string>
+  <string name="talk_warn_save_dialog_title">Ajiye canje-canje?</string>
+  <string name="talk_warn_save_dialog_message">Ajiyewa a matsayin sabon saƙo</string>
+  <string name="talk_warn_save_dialog_existing_new_message">Ajiye a matsayin sabon saƙo ga jerin</string>
+  <string name="talk_warn_save_dialog_existing_update_message">Sabunta saƙon da ke akwai</string>
+  <string name="talk_warn_save_dialog_hint">Taken saƙo</string>
+  <string name="talk_warn_save_dialog_publish">Wallafa</string>
+  <string name="talk_warn_save_dialog_cancel">Yanke</string>
+  <string name="talk_warn_submitted">Sakon da aka buga ga shafin tattaunawa na mai amfani</string>
+  <string name="talk_warn_submitted_and_saved">Saƙon da aka adana kuma aka buga zuwa shafin tattaunawa na mai amfani</string>
+  <string name="talk_warn_saved_message">Zaɓi saƙon gargadi na yanzu ko rubuta sabon saƙo.</string>
+  <string name="talk_warn_saved_message_dropdown">Saƙonnin da aka adana</string>
+  <string name="talk_page_empty">Wannan shafin magana ba kome ba ne.</string>
+  <string name="talk_page_empty_title">Tattaunawar ta fara a nan</string>
+  <string name="talk_page_empty_content">Shafukan tattaunawa sune inda mutane ke tattauna yadda za a sanya abun cikin Wikipedia mafi kyau. Farawa ta hanyar ƙara sabon batun tattaunawa don haɗi da haɗin gwiwa tare da al\'ummar Wikipedians.</string>
+  <string name="talk_add_reply">Mai da</string>
+  <string name="talk_no_subject">(Ba batun ba)</string>
+  <string name="talk_reply_subject">Batu</string>
+  <string name="talk_reply_hint">Rubuta amsa</string>
+  <string name="talk_message_hint">Rubuta saƙo</string>
+  <string name="talk_message_empty">Ba za a iya yin saƙon komai ba.</string>
+  <string name="talk_subject_empty">Batun ba zai iya zama komai ba.</string>
+  <string name="talk_response_submitted">An mayar da martani.</string>
+  <string name="talk_snackbar_undo">Fasa</string>
+  <string name="talk_last_modified">&lt;b&gt;An shirya shi na ƙarshe %1$s&lt;/b&gt; da %2$s</string>
   <string name="talk_snackbar_survey_text">mun gode da amfani da shafikan magana. kuna iya taimakawa kara fadadawa domin yin bincike.</string>
   <string name="talk_snackbar_survey_action_text">fara yanzu</string>
+  <string name="talk_share_discussion_subject">Wikipedia - tattaunawa a kan batun shafin tattaunawa \"%s\"</string>
+  <string name="talk_share_talk_page">Wikipedia - tattaunawa a shafin tattaunawa</string>
+  <string name="talk_edit_disclaimer">Wannan shafin magana ne. Da fatan Allah ku girmama jagororin shafin magana, kuma ku tuna ku sanya hannu kan sakonni ta hanyar buga takardu huɗu: ~~~~ lokacin da aka aika ta amfani da wikitext. &lt;a href=\"https://en.wikipedia.org/wiki/Wikipedia:Talk_page_guidelines\"&gt;Wikipedia: Jagororin shafi na magana&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;</string>
+  <string name="talk_search_hint">Saƙonnin bincike</string>
+  <string name="talk_search_topics_hint">Bincika batutuwa</string>
+  <string name="talk_search_find_in_talk_topics_hint">Bincika a cikin batun tattaunawa</string>
+  <string name="talk_overflow_sort_by">An tsara shi ta Hanyar</string>
+  <string name="talk_overflow_sort_date_published">An wallafa kwanan wata</string>
+  <string name="talk_overflow_sort_date_updated">An wallafa kwanan wata</string>
+  <string name="talk_overflow_sort_topic_name">Sunan taken</string>
+  <string name="talk_new_topic_exit_dialog_title">Shin kun tabbata cewa kuna so ku fita?</string>
+  <string name="talk_new_topic_exit_dialog_message">Ba za a adana batun da abun ciki ba.</string>
+  <plurals name="talk_show_replies_count">
+    <item quantity="one">Nuna amsa</item>
+    <item quantity="other">Nuna amsa ( %d )</item>
+  </plurals>
+  <plurals name="talk_hide_replies_count">
+    <item quantity="one">Boye amsa</item>
+    <item quantity="other">Boye amsa (%d )</item>
+  </plurals>
+  <string name="talk_thread_subscribed_to">An sanya hannu a \"%s\"</string>
+  <string name="talk_thread_unsubscribed_from">Ba a sanya shi ba daga \"%s\"</string>
+  <string name="talk_list_item_overflow_subscribe">Yi rijista</string>
+  <string name="talk_list_item_overflow_subscribed">An yi rajista</string>
+  <string name="talk_list_item_overflow_mark_as_read">Yi alama a matsayin wanda ba a karanta ba</string>
+  <string name="talk_list_item_overflow_mark_as_unread">Yi alama a matsayin wanda ba a karanta ba</string>
+  <string name="talk_list_item_overflow_share">Raba</string>
+  <string name="talk_list_item_last_comment_date">Tattaunawar ƙarshe: %s</string>
+  <string name="talk_list_item_reply_icon_content_description">Cikakken amsoshi</string>
+  <string name="talk_list_item_user_icon_content_description">Alamar mai amfani</string>
+  <string name="talk_list_item_swipe_mark_as_read">Karanta</string>
+  <string name="talk_list_item_swipe_mark_as_unread">Ba a karanta ba</string>
+  <string name="talk_login_to_subscribe_dialog_title">Shiga don biyan kuɗi zuwa batutuwa</string>
+  <string name="talk_login_to_subscribe_dialog_content">Biyan kuɗi na jigogi zai ba ka damar karɓar sanarwa game da sabbin sharhi a cikin wannan batu. Da fatan za a ƙirƙiri asusun ko shiga cikin asusun Wikipedia don biyan kuɗi ga batun.</string>
+  <string name="talk_archived_title">Tarihin Magana: %s</string>
+  <string name="menu_option_share_talk_discussion">Raba tattaunawa</string>
+  <string name="menu_option_share_talk_page">Shafin tattaunawa na raba</string>
+  <string name="menu_option_share_edit">Raba gyare-gyare</string>
+  <string name="menu_option_user_contributions">%s\'s Gudunmuwoyi</string>
+  <string name="menu_option_edit_source">Gyara masomi</string>
+  <string name="menu_option_user_page">%s shafin mai amfani</string>
+  <string name="menu_option_find_in_talk_page_topic">Bincika a cikin batun tattaunawa</string>
+  <string name="menu_option_copy_link_to_clipboard">Haɗin kwafi zuwa katako</string>
+  <string name="talk_menu_copy_text">Kwafin rubutu</string>
+  <string name="talk_menu_expand_threads">Ka faɗaɗa zaren</string>
+  <string name="talk_menu_collapse_threads">Rushe zaren</string>
+  <string name="watchlist_details_watching_label">Kallo</string>
+  <string name="watchlist_details_watch_label">Bin sawu</string>
+  <string name="watchlist_details_next_edit">Gyara na gaba</string>
+  <string name="watchlist_details_prev_edit">Gyaran baya</string>
+  <string name="thank_label">Na gode</string>
+  <string name="view_user_page">Duba shafin ma\'aikaci</string>
+  <string name="thank_dialog_title_text">A aika \'Na gode\' a fili</string>
+  <string name="thank_dialog_text">\'Godiya\' hanya ce mai sauƙi don nuna godiya ga aikin edita a Wikipedia. \'Godiya\' ba za a iya cirewa ba kuma ana iya kallon su a fili</string>
+  <string name="thank_dialog_positive_button_text">Aika godiya</string>
+  <string name="thank_dialog_negative_button_text">Soke</string>
+  <string name="thank_success_message">An aika da \'Na gode\' zuwa %s 👍</string>
+  <string name="menu_option_view_user_profile">Duba shafin ma\'aikaci</string>
+  <string name="menu_option_view_user_talk">Duba shafin tattaunawa</string>
+  <string name="menu_option_view_user_contributions">Duba gudunmawar mai amfani</string>
+  <string name="revision_diff_compare">Kwatanta bita</string>
+  <string name="revision_diff_compare_title">Kwatanta bita: %s</string>
+  <string name="revision_diff_from">Daga:</string>
+  <string name="revision_diff_to">Zuwa:</string>
+  <string name="revision_diff_line_num">Layi %d</string>
+  <string name="revision_diff_line_nums">Lines %d-%d</string>
+  <string name="revision_diff_lines_from_to">Lines %1$d-%2$d</string>
+  <string name="revision_diff_line_added">Layin da aka kara</string>
+  <string name="revision_diff_line_removed">An cire layin</string>
+  <string name="revision_diff_paragraph_added">Sashin da aka kara</string>
+  <string name="revision_diff_paragraph_removed">An cire sakin layi</string>
+  <string name="revision_diff_protected">Canje-canjen da aka yi a cikin wannan bita ba za a iya samun su a fili ba.</string>
+  <string name="revision_undo_title">Shin kun tabbata kuna so ku warware wannan gyare-gyare?</string>
+  <string name="revision_undo_message">Undoing yana nufin mayar da tasirin gyare-gyare ɗaya ko fiye.</string>
+  <string name="revision_undo_summary_hint">Takaitaccen Bayani (zaɓi)</string>
+  <string name="revision_undo_reason">Raba dalilin da ya sa aka sake dawowa</string>
+  <string name="revision_undo_success">An soke sake fasalin.</string>
+  <string name="revision_rollback_dialog_title">Shin kun tabbata kuna so ku juya gyare-gyaren?</string>
+  <string name="revision_rollback_success">An sake gyarawa.</string>
+  <string name="revision_compare_button">Kwatanta</string>
+  <string name="revision_compare_two_only">Za\'a iya zaɓar sake dubawa guda biyu kawai.</string>
+  <string name="watchlist_page_add_to_watchlist_snackbar">%1$s da shafin magana an kara su a cikin jerin masu kallo %2$s.</string>
+  <string name="watchlist_page_add_to_watchlist_snackbar_action">Canja</string>
+  <string name="watchlist_page_add_to_watchlist_snackbar_period_permanently">dindindin</string>
+  <string name="watchlist_page_add_to_watchlist_snackbar_period_for_one_week">na mako 1</string>
+  <string name="watchlist_page_add_to_watchlist_snackbar_period_for_one_month">na wata 1</string>
+  <string name="watchlist_page_add_to_watchlist_snackbar_period_for_three_months">na watanni 3</string>
+  <string name="watchlist_page_add_to_watchlist_snackbar_period_for_six_months">na watanni 6</string>
+  <string name="watchlist_page_removed_from_watchlist_snackbar">An cire %s da shafin magana daga jerin masu kallo.</string>
+  <string name="watchlist_expiry_dialog_title">Zaɓin lokacin Watchlist</string>
+  <string name="watchlist_expiry_dialog_permanent">Dindindin</string>
+  <string name="watchlist_expiry_dialog_one_week">mako 1</string>
+  <string name="watchlist_expiry_dialog_one_month">Wata 1</string>
+  <string name="watchlist_expiry_dialog_three_months">Watanni 3</string>
+  <string name="watchlist_expiry_dialog_six_months">Watanni 6</string>
+  <string name="watchlist_empty">Ba ku da wani labarin a cikin jerin abubuwan da kuka sa ido.</string>
+  <string name="watchlist_search">Jerin masu sa ido</string>
+  <string name="watchlist_filter_all">Duka</string>
+  <string name="watchlist_filter_talk">Tattaunawa</string>
+  <string name="watchlist_filter_pages">Shafuka</string>
+  <string name="watchlist_filter_other">Wasu</string>
+  <string name="watchlist_page_moved">Matsa</string>
+  <string name="watchlist_page_protected">An kare shi</string>
+  <string name="watchlist_page_deleted">Goge</string>
+  <string name="watchlist_filter_title">Lissafin tsaro</string>
+  <string name="watchlist_filter_wiki_filter_header">Wiki</string>
+  <string name="watchlist_filter_all_text">Duka</string>
+  <string name="watchlist_filter_watchlist_activity_header">Ayyukan jerin kallo</string>
+  <string name="watchlist_filter_watchlist_activity_unseen">Canje-canje da ba a gani ba</string>
+  <string name="watchlist_filter_watchlist_activity_seen">Ganin canje-canje</string>
+  <string name="watchlist_filter_contribution_quality_header">Tsinkaya mai inganci</string>
+  <string name="watchlist_filter_contribution_quality_good">Mai yiwuwa mai kyau</string>
+  <string name="watchlist_filter_contribution_quality_may_problems">Zai iya samun matsaloli</string>
+  <string name="watchlist_filter_contribution_quality_likely_problems">Wataƙila suna da matsaloli</string>
+  <string name="watchlist_filter_contribution_quality_bad">Wataƙila suna da matsaloli</string>
+  <string name="watchlist_filter_user_intent_header">Tsinkaya na niyyar mai amfani</string>
+  <string name="watchlist_filter_user_intent_good">Wataƙila bangaskiya ce mai kyau</string>
+  <string name="watchlist_filter_user_intent_may_problems">Zai iya zama mummunar bangaskiya</string>
+  <string name="watchlist_filter_user_intent_likely_problems">Wataƙila mummunar bangaskiya</string>
+  <string name="watchlist_filter_user_intent_bad">Wataƙila mummunar bangaskiya</string>
+  <string name="watchlist_filter_user_status_header">Rijistar mai amfani da gogewa</string>
+  <string name="watchlist_filter_user_status_unregistered">Ba a yi rajista ba</string>
+  <string name="watchlist_filter_user_status_registered">An yi rajista</string>
+  <string name="watchlist_filter_user_status_newcomers">Sabbin masu zuwa</string>
+  <string name="watchlist_filter_user_status_learners">Masu koyo</string>
+  <string name="watchlist_filter_user_status_experienced">Masu amfani da ƙwarewa</string>
+  <string name="watchlist_filter_contribution_authorship_header">Mawallafin gudummawa</string>
+  <string name="watchlist_filter_contribution_authorship_own">Canje-canje da kai</string>
+  <string name="watchlist_filter_contribution_authorship_except_own">Canje-canje daga wasu</string>
+  <string name="watchlist_filter_automated_contributions_header">Gudummawar atomatik</string>
+  <string name="watchlist_filter_automated_contributions_bot">Jirgin ruwa</string>
+  <string name="watchlist_filter_automated_contributions_human">Mutum (ba ɗan adam ba)</string>
+  <string name="watchlist_filter_significance_header">Muhimmanci</string>
+  <string name="watchlist_filter_significance_minor">Ƙananan gyare-gyare</string>
+  <string name="watchlist_filter_significance_edits">Gyaran da ba qananan ba</string>
+  <string name="watchlist_filter_latest_revisions_header">Sabuntawa na baya-bayan nan</string>
+  <string name="watchlist_filter_latest_revisions_latest_revision">Sabon bita</string>
+  <string name="watchlist_filter_latest_revisions_not_latest_revision">Ba sabon bita ba</string>
+  <string name="watchlist_filter_type_of_change_header">Irin canji</string>
+  <string name="watchlist_filter_type_of_change_page_edits">Gyaran shafi</string>
+  <string name="watchlist_filter_type_of_change_page_creations">Abubuwan da aka kirkira</string>
+  <string name="watchlist_filter_type_of_change_category_changes">Canje-canje na rukuni</string>
+  <string name="watchlist_filter_type_of_change_wikidata_edits">Wikidata gyare-gyare</string>
+  <string name="watchlist_filter_type_of_change_logged_actions">Ayyukan da aka yi amfani da su</string>
+  <string name="watchlist_filter_type_of_change_new_users">Sabbin masu amfani</string>
+  <string name="watchlist_filter_reset_button">Gyara saiti</string>
+  <string name="watchlist_search_bar_hint">Bincike ko jerin masu tacewa</string>
+  <string name="watchlist_search_bar_filter_hint">Lissafin tsaro</string>
+  <string name="watchlist_empty_search_message">Babu sakamako, yi ƙoƙarin cire %s don ganin ƙarin.</string>
+  <plurals name="watchlist_number_of_filters">
+    <item quantity="one">%d tace</item>
+    <item quantity="other"> %d tacewa</item>
+  </plurals>
+  <string name="preview_edit_title">Duba samfurin gyara</string>
+  <string name="preview_edit_summarize_edit_title">Takaitaccen gyare-gyare</string>
+  <string name="preview_edit_summarize_edit_hint">Ta yaya ka inganta wannan shafin?</string>
+  <string name="preview_edit_minor_edit">Wannan ƙaramin gyara ne</string>
+  <string name="preview_edit_watch_this_page">Kalli wannan shafi</string>
+  <string name="preview_edit_learn_more">Ƙara koyo game da taƙaitaccen bayani</string>
+  <string name="action_item_categories">Rukunoni</string>
+  <string name="page_no_categories">Wannan shafin ba ya cikin kowane rukuni.</string>
   <string name="category_tab_articles">Makalu</string>
+  <string name="category_tab_subcategories">Ƙananan rukunoni</string>
+  <string name="category_empty">Babu wani labarin da aka samu a cikin wannan rukuni.</string>
+  <string name="subcategory_empty">Babu ƙananan rukuni da aka samu a cikin wannan rukuni.</string>
+  <string name="search_namespaces">Sararin suna</string>
+  <string name="revision_initial_none">Babu (wannan shine bita na farko)</string>
+  <string name="user_contrib_activity_title">Gudummawar %s</string>
+  <string name="archive_empty">Babu shafukan da aka adana.</string>
+  <string name="user_contrib_filter_ns">Filter ta hanyar sunayen sarari</string>
+  <string name="user_contrib_filter_all">Duk wuraren sunaye</string>
+  <string name="user_contrib_filter_ns_header">Filin sararin samaniya</string>
+  <string name="namespace_article">muƙaloli</string>
+  <string name="user_contrib_current">na yanzu</string>
+  <string name="media_playback_error">Kuskuren kafofin watsa labarai.</string>
+  <string name="user_contrib_menu_label">Gudummawa</string>
+  <string name="user_contrib_filter_activity_title">Tace gudunmawar</string>
+  <string name="shareable_reading_lists_import_dialog_title">Jerin karatun da aka raba</string>
+  <string name="shareable_reading_lists_import_dialog_content">Ta yaya za ku so ku ambaci jerin sunayen da aka raba tare da ku?</string>
+  <string name="shareable_reading_lists_new_indicator">*sabo*</string>
+  <string name="shareable_reading_lists_new_install_dialog_title">An raba jerin karatun tare da ku</string>
+  <string name="shareable_reading_lists_new_install_dialog_content">Mun lura cewa an raba jerin karatun tare da ku. Don duba wannan jerin a cikin aikace-aikacen, koma saƙon asali kuma sake danna hanyar haɗi.</string>
+  <string name="shareable_reading_lists_new_install_dialog_got_it">Ka samu</string>
+  <string name="shareable_reading_lists_new_imported_snackbar">Jerin karatun da aka shigo da su</string>
+  <string name="reading_list_share_menu_label">Rabawa...</string>
+  <string name="reading_list_share_menu_tooltip">Raba wannan jerin karatun tare da wasu</string>
+  <string name="reading_list_share_message_v2">Ya kasance! Ina so in raba jerin karatun Wikipedia tare da ku:</string>
+  <string name="reading_list_share_survey_title">Shin za ku iya taimaka mana mu inganta \"Listunan karatu na raba\"?</string>
+  <string name="reading_list_share_survey_body">\"Listing Reading Sharing\" fasalin gwaji ne kuma muna buƙatar ra\'ayoyinku don ingantawa ko cire shi.</string>
+  <string name="talk_templates_manage_title">Sarrafa samfura</string>
+  <string name="talk_templates_empty_message">Ba ku da saƙonnin gargadi da aka adana.</string>
+  <string name="talk_templates_new_message_title">Sabon saƙo</string>
+  <string name="talk_templates_new_message_description">Ƙirƙiri saƙon gargaɗi</string>
+  <string name="talk_templates_new_message_subject_hint">Batu</string>
+  <string name="talk_templates_new_message_compose_hint">Rubuta saƙo</string>
+  <string name="talk_templates_new_message_save">Ajiye</string>
+  <string name="talk_templates_new_message_dialog_title">Ajiye canje-canje</string>
+  <string name="talk_templates_new_message_dialog_description">Ƙara taken kuma adana saƙo.</string>
+  <string name="talk_templates_new_message_dialog_hint">Taken saƙo</string>
+  <string name="talk_templates_new_message_dialog_save">Ajiye</string>
+  <string name="talk_templates_new_message_dialog_cancel">Soke</string>
+  <string name="talk_templates_new_message_dialog_exists">Tsarin \"%s\" ya riga ya wanzu.</string>
+  <string name="talk_templates_new_message_saved">An adana saƙo</string>
+  <string name="talk_templates_edit_message_dialog_title">Gyara saƙo</string>
+  <string name="talk_templates_edit_message_dialog_save">Ajiye</string>
+  <string name="talk_templates_edit_message_dialog_delete">Share</string>
+  <string name="talk_templates_edit_message_updated">An adana saƙo</string>
   <string name="talk_templates_menu_remove_message">Cire saƙo</string>
   <plurals name="talk_templates_message_delete_description">
     <item quantity="one">Shin ku tabbata kuna son share saƙon daga lissafin?</item>
@@ -1199,4 +1462,108 @@
     <item quantity="one">An share saƙo</item>
     <item quantity="other">An share saƙo</item>
   </plurals>
+  <string name="talk_templates_message_title_empty">Batun ba zai iya zama komai ba.</string>
+  <string name="patroller_tasks_edits_list_title">Jerin gyare-gyare</string>
+  <string name="patroller_tasks_edits_list_search_hint">Bincike ko gyaran tacewa</string>
+  <string name="patroller_tasks_edits_list_card_tags_text">Alamomi: %s</string>
+  <string name="patroller_tasks_edits_list_card_tags_text_none">Babu</string>
+  <string name="patroller_tasks_edits_list_card_overflow_view_user_page">Duba shafin mai amfani</string>
+  <string name="patroller_tasks_edits_list_card_overflow_view_talk_page">duba shafin taimako</string>
+  <string name="patroller_tasks_edits_list_card_overflow_user_information">Bayanin shafi</string>
+  <string name="patroller_tasks_edits_list_card_overflow_view_user_contributions">Dubi gudummawar mai amfani</string>
+  <string name="patroller_tasks_edits_list_card_overflow_thank">Godiya ga masu godiya</string>
+  <string name="patroller_tasks_edits_list_user_information_dialog_title">Bayanai da Yawa</string>
+  <string name="patroller_tasks_edits_list_user_information_dialog_joined_date_text">Asusun daga: %s</string>
+  <string name="patroller_tasks_edits_list_user_information_dialog_edit_count_text">&lt;b&gt;Gyara ƙididdiga:&lt;/b&gt; %s</string>
+  <string name="patroller_tasks_edits_list_user_information_dialog_close">Rufe</string>
+  <string name="patroller_tasks_filters_title">Tace</string>
+  <string name="patroller_tasks_filters_reset">Sake saiti</string>
+  <string name="patroller_tasks_filters_wiki_filter_header">Wiki</string>
+  <string name="patroller_tasks_filters_all_text">Duka</string>
+  <string name="patroller_tasks_filters_user_status_header">Rijistar mai amfani da gogewa</string>
+  <string name="patroller_tasks_filters_user_status_unregistered">An yi rajista</string>
+  <string name="patroller_tasks_filters_user_status_unregistered_desc">Editocin da ba a shigar da su ba.</string>
+  <string name="patroller_tasks_filters_user_status_registered">Rajista</string>
+  <string name="patroller_tasks_filters_user_status_registered_desc">Editocin shiga.</string>
+  <string name="patroller_tasks_filters_user_status_newcomers">Sabbin masu zuwa</string>
+  <string name="patroller_tasks_filters_user_status_newcomers_desc">Editocin da aka yi rajista waɗanda ke da ƙasa da gyare-gyare 10 na kwanaki 4 na aiki.</string>
+  <string name="patroller_tasks_filters_user_status_learners">Masu koyo</string>
+  <string name="patroller_tasks_filters_user_status_learners_desc">Editocin da aka yi rajista waɗanda kwarewarsu ta fada tsakanin \"Sabon\" da \"masu amfani da ƙwarewa\".</string>
+  <string name="patroller_tasks_filters_user_status_experienced">Masu amfani da ƙwarewa</string>
+  <string name="patroller_tasks_filters_user_status_experienced_desc">Masu rajista editoci tare da fiye da 500 gyare-gyare da kwanaki 30 na aiki.</string>
+  <string name="patroller_tasks_filters_latest_revisions_header">Sabon bita</string>
+  <string name="patroller_tasks_filters_latest_revisions_latest_revision">Sabuntawa na baya-bayan nan</string>
+  <string name="patroller_tasks_filters_latest_revisions_not_latest_revision">Ba sabon bita ba</string>
+  <string name="patroller_tasks_filters_automated_contributions_header">Gudummawar atomatik</string>
+  <string name="patroller_tasks_filters_automated_contributions_bot">Bot</string>
+  <string name="patroller_tasks_filters_automated_contributions_human">Mutum (ba ɗan adam ba)</string>
+  <string name="patroller_tasks_filters_significance_header">Muhimmanci</string>
+  <string name="patroller_tasks_filters_significance_minor">Ƙananan gyare-gyare</string>
+  <string name="patroller_tasks_filters_significance_edits">Ƙananan gyare-gyare</string>
+  <string name="patroller_tasks_filters_contribution_quality_header">Tsinkaya mai inganci</string>
+  <string name="patroller_tasks_filters_contribution_quality_good">Mai yiwuwa mai kyau</string>
+  <string name="patroller_tasks_filters_contribution_quality_good_desc">Daidai sosai wajen gano kusan dukkanin gyare-gyare marasa matsala.</string>
+  <string name="patroller_tasks_filters_contribution_quality_may_problems">Wataƙila suna da matsaloli</string>
+  <string name="patroller_tasks_filters_contribution_quality_may_problems_desc">Ya sami mafi yawan gyare-gyare ko lalacewa amma tare da ƙarancin daidaito.</string>
+  <string name="patroller_tasks_filters_contribution_quality_likely_problems">Wataƙila suna da matsaloli</string>
+  <string name="patroller_tasks_filters_contribution_quality_likely_problems_desc">Tare da matsakaiciyar daidaito, yana samuwa a matsayin matsakaiciyar ɓangaren gyaran matsala.</string>
+  <string name="patroller_tasks_filters_contribution_quality_bad">Wataƙila suna da matsaloli</string>
+  <string name="patroller_tasks_filters_contribution_quality_bad_desc">Daidai sosai wajen gano mafi yawan abubuwan da suka fi dacewa ko lalacewa.</string>
+  <string name="patroller_tasks_filters_user_intent_header">Tsinkaya na niyyar mai amfani</string>
+  <string name="patroller_tasks_filters_user_intent_good">Da alama kyakkyawan bangaskiya</string>
+  <string name="patroller_tasks_filters_user_intent_good_desc">Daidai sosai wajen gano kusan dukkanin gyare-gyaren bangaskiya.</string>
+  <string name="patroller_tasks_filters_user_intent_may_problems">Zai iya zama mummunar bangaskiya</string>
+  <string name="patroller_tasks_filters_user_intent_may_problems_desc">Ya sami mafi yawan gyare-gyaren mummunar bangaskiya amma tare da ƙarancin daidaito.</string>
+  <string name="patroller_tasks_filters_user_intent_likely_problems">Wataƙila mummunar bangaskiya</string>
+  <string name="patroller_tasks_filters_user_intent_likely_problems_desc">Tare da matsakaiciyar daidaito, ya sami matsakaicin ɓangaren gyare-gyaren mummunar bangaskiya.</string>
+  <string name="patroller_tasks_filters_user_intent_bad">Da alama kyakkyawan bangaskiya</string>
+  <string name="patroller_tasks_filters_user_intent_bad_desc">Daidai sosai wajen gano mafi yawan gyare-gyaren mummunar bangaskiya.</string>
+  <string name="patroller_tasks_filters_empty_search_message">Gwada cire %s don ganin ƙarin gyare-gyare</string>
+  <plurals name="patroller_tasks_filters_number_of_filters">
+    <item quantity="one">%d tace</item>
+    <item quantity="other"> %d tacewa</item>
+  </plurals>
+  <string name="patroller_tasks_patrol_edit_title">Gyaran Patrol</string>
+  <string name="patroller_tasks_patrol_edit_overflow_edit_history">Tarihin gyaran labarin</string>
+  <string name="patroller_tasks_patrol_edit_undo_success">Komawa cikakke</string>
+  <string name="patroller_tasks_patrol_edit_rollback_dialog_title">Shin kun tabbata kuna son rufe duk shafuka?</string>
+  <string name="patroller_tasks_patrol_edit_rollback_success">Cikakken juyawa</string>
+  <string name="patroller_tasks_patrol_edit_snackbar_view">Duba</string>
+  <string name="patroller_tasks_overflow_report">Matsala tare da fasalin</string>
+  <string name="patroller_tasks_overflow_learn">Ƙara koyo</string>
+  <string name="patroller_onboarding_one_title">Ka ba da gudummawa ga sa ido da amincewa da gyaran Wikipedia.</string>
+  <string name="patroller_onboarding_one_content">Inganta ingancin abun ciki na Wikipedia ta hanyar sake duba abubuwan da aka yi kwanan nan da kuma samar da jagora, kula da inganci, da ƙarfafawa ga sauran masu gyara.</string>
+  <string name="patroller_onboarding_two_title">Bayar da ra\'ayoyi, saka idanu, da kuma daukar matakai a allon diff</string>
+  <string name="patroller_onboarding_two_thank_title">Godiya</string>
+  <string name="patroller_onboarding_two_thank_content">Dubi gyare-gyare mai amfani? Na gode wa mai amfani saboda gudummawar da suka bayar.</string>
+  <string name="patroller_onboarding_two_watch_title">Kalli</string>
+  <string name="patroller_onboarding_two_watch_content">Yana so ya bi diddigin gyaran labarin? Ƙara a cikin Watchlist. Dubi shi a ƙarƙashin \'More\'.</string>
+  <string name="patroller_onboarding_two_warn_title">Gargadi</string>
+  <string name="patroller_onboarding_two_warn_content">Ka ƙirƙira, aikawa, da adana saƙonnin gargadi a shafin tattaunawa na edita.</string>
+  <string name="patroller_onboarding_two_undo_title">Maimaita/Bayarwa</string>
+  <string name="patroller_onboarding_two_undo_content">Zaɓi \'Undo\' don warwarewa ko juyawa wani gyare-gyare mai lalacewa.</string>
+  <string name="patroller_diff_tooltip_one">Lalacewar tana hasashen idan gyare-gyare yana haifar da lalacewa ga wiki.</string>
+  <string name="patroller_diff_tooltip_two">Manufar ta yi hasashen yiwuwar gyara da za a adana cikin aminci.</string>
+  <string name="patroller_diff_feedback_dialog_title">Taimaka mana inganta wannan fasalin</string>
+  <string name="patroller_diff_feedback_dialog_message">Shin kun gamsu da wannan fasalin?</string>
+  <string name="patroller_diff_feedback_dialog_option_satisfied">An gamsu da su</string>
+  <string name="patroller_diff_feedback_dialog_option_neutral">Ba tare da la\'akari ba</string>
+  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Ba a gamsu ba</string>
+  <string name="patroller_diff_feedback_dialog_feedback_title">Ta yaya za mu iya inganta fasalin?</string>
+  <string name="patroller_diff_feedback_dialog_input_hint">Bayani</string>
+  <string name="patroller_diff_feedback_dialog_submit">Miƙa</string>
+  <string name="patroller_diff_feedback_submitted_snackbar">Ra\'ayoyin da aka gabatar.</string>
+  <string name="patroller_diff_feedback_tooltip">Sanya menu mai yawa don gabatar da ra\'ayoyi a kowane lokaci a ƙarƙashin \'Matsala tare da fasalin\'.</string>
+  <string name="data_opt_in_accept">Karba</string>
+  <string name="data_opt_in_reject">Mayar</string>
+  <string name="page_issues_title">Batutuwan shafi</string>
+  <string name="generic_release_notes">Ƙananan gyare-gyare da haɓakawa</string>
+  <string name="email_report_image_recommendations_subject">Rahoton fitowa - Shawarwarin Hoton</string>
+  <string name="email_report_image_recommendations_body">Na gamu da matsala tare da fasalin Shawarwarin Hoton: - [Bayyana takamaiman matsala] __hau____hau____hau__ Halin da nake so in gani shine: - [Bayyana mafita da aka tsara]</string>
+  <string name="email_report_patroller_tasks_subject">Rahoton fitowa- Gyara Patrol Feature</string>
+  <string name="email_report_patroller_tasks_body">Na gamu da matsala tare da Gyara Patrol Feature: - [Bayyana takamaiman matsala] __hau____hau____hau__ Halin da nake so in gani shine: - [Bayyana mafita da aka tsara] __hau____hau____hau__ [Screenshots ko Links]</string>
+  <string name="donation_campaign_maybe_later_snackbar">Za mu sake tunatar da ku gobe.</string>
+  <string name="donation_campaign_donated_snackbar">Na gode, ƙaunataccen mai ba da gudummawa! karimcinku yana taimakawa wajen ci gaba da Wikipedia da shafukan \'yan uwanta.</string>
+  <string name="donation_campaign_go_back_button">Koma baya</string>
+  <string name="menu_single_webview_open_external">Bude a cikin tsarin mai lilo</string>
 </resources>
diff --git a/app/src/main/res/values-ks/strings.xml b/app/src/main/res/values-ks/strings.xml
index 3248450530b..95744e6c3a9 100644
--- a/app/src/main/res/values-ks/strings.xml
+++ b/app/src/main/res/values-ks/strings.xml
@@ -184,6 +184,7 @@
   <string name="create_account_generic_error">کھاتہٕ ہؠکہِ نہٕ بٕنِتھ</string>
   <string name="create_account_next">اَمہِ پتہٕ</string>
   <string name="email_recommendation_dialog_title">کھاتہٕ بنأوِو مگر برقی خط وغٲر؟</string>
+  <string name="email_recommendation_message">اَہَم! تِکیٛازِ کھاتہٕ ریکوری خٲطرٕ چُھ ای میلٕچ ضرورت۔</string>
   <string name="email_recommendation_dialog_create_without_email_action">برقی خط وغٲر تھٲوِو جٲری</string>
   <string name="email_recommendation_dialog_create_with_email_action">برقی خط کٕریٚو شٲمل</string>
   <string name="create_account_button">کھاتہٕ بَنٲیو</string>
@@ -201,8 +202,10 @@
   <string name="preferences_heading_experimental">تجرُبأتی</string>
   <string name="preference_title_sync_reading_lists_from_account">پرنٕچہِ فہرستہِ ہِنٛز سِنٛکِنٛگ</string>
   <string name="preference_title_download_reading_list_articles">ڈاوُنلوڈ کٕریٚو پرنٕچہِ فہرست مَضموٗن</string>
+  <string name="preference_summary_sync_reading_lists">پننِس وِکیٖپیٖڈیا کھاتَس پؠٹھ مَحفوٗظ کٔرِتھ کٔرِو مُختٔلِف ڈیوایسَن منٛز پرنٕچ فِہرِسَت سینک</string>
   <string name="preferences_privacy_settings_heading">رازدأری</string>
   <string name="preference_title_eventlogging_opt_in">استعمالُک رِپورٹ سوٗزِیٚو</string>
+  <string name="preference_summary_eventlogging_opt_in">وِکیٖمیٖڈیاہَس دِیِو اِجازت زِ تِم کَرن یہِ معلوٗماتھ حٲصِل زِ تُہؠ کِتھ کٔنؠ چھِو ایپ اِستِمال کَرانتاکہِ ایپ ییٚہِ بَھتَر بَناونہٕ</string>
   <string name="preference_title_auto_upload_crash_reports">نۄقسانُک رِپورٹ سوٗزِیٚو</string>
   <string name="history_filter_list_hint">فِلٹر تَوأریٖخ</string>
   <string name="page_protected_can_not_edit_title">یہِ صَفہٕ چھُ مَحفوٗظ</string>
@@ -241,6 +244,7 @@
   <string name="edit_undo">رَد کٕرو</string>
   <string name="edit_redo">بَحال کٕرو</string>
   <string name="edit_rollback">واپس نیُن</string>
+  <string name="edit_warn">خَبَردار</string>
   <plurals name="edit_diff_bytes">
     <item quantity="one">%s byte</item>
     <item quantity="other">%s bytes</item>
@@ -504,6 +508,7 @@
   <string name="description_edit_cancel_hint">مَنسوٗخ</string>
   <string name="description_edit_success_done">دَرٕج</string>
   <string name="description_edit_success_did_you_know">تۄہہِ چھا پَتا؟</string>
+  <string name="customize_toolbar_category_menu">مینیو</string>
   <string name="suggested_edits_describe_articles">مَضموٗنَن کٕریٚو وؠژھٕنٲی</string>
   <string name="suggested_edits_caption_images">تصویٖرَن کھٲترٕ مُکالمہٕ</string>
   <string name="suggested_edits_tag_images">تصویٖرٕ ٹیگ</string>
@@ -562,6 +567,10 @@
   <string name="suggested_edits_contribution_date_yesterday_text">راتھ</string>
   <string name="suggested_edits_encourage_account_creation_title">تُہؠ چھا خَبَر ہَر کانٛہہ ہیٚکہِ وِکیٖپیٖڈیا اؠڈِٹ کٔرِتھ؟</string>
   <string name="suggested_edits_encourage_account_creation_login_button">وِکیٖپیٖڈیاہَس منٛز دٲخل گژھُن / شٲمِل گژھُن</string>
+  <string name="suggested_edits_report_suggestion">رَپوٹھ کٔرِو</string>
+  <string name="suggested_edits_suggestion_report_submitted">رَپوٹھ آے دِنہٕ</string>
+  <string name="image_recommendation_tooltip_next">برٛونٛہہ</string>
+  <string name="edit_published_view">وُچھِو</string>
   <string name="file_page_activity_title">فَیِل صَفہٕ</string>
   <string name="file_page_add_image_caption_button">تصویٖر مُکالمہٕ کٕریٚو درٕج</string>
   <string name="file_page_edit_button_content_description">اؠڈِٹ %s</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 914982d7c9a..dfa11800f7e 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -393,6 +393,10 @@
   <string name="multi_select_items_selected">%d избрани</string>
   <string name="error_message_generic">Се појави грешка</string>
   <string name="view_link_preview_error_button_dismiss">Тргни</string>
+  <string name="link_preview_dialog_read_button">Прочитај</string>
+  <string name="link_preview_dialog_save_button">Зачувај</string>
+  <string name="link_preview_dialog_saved_button">Зачувано</string>
+  <string name="link_preview_dialog_share_button">Сподели</string>
   <string name="error_page_does_not_exist">Оваа страница не постои.</string>
   <string name="error_user_page_does_not_exist">Википедија нема &lt;a href=\"%1$s\"&gt;корисничка страница&lt;/a&gt; со точно тоа име. Начелно, оваа страница треба да се создаде и уреди од &lt;b&gt;%2$s&lt;/b&gt;. Ако не сте сигурни, проверете дали постои „%3$s“.</string>
   <string name="view_wiki_error_message_offline">Не можам да се поврзам со семрежјето</string>
@@ -1430,6 +1434,8 @@
   <string name="media_playback_error">Грешка при пуштањето на снимката.</string>
   <string name="user_contrib_menu_label">Придонеси</string>
   <string name="user_contrib_filter_activity_title">Филтер на придонеси</string>
+  <string name="action_item_view_on_map">Погл. на карта</string>
+  <string name="action_item_view_on_map_unavailable">Географските координати не се достапни за оваа страница</string>
   <string name="shareable_reading_lists_import_dialog_title">Уевзи споделен список за читање</string>
   <string name="shareable_reading_lists_import_dialog_content">Како би сакале да го наречете списокот за читање што се споделува со вас?</string>
   <string name="shareable_reading_lists_new_indicator">*ново*</string>
@@ -1573,4 +1579,10 @@
   <string name="donation_campaign_donated_snackbar">Ви благодариме, драг дарителу! Википедија и нејзините збратимени проекти напредуваат благодарение на вашата великодушност.</string>
   <string name="donation_campaign_go_back_button">Назад</string>
   <string name="menu_single_webview_open_external">Отвори во системскиот прелистувач</string>
+  <string name="places_title">Места</string>
+  <string name="places_permissions_denied">Потребна е дозвола за споделување на вашата местоположба на карта. Обидете се повторно.</string>
+  <string name="places_search_hint">Пребарај места</string>
+  <string name="places_filter_title">Филтрирај јазик</string>
+  <string name="places_toggle_buttons_map">Карта</string>
+  <string name="places_toggle_buttons_list">Список</string>
 </resources>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index e556a453a9b..752af870f12 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -426,6 +426,10 @@
   <string name="multi_select_items_selected">Toolbar title shown when the user is selecting multiple items in a list. The \"%d\" symbol is replaced with the number of items currently selected.</string>
   <string name="error_message_generic">Generic message informing the user that an error occurred</string>
   <string name="view_link_preview_error_button_dismiss">Button label for a button to dismiss a link preview\n{{Identical|Dismiss}}</string>
+  <string name="link_preview_dialog_read_button">Button label for reading the article in the link preview bottom sheet.</string>
+  <string name="link_preview_dialog_save_button">Button label for saving the article to a reading list in the link preview bottom sheet.</string>
+  <string name="link_preview_dialog_saved_button">Button label that indicates the article has been saved in a reading list in the link preview bottom sheet.</string>
+  <string name="link_preview_dialog_share_button">Button label for sharing the article in the link preview bottom sheet.</string>
   <string name="error_page_does_not_exist">Error message informing the user that the requested page does not exist</string>
   <string name="error_user_page_does_not_exist">Error message text shown when the user page does not yet exist. %1$s represents the full URL that points to the user page, %2$s represents the username and %3$s represents username without namespace.</string>
   <string name="view_wiki_error_message_offline">{{Doc-mobileapp-internet}}\nError message shown when network cannot be reached when loading a page</string>
@@ -1592,10 +1596,8 @@
   <string name="patroller_diff_feedback_tooltip">Text of the tooltip for the patrol edit screen indicates how to submit feedback for the feature.\n\n\"Problem with feature\" is {{msg-wm|Wikipedia-android-strings-suggested edits report feature}}</string>
   <string name="data_opt_in_accept">Button label for accepting anonymous data collection.</string>
   <string name="data_opt_in_reject">Button label for rejecting anonymous data collection.</string>
-  <string name="places_title">Title for the Places screen.</string>
   <string name="page_issues_title">Dialog title for displaying page issues (amboxes) for the current page.</string>
   <string name="generic_release_notes">Release notes message that will be used on app stores for minor releases and maintenance updates.</string>
-  <string name="places_permissions_denied">Message shown when a required permission was denied by the user.</string>
   <string name="email_report_image_recommendations_subject">Subject heading for sending a report about a problem with the Image Recommendations feature.</string>
   <string name="email_report_image_recommendations_body">Body of email for sending a report about a problem with the Image Recommendations feature.</string>
   <string name="email_report_patroller_tasks_subject">Subject heading for sending a report about a problem with the Patroller Tasks feature.</string>
@@ -1604,10 +1606,8 @@
   <string name="donation_campaign_donated_snackbar">Text for the snackbar message when user hits the \"I already donated\" option.</string>
   <string name="donation_campaign_go_back_button">Button label for the webview that can go back to the previous screen.</string>
   <string name="menu_single_webview_open_external">Menu option that indicates the web page can be opened in a system browser.</string>
-  <string name="link_preview_dialog_read_button">Button label for reading the article in the link preview bottom sheet.</string>
-  <string name="link_preview_dialog_save_button">Button label for saving the article to a reading list in the link preview bottom sheet.</string>
-  <string name="link_preview_dialog_saved_button">Button label that indicates the article has been saved in a reading list in the link preview bottom sheet.</string>
-  <string name="link_preview_dialog_share_button">Button label for sharing the article in the link preview bottom sheet.</string>
+  <string name="places_title">Title for the Places screen.</string>
+  <string name="places_permissions_denied">Message shown when a required permission was denied by the user.</string>
   <string name="places_search_hint">Hint text for the search box inside the Places screen. Should be as short as possible.</string>
   <string name="places_filter_title">Title string for places language filter screen.</string>
   <string name="places_toggle_buttons_map">Button label for viewing the map view in the Places screen.</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 9ed25cf659a..b721731aaf9 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -403,6 +403,10 @@
   <string name="multi_select_items_selected">Изабрано: %d</string>
   <string name="error_message_generic">Дошло је до грешке</string>
   <string name="view_link_preview_error_button_dismiss">Одбаци</string>
+  <string name="link_preview_dialog_read_button">Читај</string>
+  <string name="link_preview_dialog_save_button">Сачувај</string>
+  <string name="link_preview_dialog_saved_button">Сачувано</string>
+  <string name="link_preview_dialog_share_button">Дели</string>
   <string name="error_page_does_not_exist">Ова страница не постоји</string>
   <string name="error_user_page_does_not_exist">Википедија нема &lt;a href=\"%1$s\"&gt;корисничку страницу&lt;/a&gt; са баш овим именом. Генерално, ову страницу треба да направи или уређује &lt;b&gt;%2$s&lt;/b&gt;. Уколико сте у недоумици, проверите да ли \"%3$s\" постоји.</string>
   <string name="view_wiki_error_message_offline">Није могуће повезати се са интернетом</string>
@@ -1416,6 +1420,7 @@
   <string name="media_playback_error">Дошло је до грешке приликом пуштања медија.</string>
   <string name="user_contrib_menu_label">Доприноси</string>
   <string name="user_contrib_filter_activity_title">Филтер доприноса</string>
+  <string name="action_item_view_on_map">Прикажи на мапи</string>
   <string name="shareable_reading_lists_import_dialog_title">Увези подељену листу за читање</string>
   <string name="shareable_reading_lists_import_dialog_content">Како би сте желели да именујете листу која је подељена са вама?</string>
   <string name="shareable_reading_lists_new_indicator">*ново*</string>
@@ -1556,4 +1561,7 @@
   <string name="donation_campaign_donated_snackbar">Хвала, драги донаторе! Ваша великодушност помаже да Википедија и њени сестрински сајтови буду успешни.</string>
   <string name="donation_campaign_go_back_button">Назад</string>
   <string name="menu_single_webview_open_external">Отвори у прегледачу</string>
+  <string name="places_title">Места</string>
+  <string name="places_toggle_buttons_map">Мапа</string>
+  <string name="places_toggle_buttons_list">Списак</string>
 </resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 3f312f15ab5..e1ba7e164b8 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -197,7 +197,7 @@
   <string name="preference_title_download_reading_list_articles">வாசிப்பு பட்டியலிலுள்ள கட்டுரைகளை பதிவிறக்கு</string>
   <string name="preference_summary_sync_reading_lists">உங்கள் விக்கிப்பீடியா கணக்கிற்கு படிப்பு பட்டியல்களை சேமித்து சாதனங்களுக்கு இடையே ஒருங்குநிகழ் செய்க</string>
   <string name="preference_summary_sync_reading_lists_from_account">உங்கள் விக்கிப்பீடியா கணக்கு \"%s\" க்கு படிப்பு பட்டியல்களை சேமித்து சாதனங்களுக்கு இடையே ஒருங்குநிகழ் செய்க</string>
-  <string name="preference_dialog_of_turning_off_reading_list_sync_title">ஒருங்குநிகழ் செய்யப்பட்ட படிப்பு பட்டியல்களை \"%s\" இலிருந்து நீக்கவும்</string>
+  <string name="preference_dialog_of_turning_off_reading_list_sync_title">ஒத்திசைவான வாசிப்புப் பட்டியல்களை \"%s\" இலிருந்து அகற்றவா?</string>
   <string name="preference_dialog_of_turning_off_reading_list_sync_text">இது முன்கூட்டியே ஒத்திசை செய்யப்பட்ட படிப்பு பட்டியல்களை தொலைநிலை சேமிப்பகத்திலிருந்து அகற்றிவிடும். ஒத்திசை செய்யப்பட்ட பட்டியல்களை உங்கள் \"%s\" கணக்கிலிருந்து அகற்றவா?</string>
   <string name="preferences_privacy_settings_heading">தனியுரிமை</string>
   <string name="preference_title_eventlogging_opt_in">பயன்பாடு அறிக்கை அனுப்பு</string>
@@ -522,7 +522,7 @@
   <string name="onboarding_multilingual_secondary_text">உங்கள் சாதனத்தில் பின்வரும் மொழிகளை நாங்கள் கண்டறிந்தோம்:</string>
   <string name="onboarding_welcome_title_v2">இலவச கலைக்களஞ்சியம்\n… 300 மொழிகளுக்கும் மேலாக</string>
   <string name="app_shortcuts_random">ஏதோ ஒன்று</string>
-  <string name="app_shortcuts_continue_reading">தொடர்ந்து படிக்கவும்</string>
+  <string name="app_shortcuts_continue_reading">வாசிப்பைத் தொடர்</string>
   <string name="app_shortcuts_search">தேடு</string>
   <string name="on_this_day_card_title">இந்த நாளில்</string>
   <string name="more_events_text">இந்நாளில் மேலும்</string>
diff --git a/app/src/main/res/values-tly/strings.xml b/app/src/main/res/values-tly/strings.xml
index bae5d532eab..5bb7d026398 100644
--- a/app/src/main/res/values-tly/strings.xml
+++ b/app/src/main/res/values-tly/strings.xml
@@ -335,6 +335,10 @@
   <string name="multi_select_items_selected">%d vyžnijə byə</string>
   <string name="error_message_generic">Xəto beše</string>
   <string name="view_link_preview_error_button_dismiss">Žəj</string>
+  <string name="link_preview_dialog_read_button">Byhand</string>
+  <string name="link_preview_dialog_save_button">Ogətej</string>
+  <string name="link_preview_dialog_saved_button">Ogətə byə</string>
+  <string name="link_preview_dialog_share_button">Pevylo kardej</string>
   <string name="error_page_does_not_exist">Žygo səhifə ni</string>
   <string name="view_wiki_error_message_offline">Bə internet dəše mymkun ni</string>
   <string name="reference_title">Ǧejd %s</string>
@@ -975,6 +979,7 @@
   <string name="namespace_article">Məǧolə</string>
   <string name="user_contrib_current">ysət</string>
   <string name="user_contrib_menu_label">Tohfə</string>
+  <string name="action_item_view_on_map">Xəritədə dijə karde</string>
   <string name="shareable_reading_lists_new_indicator">*tojə*</string>
   <string name="shareable_reading_lists_new_install_dialog_got_it">Dərəsəjm</string>
   <string name="reading_list_share_menu_label">Pevylo kardej...</string>
@@ -1016,4 +1021,7 @@
   <string name="data_opt_in_reject">Ohaštej</string>
   <string name="page_issues_title">Səhifə problemon</string>
   <string name="donation_campaign_go_back_button">Bə dumo</string>
+  <string name="places_title">Vyron</string>
+  <string name="places_toggle_buttons_map">Xəritə</string>
+  <string name="places_toggle_buttons_list">Sijohi</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 21358d7414c..c3c8be89a91 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -435,6 +435,10 @@
   <string name="multi_select_items_selected">%d seçildi</string>
   <string name="error_message_generic">Bir hata oluştu</string>
   <string name="view_link_preview_error_button_dismiss">Reddet</string>
+  <string name="link_preview_dialog_read_button">Oku</string>
+  <string name="link_preview_dialog_save_button">Sakla</string>
+  <string name="link_preview_dialog_saved_button">Saklandı</string>
+  <string name="link_preview_dialog_share_button">Paylaş</string>
   <string name="error_page_does_not_exist">Bu sayfa mevcut değil</string>
   <string name="error_user_page_does_not_exist">Vikipedi\'de bu isimde bir &lt;a href=\"%1$s\"&gt;kullanıcı sayfası&lt;/a&gt; yok. Genellikle, bu sayfa &lt;b&gt;%2$s&lt;/b&gt; tarafından oluşturulup düzenlenmelidir. Kuşku duyarsanız, \"%3$s\" sayfasının var olduğundan emin olun.</string>
   <string name="view_wiki_error_message_offline">İnternete bağlanılamıyor.</string>
@@ -1468,6 +1472,8 @@
   <string name="media_playback_error">Ortam oynatılırken hata oluştu.</string>
   <string name="user_contrib_menu_label">Katkılar</string>
   <string name="user_contrib_filter_activity_title">Katkıları filtrele</string>
+  <string name="action_item_view_on_map">Haritada görüntüle</string>
+  <string name="action_item_view_on_map_unavailable">Bu sayfa için coğrafi koordinatlar yok</string>
   <string name="shareable_reading_lists_import_dialog_title">Paylaşılan okuma listesini içe aktar</string>
   <string name="shareable_reading_lists_import_dialog_content">Sizinle paylaşılan listeyi nasıl adlandırmak istersiniz?</string>
   <string name="shareable_reading_lists_new_indicator">*yeni*</string>
@@ -1611,4 +1617,10 @@
   <string name="donation_campaign_donated_snackbar">Teşekkürler sevgili bağışçı! Cömertliğiniz Vikipedi\'nin ve kardeş sitelerinin gelişmesine yardımcı oluyor.</string>
   <string name="donation_campaign_go_back_button">Geri dön</string>
   <string name="menu_single_webview_open_external">Sistem tarayıcısında aç</string>
+  <string name="places_title">Yerler</string>
+  <string name="places_permissions_denied">Haritadaki yerinizi görmek için konum izni gereklidir. Lütfen tekrar deneyin.</string>
+  <string name="places_search_hint">Yerleri ara</string>
+  <string name="places_filter_title">Dile göre filtrele</string>
+  <string name="places_toggle_buttons_map">Harita</string>
+  <string name="places_toggle_buttons_list">Liste</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 22a1ab5bfdf..674b39c8aef 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -419,6 +419,10 @@
   <string name="multi_select_items_selected">%d 個已選擇</string>
   <string name="error_message_generic">發生錯誤</string>
   <string name="view_link_preview_error_button_dismiss">關閉</string>
+  <string name="link_preview_dialog_read_button">閱讀</string>
+  <string name="link_preview_dialog_save_button">儲存</string>
+  <string name="link_preview_dialog_saved_button">已儲存</string>
+  <string name="link_preview_dialog_share_button">分享</string>
   <string name="error_page_does_not_exist">此頁面不存在</string>
   <string name="error_user_page_does_not_exist">維基百科上沒有此確切名稱的&lt;a href=\"%1$s\"&gt;使用者頁面&lt;/a&gt;。在一般情況下，此頁面應是由&lt;b&gt;%2$s&lt;/b&gt;建立與編輯。如有疑問，請確認「%3$s」是否存在。</string>
   <string name="view_wiki_error_message_offline">無法連接網路</string>
@@ -1455,6 +1459,8 @@
   <string name="media_playback_error">播放媒體時出錯。</string>
   <string name="user_contrib_menu_label">貢獻</string>
   <string name="user_contrib_filter_activity_title">篩選貢獻</string>
+  <string name="action_item_view_on_map">在地圖上查看</string>
+  <string name="action_item_view_on_map_unavailable">此頁面的地理座標不可用</string>
   <string name="shareable_reading_lists_import_dialog_title">匯入分享閱讀清單</string>
   <string name="shareable_reading_lists_import_dialog_content">您想如何命名與您分享的清單？</string>
   <string name="shareable_reading_lists_new_indicator">*新的*</string>
@@ -1598,4 +1604,10 @@
   <string name="donation_campaign_donated_snackbar">謝謝您，親愛的捐贈者！您的慷慨贊助會幫助維基百科與相關姐妹網站蓬勃發展。</string>
   <string name="donation_campaign_go_back_button">返回</string>
   <string name="menu_single_webview_open_external">在系統瀏覽器開啟</string>
+  <string name="places_title">地點</string>
+  <string name="places_permissions_denied">需要位置權限才能在地圖上查看您的位置。請再試一次。</string>
+  <string name="places_search_hint">搜尋地點</string>
+  <string name="places_filter_title">篩選語言</string>
+  <string name="places_toggle_buttons_map">地圖</string>
+  <string name="places_toggle_buttons_list">清單</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b2a76d5c177..788a6b69d89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1679,10 +1679,12 @@
     <string name="menu_single_webview_open_external">Open in system browser</string>
     <!-- Donor experience -->
 
+    <!-- Places -->
     <string name="places_title">Places</string>
     <string name="places_permissions_denied">Location permission is required to see your location on the map. Please try again.</string>
     <string name="places_search_hint">Search places</string>
     <string name="places_filter_title">Filter language</string>
     <string name="places_toggle_buttons_map">Map</string>
     <string name="places_toggle_buttons_list">List</string>
+    <!-- /Places -->
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 52d974e4d1a..5dfe2479c2f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -229,6 +229,7 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:maxLines">10</item>
         <item name="lineHeight">24dp</item>
+        <item name="android:letterSpacing">0</item>
         <item name="android:textSize">16sp</item>
         <item name="android:paddingTop">0dp</item>
         <item name="android:paddingBottom">0dp</item>
@@ -549,4 +550,9 @@
         <item name="behavior_peekHeight">@dimen/bottomSheetPeekHeight</item>
     </style>
 
+    <style name="FloatingActionButtonRounded">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/org/wikipedia/page/linkpreview/LinkPreviewContentsTest.kt b/app/src/test/java/org/wikipedia/page/linkpreview/LinkPreviewContentsTest.kt
index fabdb5eb6e1..a0267482a32 100644
--- a/app/src/test/java/org/wikipedia/page/linkpreview/LinkPreviewContentsTest.kt
+++ b/app/src/test/java/org/wikipedia/page/linkpreview/LinkPreviewContentsTest.kt
@@ -1,6 +1,5 @@
 package org.wikipedia.page.linkpreview
 
-import android.text.SpannableStringBuilder
 import android.text.style.SuperscriptSpan
 import androidx.core.text.getSpans
 import org.hamcrest.MatcherAssert
@@ -29,7 +28,7 @@ class LinkPreviewContentsTest {
     @Test
     fun testExtractHasSuperscripts() {
         val linkPreviewContents = LinkPreviewContents(rbPageSummary, TEST)
-        val extract = fromHtml(linkPreviewContents.extract) as SpannableStringBuilder
+        val extract = fromHtml(linkPreviewContents.extract)
 
         // the 3 <sup> tags in the formula are represented correctly
         MatcherAssert.assertThat(extract.getSpans<SuperscriptSpan>(), Matchers.arrayWithSize(EXPECTED_SUPS))
diff --git a/app/src/test/java/org/wikipedia/search/FullTextSearchClientTest.kt b/app/src/test/java/org/wikipedia/search/FullTextSearchClientTest.kt
index d2bde6b8487..d67502db921 100644
--- a/app/src/test/java/org/wikipedia/search/FullTextSearchClientTest.kt
+++ b/app/src/test/java/org/wikipedia/search/FullTextSearchClientTest.kt
@@ -91,7 +91,7 @@ class FullTextSearchClientTest : MockRetrofitTest() {
     }
 
     private suspend fun fullTextSearch(): MwQueryResponse {
-        return apiService.fullTextSearch("foo", null, BATCH_SIZE, null)
+        return apiService.fullTextSearch("foo", BATCH_SIZE, null)
     }
 
     companion object {
diff --git a/app/src/test/java/org/wikipedia/util/StringUtilTest.kt b/app/src/test/java/org/wikipedia/util/StringUtilTest.kt
index aafe763369c..0ca976b4877 100644
--- a/app/src/test/java/org/wikipedia/util/StringUtilTest.kt
+++ b/app/src/test/java/org/wikipedia/util/StringUtilTest.kt
@@ -74,12 +74,24 @@ class StringUtilTest {
         MatcherAssert.assertThat(StringUtil.removeUnderscores("te_st"), Matchers.`is`("te st"))
     }
 
+    @Test
+    fun testDbNameToLangCode() {
+        MatcherAssert.assertThat(StringUtil.dbNameToLangCode("en"), Matchers.`is`("en"))
+        MatcherAssert.assertThat(StringUtil.dbNameToLangCode("enwiki"), Matchers.`is`("en"))
+    }
+
     @Test
     fun testRemoveSectionAnchor() {
         MatcherAssert.assertThat(StringUtil.removeSectionAnchor("#te_st"), Matchers.`is`(""))
         MatcherAssert.assertThat(StringUtil.removeSectionAnchor("sec#te_st"), Matchers.`is`("sec"))
     }
 
+    @Test
+    fun testRemoveNamespace() {
+        MatcherAssert.assertThat(StringUtil.removeNamespace("RSP"), Matchers.`is`("RSP"))
+        MatcherAssert.assertThat(StringUtil.removeNamespace("WP:RSP"), Matchers.`is`("RSP"))
+    }
+
     @Test
     fun testRemoveHTMLTags() {
         MatcherAssert.assertThat(StringUtil.removeHTMLTags("<tag>te_st</tag>"), Matchers.`is`("te_st"))