diff --git a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/PdfViewerTestAccessors.kt b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/PdfViewerTestAccessors.kt
index 84f1465ae..01895ef45 100644
--- a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/PdfViewerTestAccessors.kt
+++ b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/PdfViewerTestAccessors.kt
@@ -44,3 +44,9 @@ var PdfViewer.outlineStatus: PdfViewModel.OutlineStatus
     set(value) {
         viewModel.setOutlineForTest(value)
     }
+
+var PdfViewer.zoomRatio: Float
+    get() = viewModel.zoomRatio.value
+    set(value) {
+        viewModel.setZoomRatio(value)
+    }
diff --git a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerNavigationTest.kt b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerNavigationTest.kt
index 46bf913c3..d37f6d200 100644
--- a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerNavigationTest.kt
+++ b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerNavigationTest.kt
@@ -3,6 +3,7 @@ package app.grapheneos.pdfviewer.test
 import android.app.Activity
 import android.app.Instrumentation
 import android.content.Intent
+import androidx.compose.ui.test.assertTextContains
 import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.test.core.app.ActivityScenario
@@ -10,17 +11,20 @@ import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.grapheneos.pdfviewer.PdfJsChannel.Companion.MAX_ZOOM_RATIO
+import app.grapheneos.pdfviewer.PdfJsChannel.Companion.MIN_ZOOM_RATIO
 import app.grapheneos.pdfviewer.PdfViewer
-import app.grapheneos.pdfviewer.testrules.RetryRules
 import app.grapheneos.pdfviewer.RetryableComposeRule
 import app.grapheneos.pdfviewer.TestTags
 import app.grapheneos.pdfviewer.currentPage
 import app.grapheneos.pdfviewer.documentName
 import app.grapheneos.pdfviewer.testrules.OrientationRules
+import app.grapheneos.pdfviewer.testrules.RetryRules
 import app.grapheneos.pdfviewer.totalPages
 import app.grapheneos.pdfviewer.util.PdfViewerLauncher
 import app.grapheneos.pdfviewer.util.PdfViewerRobot
 import app.grapheneos.pdfviewer.util.PdfViewerTestUtils
+import app.grapheneos.pdfviewer.zoomRatio
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -28,9 +32,11 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
+import kotlin.math.abs
+import kotlin.math.roundToInt
 
 /**
- * Page navigation and JumpToPage dialog.
+ * Page navigation, JumpToPage dialog and CustomZoomDialog.
  */
 @RunWith(AndroidJUnit4::class)
 class PdfViewerNavigationTest {
@@ -320,4 +326,140 @@ class PdfViewerNavigationTest {
             robot.assertMenuItemVisible(PdfViewerRobot.AppMenuItem.Outline, expected = true)
         }
     }
+
+    @Test
+    fun zoomButtons_menuStaysOpenAfterClick() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            robot.clickMenuZoomIn()
+            robot.assertZoomRowVisible()
+        }
+    }
+
+    @Test
+    fun zoomInButton_disabledAtMaxZoom() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            scenario.onActivity {
+                it.zoomRatio = MAX_ZOOM_RATIO
+            }
+            composeRule.waitForIdle()
+
+            robot.assertZoomInEnabled(false)
+            robot.assertZoomOutEnabled(true)
+        }
+    }
+
+    @Test
+    fun zoomOutButton_disabledAtMinZoom() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            scenario.onActivity {
+                it.zoomRatio = MIN_ZOOM_RATIO
+            }
+            composeRule.waitForIdle()
+
+            robot.assertZoomOutEnabled(false)
+            robot.assertZoomInEnabled(true)
+        }
+    }
+
+    @Test
+    fun customZoomDialog_opensWithCurrentZoom() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            val currentZoom = robot.getZoomRatio(scenario)
+            val expectedPercent = (currentZoom * 100).roundToInt()
+
+            robot.clickZoomPercentage()
+            robot.assertCustomZoomDialogText(expectedPercent)
+        }
+    }
+
+    @Test
+    fun customZoomDialog_okAppliesZoom() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            robot.clickZoomPercentage()
+            robot.setCustomZoomValue(200)
+            robot.clickDialogOk()
+
+            PdfViewerTestUtils.pollUntil(
+                description = {
+                    "Zoom ratio should be 2.0 after custom zoom " +
+                            "(was ${robot.getZoomRatio(scenario)})"
+                }
+            ) {
+                abs(robot.getZoomRatio(scenario) - 2.0f) < 0.01f
+            }
+        }
+    }
+
+    @Test
+    fun customZoomDialog_cancelDoesNotChangeZoom() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            val initialZoom = robot.getZoomRatio(scenario)
+
+            robot.clickZoomPercentage()
+            robot.setCustomZoomValue(200)
+            robot.clickDialogCancel()
+            composeRule.waitForIdle()
+
+            val afterZoom = robot.getZoomRatio(scenario)
+            assertEquals(
+                "Zoom should not change after dialog cancel",
+                initialZoom, afterZoom, 0.001f
+            )
+        }
+    }
+
+    @Test
+    fun customZoomDialog_prefilledValueIsSelected_typingReplaces() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            robot.clickZoomPercentage()
+            robot.typeCustomZoom(200)
+
+            composeRule.onNodeWithTag(TestTags.CUSTOM_ZOOM_FIELD)
+                .assertTextContains("200")
+
+            robot.clickDialogOk()
+
+            PdfViewerTestUtils.pollUntil(
+                description = {
+                    "Zoom ratio should be 2.0 after typing replacement " +
+                            "(was ${robot.getZoomRatio(scenario)})"
+                }
+            ) {
+                abs(robot.getZoomRatio(scenario) - 2.0f) < 0.01f
+            }
+        }
+    }
+
+    @Test
+    fun customZoomDialog_rejectsInvalidInput() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            robot.clickZoomPercentage()
+            robot.setCustomZoomValue(0)
+            robot.assertDialogOkEnabled(false)
+        }
+    }
 }
diff --git a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerRenderTest.kt b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerRenderTest.kt
index 709c0478b..4cf937401 100644
--- a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerRenderTest.kt
+++ b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/test/PdfViewerRenderTest.kt
@@ -2,11 +2,11 @@ package app.grapheneos.pdfviewer.test
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.grapheneos.pdfviewer.PdfJsChannel.Companion.MIN_ZOOM_RATIO
-import app.grapheneos.pdfviewer.testrules.RetryRules
 import app.grapheneos.pdfviewer.RetryableComposeRule
 import app.grapheneos.pdfviewer.currentPage
 import app.grapheneos.pdfviewer.documentProperties
 import app.grapheneos.pdfviewer.testrules.OrientationRules
+import app.grapheneos.pdfviewer.testrules.RetryRules
 import app.grapheneos.pdfviewer.totalPages
 import app.grapheneos.pdfviewer.util.PdfViewerLauncher
 import app.grapheneos.pdfviewer.util.PdfViewerRobot
@@ -275,6 +275,79 @@ class PdfViewerRenderTest {
         }
     }
 
+    @Test
+    fun buttonZoomIn_increasesDimensionsAndPreservesTextLayer() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            val initialWidth = robot.getCanvasCssWidth(scenario)
+            val initialHeight = robot.getCanvasCssHeight(scenario)
+
+            robot.clickMenuZoomIn()
+
+            PdfViewerTestUtils.waitForCanvasCssDimensionsChanged(
+                scenario, initialWidth, initialHeight
+            )
+
+            val zoomedWidth = robot.getCanvasCssWidth(scenario)
+            val zoomedHeight = robot.getCanvasCssHeight(scenario)
+            assertTrue(
+                "Canvas CSS width should increase after menu button zoom in " +
+                        "($initialWidth → $zoomedWidth)",
+                zoomedWidth > initialWidth
+            )
+            assertTrue(
+                "Canvas CSS height should increase after menu button zoom in " +
+                        "($initialHeight → $zoomedHeight)",
+                zoomedHeight > initialHeight
+            )
+
+            PdfViewerTestUtils.assertTextLayerContent(scenario, "Test Text")
+            robot.assertTextLayerAligned(scenario)
+        }
+    }
+
+    @Test
+    fun buttonZoomOut_decreasesDimensionsAndPreservesTextLayer() {
+        PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
+            PdfViewerTestUtils.waitForDocumentFullyLoaded(scenario)
+            PdfViewerTestUtils.waitForCanvasRendered(scenario)
+
+            val defaultWidth = robot.getCanvasCssWidth(scenario)
+            val defaultHeight = robot.getCanvasCssHeight(scenario)
+
+            robot.clickMenuZoomIn()
+            PdfViewerTestUtils.waitForCanvasCssDimensionsChanged(
+                scenario, defaultWidth, defaultHeight
+            )
+
+            val zoomedInWidth = robot.getCanvasCssWidth(scenario)
+            val zoomedInHeight = robot.getCanvasCssHeight(scenario)
+
+            robot.clickMenuZoomOut()
+            PdfViewerTestUtils.waitForCanvasCssDimensionsChanged(
+                scenario, zoomedInWidth, zoomedInHeight
+            )
+
+            val zoomedOutWidth = robot.getCanvasCssWidth(scenario)
+            val zoomedOutHeight = robot.getCanvasCssHeight(scenario)
+            assertTrue(
+                "Canvas CSS width should decrease after menu button zoom out " +
+                        "($zoomedInWidth → $zoomedOutWidth)",
+                zoomedOutWidth < zoomedInWidth
+            )
+            assertTrue(
+                "Canvas CSS height should decrease after menu button zoom out " +
+                        "($zoomedInHeight → $zoomedOutHeight)",
+                zoomedOutHeight < zoomedInHeight
+            )
+
+            PdfViewerTestUtils.assertTextLayerContent(scenario, "Test Text")
+            robot.assertTextLayerAligned(scenario)
+        }
+    }
+
     @Test
     fun documentPropertiesDialog_showsExpectedRows() {
         PdfViewerLauncher.launchWithTestAsset("test-simple.pdf").use { scenario ->
diff --git a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/util/PdfViewerRobot.kt b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/util/PdfViewerRobot.kt
index f357bf01d..2fc2c4dbb 100644
--- a/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/util/PdfViewerRobot.kt
+++ b/app/src/androidTest/kotlin/app/grapheneos/pdfviewer/util/PdfViewerRobot.kt
@@ -10,6 +10,7 @@ import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertTextContains
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onAllNodesWithContentDescription
 import androidx.compose.ui.test.onAllNodesWithTag
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
@@ -559,6 +560,75 @@ class PdfViewerRobot(private val composeRule: ComposeTestRule) {
         return result.toFloat()
     }
 
+    private fun ensureOverflowMenuOpen() {
+        val zoomInDesc = getTargetContext().getString(R.string.zoom_in)
+        val nodes = composeRule.onAllNodesWithContentDescription(zoomInDesc)
+            .fetchSemanticsNodes()
+        if (nodes.isEmpty()) {
+            composeRule.onNodeWithContentDescription(TestTags.OVERFLOW_MENU).performClick()
+            composeRule.waitForIdle()
+        }
+    }
+
+    fun clickMenuZoomIn() {
+        ensureOverflowMenuOpen()
+        val desc = getTargetContext().getString(R.string.zoom_in)
+        composeRule.onNodeWithContentDescription(desc).performClick()
+        composeRule.waitForIdle()
+    }
+
+    fun clickMenuZoomOut() {
+        ensureOverflowMenuOpen()
+        val desc = getTargetContext().getString(R.string.zoom_out)
+        composeRule.onNodeWithContentDescription(desc).performClick()
+        composeRule.waitForIdle()
+    }
+
+    fun clickZoomPercentage() {
+        ensureOverflowMenuOpen()
+        composeRule.onNodeWithTag(TestTags.ZOOM_PERCENTAGE).performClick()
+        composeRule.waitForIdle()
+    }
+
+    fun assertZoomInEnabled(enabled: Boolean) {
+        ensureOverflowMenuOpen()
+        val desc = getTargetContext().getString(R.string.zoom_in)
+        val node = composeRule.onNodeWithContentDescription(desc)
+        if (enabled) node.assertIsEnabled() else node.assertIsNotEnabled()
+    }
+
+    fun assertZoomOutEnabled(enabled: Boolean) {
+        ensureOverflowMenuOpen()
+        val desc = getTargetContext().getString(R.string.zoom_out)
+        val node = composeRule.onNodeWithContentDescription(desc)
+        if (enabled) node.assertIsEnabled() else node.assertIsNotEnabled()
+    }
+
+    fun assertZoomRowVisible() {
+        val desc = getTargetContext().getString(R.string.zoom_in)
+        composeRule.onNodeWithContentDescription(desc).assertIsDisplayed()
+    }
+
+    fun assertCustomZoomDialogText(currentPercent: Int) {
+        composeRule.onNodeWithTag(TestTags.CUSTOM_ZOOM_FIELD)
+            .assertTextContains(currentPercent.toString())
+    }
+
+    fun setCustomZoomValue(value: Int) {
+        composeRule.onNodeWithTag(TestTags.CUSTOM_ZOOM_FIELD).performTextClearance()
+        composeRule.onNodeWithTag(TestTags.CUSTOM_ZOOM_FIELD).performTextInput(value.toString())
+    }
+
+    fun typeCustomZoom(value: Int) {
+        composeRule.onNodeWithTag(TestTags.CUSTOM_ZOOM_FIELD).performTextInput(value.toString())
+    }
+
+    fun assertDialogOkEnabled(enabled: Boolean) {
+        val text = getTargetContext().getString(android.R.string.ok)
+        val node = composeRule.onNodeWithText(text)
+        if (enabled) node.assertIsEnabled() else node.assertIsNotEnabled()
+    }
+
     // Text layer alignment
 
     fun assertTextLayerAligned(scenario: ActivityScenario<PdfViewer>) {
diff --git a/app/src/main/java/app/grapheneos/pdfviewer/PdfJsChannel.kt b/app/src/main/java/app/grapheneos/pdfviewer/PdfJsChannel.kt
index b192837e2..7537e4198 100644
--- a/app/src/main/java/app/grapheneos/pdfviewer/PdfJsChannel.kt
+++ b/app/src/main/java/app/grapheneos/pdfviewer/PdfJsChannel.kt
@@ -25,11 +25,11 @@ class PdfJsChannel(private val viewModel: PdfViewModel) {
     fun getPage(): Int = viewModel.page.value
 
     @JavascriptInterface
-    fun getZoomRatio(): Float = viewModel.zoomRatio
+    fun getZoomRatio(): Float = viewModel.zoomRatio.value
 
     @JavascriptInterface
     fun setZoomRatio(ratio: Float) {
-        viewModel.zoomRatio = ratio.coerceIn(MIN_ZOOM_RATIO, MAX_ZOOM_RATIO)
+        viewModel.setZoomRatio(ratio.coerceIn(MIN_ZOOM_RATIO, MAX_ZOOM_RATIO))
     }
 
     @JavascriptInterface
diff --git a/app/src/main/java/app/grapheneos/pdfviewer/PdfViewerScreen.kt b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewerScreen.kt
index b96c5ceed..a2cfb2230 100644
--- a/app/src/main/java/app/grapheneos/pdfviewer/PdfViewerScreen.kt
+++ b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewerScreen.kt
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.icu.text.DecimalFormatSymbols
+import android.icu.text.NumberFormat
 import android.util.Log
 import android.view.MotionEvent
 import android.view.ViewConfiguration
@@ -24,8 +26,10 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
@@ -57,12 +61,14 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
@@ -77,6 +83,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
@@ -84,6 +91,9 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.buildAnnotatedString
@@ -97,6 +107,7 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.DialogProperties
+import androidx.core.os.ConfigurationCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
@@ -113,14 +124,28 @@ import app.grapheneos.pdfviewer.viewModel.PdfViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.io.InputStream
+import java.util.Locale
 import kotlin.math.abs
+import kotlin.math.roundToInt
 
 private const val TAG = "PdfViewerScreen"
 private const val MIN_WEBVIEW_RELEASE = 133
+private val ZOOM_PRESETS = intArrayOf(25, 50, 75, 100, 125, 150, 200, 300, 500, 750, 1000)
+
+private fun nextZoomPreset(ratio: Float): Float? {
+    val currentPercent = (ratio * 100).roundToInt()
+    return ZOOM_PRESETS.firstOrNull { it > currentPercent }?.let { it / 100f }
+}
+
+private fun previousZoomPreset(ratio: Float): Float? {
+    val currentPercent = (ratio * 100).roundToInt()
+    return ZOOM_PRESETS.lastOrNull { it < currentPercent }?.let { it / 100f }
+}
 
 private const val CONTENT_SECURITY_POLICY =
     "default-src 'none'; " +
@@ -227,6 +252,7 @@ fun PdfViewerScreen(
     var showOutline by rememberSaveable { mutableStateOf(false) }
     var showJumpToPage by rememberSaveable { mutableStateOf(false) }
     var showDocProperties by rememberSaveable { mutableStateOf(false) }
+    var showCustomZoom by rememberSaveable { mutableStateOf(false) }
     var showMenu by remember { mutableStateOf(false) }
     var webViewRelease by remember { mutableIntStateOf(getWebViewRelease()) }
     val webViewOk = webViewRelease >= MIN_WEBVIEW_RELEASE
@@ -349,8 +375,10 @@ fun PdfViewerScreen(
             }
 
             override fun onZoom(scaleFactor: Float, focusX: Float, focusY: Float) {
-                viewModel.zoomRatio = (viewModel.zoomRatio * scaleFactor)
-                    .coerceIn(MIN_ZOOM_RATIO, MAX_ZOOM_RATIO)
+                viewModel.setZoomRatio(
+                    (viewModel.zoomRatio.value * scaleFactor)
+                        .coerceIn(MIN_ZOOM_RATIO, MAX_ZOOM_RATIO)
+                )
                 viewModel.zoomFocusX = focusX
                 viewModel.zoomFocusY = focusY
                 wv.evaluateJavascript("onRenderPage(2)", null)
@@ -497,6 +525,18 @@ fun PdfViewerScreen(
                 onJumpToPage = { showJumpToPage = true },
                 onRotateClockwise = { rotateDocument(viewModel, webView, 90) },
                 onRotateCounterClockwise = { rotateDocument(viewModel, webView, -90) },
+                zoomRatioFlow = viewModel.zoomRatio,
+                onZoomIn = {
+                    nextZoomPreset(viewModel.zoomRatio.value)?.let { preset ->
+                        zoomDocument(viewModel, webView, preset)
+                    }
+                },
+                onZoomOut = {
+                    previousZoomPreset(viewModel.zoomRatio.value)?.let { preset ->
+                        zoomDocument(viewModel, webView, preset)
+                    }
+                },
+                onCustomZoom = { showCustomZoom = true },
                 onOutline = { showOutline = true },
                 onShare = { shareDocument(context, viewModel) },
                 onSaveAs = {
@@ -568,6 +608,18 @@ fun PdfViewerScreen(
         }
     }
 
+    if (showCustomZoom) {
+        val currentZoom = remember { viewModel.zoomRatio.value }
+        CustomZoomDialog(
+            currentZoomRatio = currentZoom,
+            onZoom = { newRatio ->
+                showCustomZoom = false
+                zoomDocument(viewModel, webView, newRatio)
+            },
+            onDismiss = { showCustomZoom = false }
+        )
+    }
+
     if (showJumpToPage && hasPages) {
         JumpToPageDialog(
             currentPage = page,
@@ -730,6 +782,12 @@ private fun rotateDocument(viewModel: PdfViewModel, webView: WebView?, offset: I
     webView.evaluateJavascript("onRenderPage(0)", null)
 }
 
+private fun zoomDocument(viewModel: PdfViewModel, webView: WebView?, ratio: Float) {
+    webView ?: return
+    viewModel.setZoomRatio(ratio.coerceIn(MIN_ZOOM_RATIO, MAX_ZOOM_RATIO))
+    webView.evaluateJavascript("onRenderPage(1)", null)
+}
+
 private fun shareDocument(context: Context, viewModel: PdfViewModel) {
     val uri = viewModel.uri.value ?: return
     val shareIntent = Intent(Intent.ACTION_SEND).apply {
@@ -772,6 +830,10 @@ private fun PdfTopAppBar(
     onJumpToPage: () -> Unit,
     onRotateClockwise: () -> Unit,
     onRotateCounterClockwise: () -> Unit,
+    zoomRatioFlow: StateFlow<Float>,
+    onZoomIn: () -> Unit,
+    onZoomOut: () -> Unit,
+    onCustomZoom: () -> Unit,
     onOutline: () -> Unit,
     onShare: () -> Unit,
     onSaveAs: () -> Unit,
@@ -802,7 +864,7 @@ private fun PdfTopAppBar(
 
             IconButton(onClick = onOpen, enabled = !webViewCrashed && webViewOk) {
                 Icon(
-                    painterResource(R.drawable.ic_insert_drive_file_24dp),
+                    painterResource(R.drawable.ic_open_file_24dp),
                     contentDescription = stringResource(R.string.action_open)
                 )
             }
@@ -875,6 +937,13 @@ private fun PdfTopAppBar(
                             )
                         }
                     )
+                    ZoomRow(
+                        zoomRatioFlow = zoomRatioFlow,
+                        onZoomIn = onZoomIn,
+                        onZoomOut = onZoomOut,
+                        onCustomZoom = { onMenuToggle(false); onCustomZoom() },
+                        enabled = enabled
+                    )
                     if (hasOutline) {
                         DropdownMenuItem(
                             text = { Text(stringResource(R.string.action_outline)) },
@@ -946,39 +1015,184 @@ private fun WebViewAlertScreen(
     onReload: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.padding(32.dp)
+    Surface(modifier = modifier.fillMaxSize()) {
+        Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier.padding(32.dp)
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_error_24dp),
+                    contentDescription = null,
+                    modifier = Modifier.size(64.dp),
+                    tint = MaterialTheme.colorScheme.primary
+                )
+                Text(
+                    text = title,
+                    style = MaterialTheme.typography.titleLarge,
+                    modifier = Modifier.padding(top = 8.dp)
+                )
+                Text(
+                    text = message,
+                    style = MaterialTheme.typography.bodyMedium,
+                    modifier = Modifier.padding(top = 8.dp)
+                )
+                if (showReload) {
+                    Button(
+                        onClick = onReload,
+                        modifier = Modifier
+                            .padding(top = 8.dp)
+                            .testTag(TestTags.RELOAD_BUTTON)
+                    ) {
+                        Text(stringResource(R.string.reload))
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ZoomRow(
+    zoomRatioFlow: StateFlow<Float>,
+    onZoomIn: () -> Unit,
+    onZoomOut: () -> Unit,
+    onCustomZoom: () -> Unit,
+    enabled: Boolean
+) {
+    val zoomRatio by zoomRatioFlow.collectAsStateWithLifecycle()
+    if (zoomRatio <= 0f) return
+
+    val locale = currentLocale()
+    val zoomFormat = remember(locale) { NumberFormat.getPercentInstance(locale) }
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        IconButton(
+            onClick = onZoomOut,
+            enabled = enabled && previousZoomPreset(zoomRatio) != null
         ) {
             Icon(
-                painter = painterResource(R.drawable.ic_error_outline_24dp),
-                contentDescription = null,
-                modifier = Modifier.size(64.dp),
-                tint = MaterialTheme.colorScheme.primary
+                painterResource(R.drawable.ic_remove_24dp),
+                contentDescription = stringResource(R.string.zoom_out)
             )
-            Text(
-                text = title,
-                style = MaterialTheme.typography.titleLarge,
-                modifier = Modifier.padding(top = 8.dp)
+        }
+
+        TextButton(
+            onClick = onCustomZoom,
+            enabled = enabled,
+            modifier = Modifier.testTag(TestTags.ZOOM_PERCENTAGE)
+            .semantics { liveRegion = LiveRegionMode.Polite }
+        ) {
+            Text(zoomFormat.format(zoomRatio))
+        }
+
+        IconButton(
+            onClick = onZoomIn,
+            enabled = enabled && nextZoomPreset(zoomRatio) != null
+        ) {
+            Icon(
+                painterResource(R.drawable.ic_add_24dp),
+                contentDescription = stringResource(R.string.zoom_in)
             )
-            Text(
-                text = message,
-                style = MaterialTheme.typography.bodyMedium,
-                modifier = Modifier.padding(top = 8.dp)
+        }
+    }
+}
+
+@Composable
+private fun CustomZoomDialog(
+    currentZoomRatio: Float,
+    onZoom: (Float) -> Unit,
+    onDismiss: () -> Unit
+) {
+    val minPercent = (MIN_ZOOM_RATIO * 100).roundToInt()
+    val maxPercent = (MAX_ZOOM_RATIO * 100).roundToInt()
+    val maxLength = maxPercent.toString().length
+
+    val locale = currentLocale()
+    val percentSymbol = remember(locale) {
+        DecimalFormatSymbols.getInstance(locale).percent.toString()
+    }
+    val percentIsPrefix = remember(locale) {
+        val formatted = NumberFormat.getPercentInstance(locale).format(1)
+        val digitIndex = formatted.indexOfFirst { it.isDigit() }
+        val symbolIndex = formatted.indexOfFirst { !it.isDigit() && !it.isWhitespace() }
+        symbolIndex in 0 until digitIndex
+    }
+
+    var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        val initial = (currentZoomRatio * 100).roundToInt().toString()
+        mutableStateOf(
+            TextFieldValue(
+                text = initial,
+                selection = TextRange(0, initial.length)
             )
-            if (showReload) {
-                Button(
-                    onClick = onReload,
+        )
+    }
+    val parsed = textFieldValue.text.toIntOrNull()
+    val isValid = parsed != null && parsed in minPercent..maxPercent
+    val focusRequester = remember { FocusRequester() }
+
+    LaunchedEffect(Unit) {
+        focusRequester.requestFocus()
+    }
+
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        confirmButton = {
+            TextButton(
+                onClick = { parsed?.let { onZoom(it / 100f) } },
+                enabled = isValid
+            ) {
+                Text(stringResource(android.R.string.ok))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(android.R.string.cancel))
+            }
+        },
+        title = { Text(stringResource(R.string.zoom)) },
+        text = {
+            Column {
+                Text(stringResource(R.string.zoom_range, minPercent, maxPercent))
+                OutlinedTextField(
+                    value = textFieldValue,
+                    onValueChange = { newValue ->
+                        val filtered = newValue.text.filter { it.isDigit() }.take(maxLength)
+                        textFieldValue = if (filtered == newValue.text) {
+                            newValue
+                        } else {
+                            newValue.copy(
+                                text = filtered,
+                                selection = TextRange(
+                                    minOf(newValue.selection.end, filtered.length)
+                                )
+                            )
+                        }
+                    },
+                    singleLine = true,
+                    isError = textFieldValue.text.isNotEmpty() && !isValid,
+                    prefix = if (percentIsPrefix) ({ Text(percentSymbol) }) else null,
+                    suffix = if (percentIsPrefix) null else ({ Text(percentSymbol) }),
+                    keyboardOptions = KeyboardOptions(
+                        keyboardType = KeyboardType.Number,
+                        imeAction = ImeAction.Done
+                    ),
+                    keyboardActions = KeyboardActions(
+                        onDone = { if (isValid) onZoom(parsed / 100f) }
+                    ),
                     modifier = Modifier
+                        .fillMaxWidth()
                         .padding(top = 8.dp)
-                        .testTag(TestTags.RELOAD_BUTTON)
-                ) {
-                    Text(stringResource(R.string.reload))
-                }
+                        .focusRequester(focusRequester)
+                        .testTag(TestTags.CUSTOM_ZOOM_FIELD)
+                )
             }
         }
-    }
+    )
 }
 
 @Composable
@@ -1211,3 +1425,10 @@ private fun PasswordPromptDialog(
         }
     )
 }
+
+@Composable
+@ReadOnlyComposable
+@SuppressLint("NonObservableLocale")
+private fun currentLocale(): Locale =
+    ConfigurationCompat.getLocales(LocalConfiguration.current)[0]
+        ?: Locale.getDefault()
diff --git a/app/src/main/java/app/grapheneos/pdfviewer/TestTags.kt b/app/src/main/java/app/grapheneos/pdfviewer/TestTags.kt
index 84b635801..19d1ea396 100644
--- a/app/src/main/java/app/grapheneos/pdfviewer/TestTags.kt
+++ b/app/src/main/java/app/grapheneos/pdfviewer/TestTags.kt
@@ -8,4 +8,6 @@ object TestTags {
     const val OUTLINE_ITEM = "outline_item"
     const val OVERFLOW_MENU = "overflow_menu"
     const val JUMP_TO_PAGE_FIELD = "jump_to_page_field"
+    const val CUSTOM_ZOOM_FIELD = "custom_zoom_field"
+    const val ZOOM_PERCENTAGE = "zoom_percentage"
 }
diff --git a/app/src/main/java/app/grapheneos/pdfviewer/viewModel/PdfViewModel.kt b/app/src/main/java/app/grapheneos/pdfviewer/viewModel/PdfViewModel.kt
index 64d30d8c2..39baf6758 100644
--- a/app/src/main/java/app/grapheneos/pdfviewer/viewModel/PdfViewModel.kt
+++ b/app/src/main/java/app/grapheneos/pdfviewer/viewModel/PdfViewModel.kt
@@ -189,7 +189,10 @@ class PdfViewModel(
         }
     }
 
-    @Volatile var zoomRatio: Float = 0f
+    private val _zoomRatio = MutableStateFlow(0f)
+    val zoomRatio: StateFlow<Float> = _zoomRatio.asStateFlow()
+    fun setZoomRatio(value: Float) { _zoomRatio.value = value }
+
     @Volatile var encryptedDocumentPassword: String = ""
     @Volatile var zoomFocusX = 0f
     @Volatile var zoomFocusY = 0f
@@ -283,7 +286,7 @@ class PdfViewModel(
     fun resetDocumentState() {
         setPage(1)
         _numPages.value = 0
-        zoomRatio = 0f
+        _zoomRatio.value = 0f
         setDocumentOrientationDegrees(0)
         encryptedDocumentPassword = ""
         clearOutline()
@@ -294,7 +297,7 @@ class PdfViewModel(
     fun prepareForLoad() {
         documentPropertiesLoaded.set(false)
         _documentLoaded.value = false
-        zoomRatio = 0f
+        _zoomRatio.value = 0f
     }
 
     fun handleLoadError() {
diff --git a/app/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml
new file mode 100644
index 000000000..d6fd3d379
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_error_24dp.xml b/app/src/main/res/drawable/ic_error_24dp.xml
new file mode 100644
index 000000000..8d8153d21
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680Q497,680 508.5,668.5ZM440,520L520,520L520,280L440,280L440,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_error_outline_24dp.xml b/app/src/main/res/drawable/ic_error_outline_24dp.xml
deleted file mode 100644
index 9b8c530d5..000000000
--- a/app/src/main/res/drawable/ic_error_outline_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M12,7c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,8c0,-0.55 0.45,-1 1,-1zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM13,17h-2v-2h2v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_first_page_24dp.xml b/app/src/main/res/drawable/ic_first_page_24dp.xml
index 59d6aa5d6..96866b8b2 100644
--- a/app/src/main/res/drawable/ic_first_page_24dp.xml
+++ b/app/src/main/res/drawable/ic_first_page_24dp.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M17.7,15.89L13.82,12l3.89,-3.89c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0l-4.59,4.59c-0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0 0.38,-0.38 0.38,-1.02 -0.01,-1.4zM7,6c0.55,0 1,0.45 1,1v10c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V7c0,-0.55 0.45,-1 1,-1z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,720L240,240L320,240L320,720L240,720ZM680,720L440,480L680,240L736,296L552,480L736,664L680,720Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_insert_drive_file_24dp.xml b/app/src/main/res/drawable/ic_insert_drive_file_24dp.xml
deleted file mode 100644
index d35c045dd..000000000
--- a/app/src/main/res/drawable/ic_insert_drive_file_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8.83c0,-0.53 -0.21,-1.04 -0.59,-1.41l-4.83,-4.83c-0.37,-0.38 -0.88,-0.59 -1.41,-0.59L6,2zM13,8L13,3.5L18.5,9L14,9c-0.55,0 -1,-0.45 -1,-1z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_last_page_24dp.xml b/app/src/main/res/drawable/ic_last_page_24dp.xml
index 4807df630..59f6a194a 100644
--- a/app/src/main/res/drawable/ic_last_page_24dp.xml
+++ b/app/src/main/res/drawable/ic_last_page_24dp.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M6.29,8.11L10.18,12l-3.89,3.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41L7.7,6.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.38,0.39 -0.38,1.03 0,1.41zM17,6c0.55,0 1,0.45 1,1v10c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V7c0,-0.55 0.45,-1 1,-1z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,720L224,664L408,480L224,296L280,240L520,480L280,720ZM640,720L640,240L720,240L720,720L640,720Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_navigate_before_24dp.xml b/app/src/main/res/drawable/ic_navigate_before_24dp.xml
index e2334073e..7c486f849 100644
--- a/app/src/main/res/drawable/ic_navigate_before_24dp.xml
+++ b/app/src/main/res/drawable/ic_navigate_before_24dp.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M14.91,6.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L8.91,11.3c-0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L11.03,12l3.88,-3.88c0.38,-0.39 0.38,-1.03 0,-1.41z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M560,720L320,480L560,240L616,296L432,480L616,664L560,720Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_navigate_next_24dp.xml b/app/src/main/res/drawable/ic_navigate_next_24dp.xml
index f7f29d69d..3d036ecb1 100644
--- a/app/src/main/res/drawable/ic_navigate_next_24dp.xml
+++ b/app/src/main/res/drawable/ic_navigate_next_24dp.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M9.31,6.71c-0.39,0.39 -0.39,1.02 0,1.41L13.19,12l-3.88,3.88c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41L10.72,6.7c-0.38,-0.38 -1.02,-0.38 -1.41,0.01z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_open_file_24dp.xml b/app/src/main/res/drawable/ic_open_file_24dp.xml
new file mode 100644
index 000000000..c94ebed36
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_file_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,560L720,560L720,360L520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L600,800L600,880L240,880ZM878,895L760,777L760,866L680,866L680,640L906,640L906,720L816,720L934,838L878,895ZM240,800L240,560L240,560L240,360L240,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_bulletlist_24dp.xml b/app/src/main/res/drawable/ic_outline_bulletlist_24dp.xml
index 98fba8cee..4889f4fbe 100644
--- a/app/src/main/res/drawable/ic_outline_bulletlist_24dp.xml
+++ b/app/src/main/res/drawable/ic_outline_bulletlist_24dp.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M360,760L360,680L840,680L840,760L360,760ZM360,520L360,440L840,440L840,520L360,520ZM360,280L360,200L840,200L840,280L360,280ZM200,800Q167,800 143.5,776.5Q120,753 120,720Q120,687 143.5,663.5Q167,640 200,640Q233,640 256.5,663.5Q280,687 280,720Q280,753 256.5,776.5Q233,800 200,800ZM200,560Q167,560 143.5,536.5Q120,513 120,480Q120,447 143.5,423.5Q167,400 200,400Q233,400 256.5,423.5Q280,447 280,480Q280,513 256.5,536.5Q233,560 200,560ZM143.5,296.5Q120,273 120,240Q120,207 143.5,183.5Q167,160 200,160Q233,160 256.5,183.5Q280,207 280,240Q280,273 256.5,296.5Q233,320 200,320Q167,320 143.5,296.5Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pageview_24dp.xml b/app/src/main/res/drawable/ic_pageview_24dp.xml
index 8a3ce2ddb..c4f8a34a1 100644
--- a/app/src/main/res/drawable/ic_pageview_24dp.xml
+++ b/app/src/main/res/drawable/ic_pageview_24dp.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M11.5,9C10.12,9 9,10.12 9,11.5s1.12,2.5 2.5,2.5 2.5,-1.12 2.5,-2.5S12.88,9 11.5,9zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM16.08,17.5l-2.2,-2.2c-0.9,0.58 -2.03,0.84 -3.22,0.62 -1.88,-0.35 -3.38,-1.93 -3.62,-3.83 -0.38,-3.01 2.18,-5.52 5.21,-5.04 1.88,0.3 3.39,1.84 3.7,3.71 0.19,1.16 -0.08,2.23 -0.64,3.12l2.2,2.19c0.39,0.39 0.39,1.03 0,1.42 -0.4,0.4 -1.04,0.4 -1.43,0.01z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M630,800L160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L744,800L556,612Q535,626 510.5,633Q486,640 460,640Q385,640 332.5,587.5Q280,535 280,460Q280,385 332.5,332.5Q385,280 460,280Q535,280 587.5,332.5Q640,385 640,460Q640,487 633,511Q626,535 612,556L776,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L550,720L630,800ZM531,531Q560,502 560,460Q560,418 531,389Q502,360 460,360Q418,360 389,389Q360,418 360,460Q360,502 389,531Q418,560 460,560Q502,560 531,531ZM160,720L160,720Q160,720 160,720Q160,720 160,720L160,720L160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L160,720Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_remove_24dp.xml b/app/src/main/res/drawable/ic_remove_24dp.xml
new file mode 100644
index 000000000..46c12d354
--- /dev/null
+++ b/app/src/main/res/drawable/ic_remove_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,520L200,440L760,440L760,520L200,520Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_rotate_left_24dp.xml b/app/src/main/res/drawable/ic_rotate_left_24dp.xml
index 17773435f..b357ca8c8 100644
--- a/app/src/main/res/drawable/ic_rotate_left_24dp.xml
+++ b/app/src/main/res/drawable/ic_rotate_left_24dp.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M6.56,7.98C6.1,7.52 5.31,7.6 5,8.17c-0.28,0.51 -0.5,1.03 -0.67,1.58 -0.19,0.63 0.31,1.25 0.96,1.25h0.01c0.43,0 0.82,-0.28 0.94,-0.7 0.12,-0.4 0.28,-0.79 0.48,-1.17 0.22,-0.37 0.15,-0.84 -0.16,-1.15zM5.31,13h-0.02c-0.65,0 -1.15,0.62 -0.96,1.25 0.16,0.54 0.38,1.07 0.66,1.58 0.31,0.57 1.11,0.66 1.57,0.2 0.3,-0.31 0.38,-0.77 0.17,-1.15 -0.2,-0.37 -0.36,-0.76 -0.48,-1.16 -0.12,-0.44 -0.51,-0.72 -0.94,-0.72zM8.16,19.02c0.51,0.28 1.04,0.5 1.59,0.66 0.62,0.18 1.24,-0.32 1.24,-0.96v-0.03c0,-0.43 -0.28,-0.82 -0.7,-0.94 -0.4,-0.12 -0.78,-0.28 -1.15,-0.48 -0.38,-0.21 -0.86,-0.14 -1.16,0.17l-0.03,0.03c-0.45,0.45 -0.36,1.24 0.21,1.55zM13,4.07v-0.66c0,-0.89 -1.08,-1.34 -1.71,-0.71L9.17,4.83c-0.4,0.4 -0.4,1.04 0,1.43l2.13,2.08c0.63,0.62 1.7,0.17 1.7,-0.72L13,6.09c2.84,0.48 5,2.94 5,5.91 0,2.73 -1.82,5.02 -4.32,5.75 -0.41,0.12 -0.68,0.51 -0.68,0.94v0.02c0,0.65 0.61,1.14 1.23,0.96C17.57,18.71 20,15.64 20,12c0,-4.08 -3.05,-7.44 -7,-7.93z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,880Q390,875 344,855.5Q298,836 256,804L312,746Q341,767 373.5,780Q406,793 440,798L440,880ZM520,880L520,798Q624,783 692,704.5Q760,626 760,522Q760,405 678.5,323.5Q597,242 480,242L472,242L536,306L480,362L320,202L480,42L536,100L474,162L480,162Q555,162 620.5,190.5Q686,219 734.5,267.5Q783,316 811.5,381.5Q840,447 840,522Q840,659 749,760.5Q658,862 520,880ZM198,746Q166,704 146.5,658Q127,612 122,562L204,562Q209,596 222,628.5Q235,661 256,690L198,746ZM122,482Q128,431 147,384Q166,337 198,298L256,354Q235,383 222,415.5Q209,448 204,482L122,482Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_rotate_right_24dp.xml b/app/src/main/res/drawable/ic_rotate_right_24dp.xml
index 5b80f8ea8..796b0a344 100644
--- a/app/src/main/res/drawable/ic_rotate_right_24dp.xml
+++ b/app/src/main/res/drawable/ic_rotate_right_24dp.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M14.83,4.83L12.7,2.7c-0.62,-0.62 -1.7,-0.18 -1.7,0.71v0.66C7.06,4.56 4,7.92 4,12c0,3.64 2.43,6.71 5.77,7.68 0.62,0.18 1.23,-0.32 1.23,-0.96v-0.03c0,-0.43 -0.27,-0.82 -0.68,-0.94C7.82,17.03 6,14.73 6,12c0,-2.97 2.16,-5.43 5,-5.91v1.53c0,0.89 1.07,1.33 1.7,0.71l2.13,-2.08c0.4,-0.38 0.4,-1.02 0,-1.42zM19.67,9.76c-0.16,-0.55 -0.38,-1.08 -0.66,-1.59 -0.31,-0.57 -1.1,-0.66 -1.56,-0.2l-0.01,0.01c-0.31,0.31 -0.38,0.78 -0.17,1.16 0.2,0.37 0.36,0.76 0.48,1.16 0.12,0.42 0.51,0.7 0.94,0.7h0.02c0.65,0 1.15,-0.62 0.96,-1.24zM13,18.68v0.02c0,0.65 0.62,1.14 1.24,0.96 0.55,-0.16 1.08,-0.38 1.59,-0.66 0.57,-0.31 0.66,-1.1 0.2,-1.56l-0.02,-0.02c-0.31,-0.31 -0.78,-0.38 -1.16,-0.17 -0.37,0.21 -0.76,0.37 -1.16,0.49 -0.41,0.12 -0.69,0.51 -0.69,0.94zM17.44,16.03c0.46,0.46 1.25,0.37 1.56,-0.2 0.28,-0.51 0.5,-1.04 0.67,-1.59 0.18,-0.62 -0.31,-1.24 -0.96,-1.24h-0.02c-0.44,0 -0.82,0.28 -0.94,0.7 -0.12,0.4 -0.28,0.79 -0.48,1.17 -0.21,0.38 -0.13,0.86 0.17,1.16z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M522,880L522,798Q556,793 588.5,780Q621,767 650,746L706,804Q664,836 618,855.5Q572,875 522,880ZM442,880Q304,862 213,760.5Q122,659 122,522Q122,447 150.5,381.5Q179,316 227.5,267.5Q276,219 341.5,190.5Q407,162 482,162L488,162L426,100L482,42L642,202L482,362L426,306L490,242L482,242Q365,242 283.5,323.5Q202,405 202,522Q202,626 270,704.5Q338,783 442,798L442,880ZM764,746L706,690Q727,661 740,628.5Q753,596 758,562L840,562Q835,612 815.5,658Q796,704 764,746ZM840,482L758,482Q753,448 740,415.5Q727,383 706,354L764,298Q796,337 815,384Q834,431 840,482Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml
index 1ce584327..ee8539d0d 100644
--- a/app/src/main/res/drawable/ic_save_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_24dp.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM19,19L5,19L5,5h11.17L19,7.83L19,19zM12,12c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3zM6,6h9v4L6,10z"/>
+      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L680,120L840,280L840,492Q821,484 800.5,481.5Q780,479 760,482L760,313L647,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L440,760L440,764L440,840L200,840ZM200,200L200,313L200,482Q200,485 200,494.5Q200,504 200,519L200,760L200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200ZM520,920L520,797L741,577Q750,568 761,564Q772,560 783,560Q795,560 806,564.5Q817,569 826,578L863,615Q871,624 875.5,635Q880,646 880,657Q880,668 876,679.5Q872,691 863,700L643,920L520,920ZM820,657L820,657L783,620L783,620L820,657ZM580,860L618,860L739,738L721,719L702,701L580,822L580,860ZM721,719L702,701L702,701L739,738L739,738L721,719ZM240,400L600,400L600,240L240,240L240,400ZM480,720Q481,720 482,720Q483,720 484,720L600,605Q600,603 600,602.5Q600,602 600,600Q600,550 565,515Q530,480 480,480Q430,480 395,515Q360,550 360,600Q360,650 395,685Q430,720 480,720Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml
index 2f13bb3e2..9224dbec8 100644
--- a/app/src/main/res/drawable/ic_share_24dp.xml
+++ b/app/src/main/res/drawable/ic_share_24dp.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+      android:pathData="M680,880Q630,880 595,845Q560,810 560,760Q560,754 563,732L282,568Q266,583 245,591.5Q224,600 200,600Q150,600 115,565Q80,530 80,480Q80,430 115,395Q150,360 200,360Q224,360 245,368.5Q266,377 282,392L563,228Q561,221 560.5,214.5Q560,208 560,200Q560,150 595,115Q630,80 680,80Q730,80 765,115Q800,150 800,200Q800,250 765,285Q730,320 680,320Q656,320 635,311.5Q614,303 598,288L317,452Q319,459 319.5,465.5Q320,472 320,480Q320,488 319.5,494.5Q319,501 317,508L598,672Q614,657 635,648.5Q656,640 680,640Q730,640 765,675Q800,710 800,760Q800,810 765,845Q730,880 680,880ZM680,800Q697,800 708.5,788.5Q720,777 720,760Q720,743 708.5,731.5Q697,720 680,720Q663,720 651.5,731.5Q640,743 640,760Q640,777 651.5,788.5Q663,800 680,800ZM200,520Q217,520 228.5,508.5Q240,497 240,480Q240,463 228.5,451.5Q217,440 200,440Q183,440 171.5,451.5Q160,463 160,480Q160,497 171.5,508.5Q183,520 200,520ZM708.5,228.5Q720,217 720,200Q720,183 708.5,171.5Q697,160 680,160Q663,160 651.5,171.5Q640,183 640,200Q640,217 651.5,228.5Q663,240 680,240Q697,240 708.5,228.5ZM680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760ZM200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480ZM680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Z"/>
 </vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a680b81f1..a4827dabc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,5 +57,10 @@
     <string name="pdf_version">PDF version</string>
     <string name="pages">Pages</string>
 
+    <string name="zoom">Zoom</string>
+    <string name="zoom_in">Zoom in</string>
+    <string name="zoom_out">Zoom out</string>
+    <string name="zoom_range">Percentage (%1$d–%2$d%%)</string>
+
     <string name="unknown_file_size">Unknown</string>
 </resources>
diff --git a/viewer/js/index.js b/viewer/js/index.js
index 545f6fbaa..9578abd29 100644
--- a/viewer/js/index.js
+++ b/viewer/js/index.js
@@ -112,7 +112,7 @@ function renderPage(pageNumber, zoom, prerender, prerenderTrigger = 0) {
     orientationDegrees = channel.getDocumentOrientationDegrees();
     console.log("page: " + pageNumber + ", zoom: " + newZoomRatio +
                 ", orientationDegrees: " + orientationDegrees + ", prerender: " + prerender);
-    for (let i = 0; i < cache.length; i++) {
+    for (let i = 0; zoom !== 2 && i < cache.length; i++) {
         const cached = cache[i];
         if (cached.pageNumber === pageNumber && cached.zoomRatio === newZoomRatio &&
                 cached.orientationDegrees === orientationDegrees) {
@@ -121,6 +121,7 @@ function renderPage(pageNumber, zoom, prerender, prerenderTrigger = 0) {
                 cache.push(cached);
 
                 display(cached.canvas, zoom);
+                zoomRatio = newZoomRatio;
 
                 textLayerDiv.replaceWith(cached.textLayerDiv);
                 textLayerDiv = cached.textLayerDiv;