diff --git a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
index dca5d2d..29706c2 100644
--- a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
@@ -156,8 +156,9 @@
     private val exposureLevel by lazy { findViewById<VerticalSlider>(R.id.exposureLevel) }
     private val flashButton by lazy { findViewById<ImageButton>(R.id.flashButton) }
     private val flipCameraButton by lazy { findViewById<ImageButton>(R.id.flipCameraButton) }
-    private val galleryButton by lazy { findViewById<ImageView>(R.id.galleryButton) }
     private val galleryButtonCardView by lazy { findViewById<CardView>(R.id.galleryButtonCardView) }
+    private val galleryButtonIconImageView by lazy { findViewById<ImageView>(R.id.galleryButtonIconImageView) }
+    private val galleryButtonPreviewImageView by lazy { findViewById<ImageView>(R.id.galleryButtonPreviewImageView) }
     private val googleLensButton by lazy { findViewById<ImageButton>(R.id.googleLensButton) }
     private val gridButton by lazy { findViewById<Button>(R.id.gridButton) }
     private val gridView by lazy { findViewById<GridView>(R.id.gridView) }
@@ -836,7 +837,7 @@
             }
         }
 
-        galleryButton.setOnClickListener { openGallery() }
+        galleryButtonCardView.setOnClickListener { openGallery() }
 
         // Set lens switching callback
         lensSelectorLayout.onCameraChangeCallback = {
@@ -922,7 +923,7 @@
             updateSecondaryTopBarButtons()
 
             // Update primary bar buttons
-            galleryButton.isEnabled = cameraState == CameraState.IDLE
+            galleryButtonCardView.isEnabled = cameraState == CameraState.IDLE
             // Shutter button must stay enabled
             flipCameraButton.isEnabled = cameraState == CameraState.IDLE
             videoRecordingStateButton.isVisible = cameraState.isRecordingVideo
@@ -945,7 +946,7 @@
                         FlashMode.OFF -> R.drawable.ic_flash_off
                         FlashMode.AUTO -> R.drawable.ic_flash_auto
                         FlashMode.ON -> R.drawable.ic_flash_on
-                        FlashMode.TORCH -> R.drawable.ic_flash_torch
+                        FlashMode.TORCH -> R.drawable.ic_flashlight_on
                         FlashMode.SCREEN -> R.drawable.ic_flash_screen
                     }
                 )
@@ -960,10 +961,10 @@
             gridButton.setCompoundDrawablesWithIntrinsicBounds(
                 0,
                 when (gridMode) {
-                    GridMode.OFF -> R.drawable.ic_grid_off
-                    GridMode.ON_3 -> R.drawable.ic_grid_on_3
-                    GridMode.ON_4 -> R.drawable.ic_grid_on_4
-                    GridMode.ON_GOLDEN_RATIO -> R.drawable.ic_grid_on_goldenratio
+                    GridMode.OFF -> R.drawable.ic_grid_3x3_off
+                    GridMode.ON_3 -> R.drawable.ic_grid_3x3
+                    GridMode.ON_4 -> R.drawable.ic_grid_4x4
+                    GridMode.ON_GOLDEN_RATIO -> R.drawable.ic_grid_goldenratio
                 },
                 0,
                 0
@@ -987,8 +988,8 @@
                 0,
                 when (timerMode) {
                     TimerMode.OFF -> R.drawable.ic_timer_off
-                    TimerMode.ON_3S -> R.drawable.ic_timer_3
-                    TimerMode.ON_10S -> R.drawable.ic_timer_10
+                    TimerMode.ON_3S -> R.drawable.ic_timer_3_alt_1
+                    TimerMode.ON_10S -> R.drawable.ic_timer_10_alt_1
                 },
                 0,
                 0
@@ -1013,16 +1014,6 @@
             val photoAspectRatio = it ?: return@observe
 
             // Update secondary bar buttons
-            aspectRatioButton.setCompoundDrawablesWithIntrinsicBounds(
-                0,
-                when (photoAspectRatio) {
-                    AspectRatio.RATIO_4_3 -> R.drawable.ic_aspect_ratio_4_3
-                    AspectRatio.RATIO_16_9 -> R.drawable.ic_aspect_ratio_16_9
-                    else -> throw Exception("Unknown aspect ratio $it")
-                },
-                0,
-                0
-            )
             aspectRatioButton.text = resources.getText(
                 when (photoAspectRatio) {
                     AspectRatio.RATIO_4_3 -> R.string.aspect_ratio_4_3
@@ -1040,13 +1031,13 @@
             effectButton.setCompoundDrawablesWithIntrinsicBounds(
                 0,
                 when (photoEffect) {
-                    ExtensionMode.NONE -> R.drawable.ic_effect_none
+                    ExtensionMode.NONE -> R.drawable.ic_blur_off
                     ExtensionMode.BOKEH -> R.drawable.ic_effect_bokeh
-                    ExtensionMode.HDR -> R.drawable.ic_effect_hdr
-                    ExtensionMode.NIGHT -> R.drawable.ic_effect_night
-                    ExtensionMode.FACE_RETOUCH -> R.drawable.ic_effect_face_retouch
-                    ExtensionMode.AUTO -> R.drawable.ic_effect_auto
-                    else -> R.drawable.ic_effect_none
+                    ExtensionMode.HDR -> R.drawable.ic_hdr_on
+                    ExtensionMode.NIGHT -> R.drawable.ic_clear_night
+                    ExtensionMode.FACE_RETOUCH -> R.drawable.ic_face_retouching_natural
+                    ExtensionMode.AUTO -> R.drawable.ic_hdr_auto
+                    else -> R.drawable.ic_blur_off
                 },
                 0,
                 0
@@ -1072,10 +1063,10 @@
             videoQualityButton.setCompoundDrawablesWithIntrinsicBounds(
                 0,
                 when (videoQuality) {
-                    Quality.SD -> R.drawable.ic_video_quality_sd
-                    Quality.HD -> R.drawable.ic_video_quality_hd
-                    Quality.FHD -> R.drawable.ic_video_quality_hd
-                    Quality.UHD -> R.drawable.ic_video_quality_uhd
+                    Quality.SD -> R.drawable.ic_sd
+                    Quality.HD -> R.drawable.ic_hd
+                    Quality.FHD -> R.drawable.ic_full_hd
+                    Quality.UHD -> R.drawable.ic_4k
                     else -> throw Exception("Unknown video quality $it")
                 },
                 0,
@@ -2182,12 +2173,17 @@
 
     private fun updateGalleryButton() {
         runOnUiThread {
+            galleryButtonIconImageView.setImageResource(R.drawable.ic_image)
+            galleryButtonIconImageView.isVisible = true
+
+            galleryButtonPreviewImageView.isVisible = false
+
             val uri = sharedPreferences.lastSavedUri?.takeIf {
                 MediaStoreUtils.fileExists(this, it)
             }
             val keyguardLocked = keyguardManager.isKeyguardLocked
             if (uri != null && (!keyguardLocked || tookSomething)) {
-                galleryButton.load(uri) {
+                galleryButtonPreviewImageView.load(uri) {
                     decoderFactory(VideoFrameDecoder.Factory())
                     crossfade(true)
                     scale(Scale.FILL)
@@ -2196,28 +2192,30 @@
                     fallback(R.drawable.ic_image)
                     listener(object : ImageRequest.Listener {
                         override fun onSuccess(request: ImageRequest, result: SuccessResult) {
-                            galleryButton.setPadding(0)
                             super.onSuccess(request, result)
+
+                            galleryButtonPreviewImageView.isVisible = true
+                            galleryButtonIconImageView.isVisible = false
                         }
 
                         override fun onError(request: ImageRequest, result: ErrorResult) {
-                            galleryButton.setPadding(15.px)
                             super.onError(request, result)
+
                             Log.e(LOG_TAG, "Failed to load gallery button icon", result.throwable)
+
+                            galleryButtonPreviewImageView.isVisible = false
+                            galleryButtonIconImageView.isVisible = true
                         }
 
                         override fun onCancel(request: ImageRequest) {
-                            galleryButton.setPadding(15.px)
+                            galleryButtonPreviewImageView.isVisible = false
+                            galleryButtonIconImageView.isVisible = true
                             super.onCancel(request)
                         }
                     })
                 }
             } else if (keyguardLocked) {
-                galleryButton.setPadding(15.px)
-                galleryButton.setImageResource(R.drawable.ic_lock)
-            } else {
-                galleryButton.setPadding(15.px)
-                galleryButton.setImageResource(R.drawable.ic_image)
+                galleryButtonIconImageView.setImageResource(R.drawable.ic_lock)
             }
         }
     }
diff --git a/app/src/main/res/drawable/ic_4k.xml b/app/src/main/res/drawable/ic_4k.xml
new file mode 100644
index 0000000..8f35b4b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_4k.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M520,600L580,600L580,510L650,600L723,600L630,480L723,360L650,360L580,450L580,360L520,360L520,600ZM380,600L440,600L440,540L480,540L480,480L440,480L440,360L380,360L380,480L320,480L320,360L260,360L260,540L380,540L380,600ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM200,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_aspect_ratio.xml b/app/src/main/res/drawable/ic_aspect_ratio.xml
new file mode 100644
index 0000000..3584e28
--- /dev/null
+++ b/app/src/main/res/drawable/ic_aspect_ratio.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M560,680L760,680L760,480L680,480L680,600L560,600L560,680ZM200,480L280,480L280,360L400,360L400,280L200,280L200,480ZM160,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,800L160,800ZM160,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,720ZM160,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_aspect_ratio_16_9.xml b/app/src/main/res/drawable/ic_aspect_ratio_16_9.xml
deleted file mode 100644
index 052d5c7..0000000
--- a/app/src/main/res/drawable/ic_aspect_ratio_16_9.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,7H5C3.9,7 3,7.9 3,9v6c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V9C21,7.9 20.1,7 19,7zM19,15H5V9h14V15z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_aspect_ratio_4_3.xml b/app/src/main/res/drawable/ic_aspect_ratio_4_3.xml
deleted file mode 100644
index 52292a8..0000000
--- a/app/src/main/res/drawable/ic_aspect_ratio_4_3.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,5H5C3.9,5 3,5.9 3,7v10c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V7C21,5.9 20.1,5 19,5zM19,17H5V7h14V17z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_blur_off.xml b/app/src/main/res/drawable/ic_blur_off.xml
new file mode 100644
index 0000000..0319039
--- /dev/null
+++ b/app/src/main/res/drawable/ic_blur_off.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M792,904L56,168L112,112L848,848L792,904ZM400,860Q392,860 386,854Q380,848 380,840Q380,832 386,826Q392,820 400,820Q408,820 414,826Q420,832 420,840Q420,848 414,854Q408,860 400,860ZM560,860Q552,860 546,854Q540,848 540,840Q540,832 546,826Q552,820 560,820Q568,820 574,826Q580,832 580,840Q580,848 574,854Q568,860 560,860ZM240,760Q223,760 211.5,748.5Q200,737 200,720Q200,703 211.5,691.5Q223,680 240,680Q257,680 268.5,691.5Q280,703 280,720Q280,737 268.5,748.5Q257,760 240,760ZM400,760Q383,760 371.5,748.5Q360,737 360,720Q360,703 371.5,691.5Q383,680 400,680Q417,680 428.5,691.5Q440,703 440,720Q440,737 428.5,748.5Q417,760 400,760ZM560,760Q543,760 531.5,748.5Q520,737 520,720Q520,703 531.5,691.5Q543,680 560,680Q577,680 588.5,691.5Q600,703 600,720Q600,737 588.5,748.5Q577,760 560,760ZM400,620Q374,620 357,603Q340,586 340,560Q340,534 357,517Q374,500 400,500Q426,500 443,517Q460,534 460,560Q460,586 443,603Q426,620 400,620ZM240,600Q223,600 211.5,588.5Q200,577 200,560Q200,543 211.5,531.5Q223,520 240,520Q257,520 268.5,531.5Q280,543 280,560Q280,577 268.5,588.5Q257,600 240,600ZM712,599L681,568Q677,548 689.5,534Q702,520 720,520Q737,520 748.5,531.5Q760,543 760,560Q760,578 746,590.5Q732,603 712,599ZM120,580Q112,580 106,574Q100,568 100,560Q100,552 106,546Q112,540 120,540Q128,540 134,546Q140,552 140,560Q140,568 134,574Q128,580 120,580ZM840,580Q832,580 826,574Q820,568 820,560Q820,552 826,546Q832,540 840,540Q848,540 854,546Q860,552 860,560Q860,568 854,574Q848,580 840,580ZM572,458L502,388Q507,367 522,353.5Q537,340 560,340Q586,340 603,357Q620,374 620,400Q620,423 606,438.5Q592,454 572,458ZM240,440Q223,440 211.5,428.5Q200,417 200,400Q200,383 211.5,371.5Q223,360 240,360Q257,360 268.5,371.5Q280,383 280,400Q280,417 268.5,428.5Q257,440 240,440ZM720,440Q703,440 691.5,428.5Q680,417 680,400Q680,383 691.5,371.5Q703,360 720,360Q737,360 748.5,371.5Q760,383 760,400Q760,417 748.5,428.5Q737,440 720,440ZM120,420Q112,420 106,414Q100,408 100,400Q100,392 106,386Q112,380 120,380Q128,380 134,386Q140,392 140,400Q140,408 134,414Q128,420 120,420ZM840,420Q832,420 826,414Q820,408 820,400Q820,392 826,386Q832,380 840,380Q848,380 854,386Q860,392 860,400Q860,408 854,414Q848,420 840,420ZM560,280Q543,280 531.5,268.5Q520,257 520,240Q520,223 531.5,211.5Q543,200 560,200Q577,200 588.5,211.5Q600,223 600,240Q600,257 588.5,268.5Q577,280 560,280ZM393,279L361,247Q358,227 370,213.5Q382,200 400,200Q417,200 428.5,211.5Q440,223 440,240Q440,258 426.5,270Q413,282 393,279ZM720,280Q703,280 691.5,268.5Q680,257 680,240Q680,223 691.5,211.5Q703,200 720,200Q737,200 748.5,211.5Q760,223 760,240Q760,257 748.5,268.5Q737,280 720,280ZM400,140Q392,140 386,134Q380,128 380,120Q380,112 386,106Q392,100 400,100Q408,100 414,106Q420,112 420,120Q420,128 414,134Q408,140 400,140ZM560,140Q552,140 546,134Q540,128 540,120Q540,112 546,106Q552,100 560,100Q568,100 574,106Q580,112 580,120Q580,128 574,134Q568,140 560,140Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_blur_on.xml b/app/src/main/res/drawable/ic_blur_on.xml
new file mode 100644
index 0000000..6bbc699
--- /dev/null
+++ b/app/src/main/res/drawable/ic_blur_on.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,580Q112,580 106,574Q100,568 100,560Q100,552 106,546Q112,540 120,540Q128,540 134,546Q140,552 140,560Q140,568 134,574Q128,580 120,580ZM120,420Q112,420 106,414Q100,408 100,400Q100,392 106,386Q112,380 120,380Q128,380 134,386Q140,392 140,400Q140,408 134,414Q128,420 120,420ZM240,760Q223,760 211.5,748.5Q200,737 200,720Q200,703 211.5,691.5Q223,680 240,680Q257,680 268.5,691.5Q280,703 280,720Q280,737 268.5,748.5Q257,760 240,760ZM240,600Q223,600 211.5,588.5Q200,577 200,560Q200,543 211.5,531.5Q223,520 240,520Q257,520 268.5,531.5Q280,543 280,560Q280,577 268.5,588.5Q257,600 240,600ZM240,440Q223,440 211.5,428.5Q200,417 200,400Q200,383 211.5,371.5Q223,360 240,360Q257,360 268.5,371.5Q280,383 280,400Q280,417 268.5,428.5Q257,440 240,440ZM240,280Q223,280 211.5,268.5Q200,257 200,240Q200,223 211.5,211.5Q223,200 240,200Q257,200 268.5,211.5Q280,223 280,240Q280,257 268.5,268.5Q257,280 240,280ZM400,620Q375,620 357.5,602.5Q340,585 340,560Q340,535 357.5,517.5Q375,500 400,500Q425,500 442.5,517.5Q460,535 460,560Q460,585 442.5,602.5Q425,620 400,620ZM400,460Q375,460 357.5,442.5Q340,425 340,400Q340,375 357.5,357.5Q375,340 400,340Q425,340 442.5,357.5Q460,375 460,400Q460,425 442.5,442.5Q425,460 400,460ZM400,760Q383,760 371.5,748.5Q360,737 360,720Q360,703 371.5,691.5Q383,680 400,680Q417,680 428.5,691.5Q440,703 440,720Q440,737 428.5,748.5Q417,760 400,760ZM400,280Q383,280 371.5,268.5Q360,257 360,240Q360,223 371.5,211.5Q383,200 400,200Q417,200 428.5,211.5Q440,223 440,240Q440,257 428.5,268.5Q417,280 400,280ZM400,860Q392,860 386,854Q380,848 380,840Q380,832 386,826Q392,820 400,820Q408,820 414,826Q420,832 420,840Q420,848 414,854Q408,860 400,860ZM400,140Q392,140 386,134Q380,128 380,120Q380,112 386,106Q392,100 400,100Q408,100 414,106Q420,112 420,120Q420,128 414,134Q408,140 400,140ZM560,620Q535,620 517.5,602.5Q500,585 500,560Q500,535 517.5,517.5Q535,500 560,500Q585,500 602.5,517.5Q620,535 620,560Q620,585 602.5,602.5Q585,620 560,620ZM560,460Q535,460 517.5,442.5Q500,425 500,400Q500,375 517.5,357.5Q535,340 560,340Q585,340 602.5,357.5Q620,375 620,400Q620,425 602.5,442.5Q585,460 560,460ZM560,760Q543,760 531.5,748.5Q520,737 520,720Q520,703 531.5,691.5Q543,680 560,680Q577,680 588.5,691.5Q600,703 600,720Q600,737 588.5,748.5Q577,760 560,760ZM560,280Q543,280 531.5,268.5Q520,257 520,240Q520,223 531.5,211.5Q543,200 560,200Q577,200 588.5,211.5Q600,223 600,240Q600,257 588.5,268.5Q577,280 560,280ZM560,860Q552,860 546,854Q540,848 540,840Q540,832 546,826Q552,820 560,820Q568,820 574,826Q580,832 580,840Q580,848 574,854Q568,860 560,860ZM560,140Q552,140 546,134Q540,128 540,120Q540,112 546,106Q552,100 560,100Q568,100 574,106Q580,112 580,120Q580,128 574,134Q568,140 560,140ZM720,760Q703,760 691.5,748.5Q680,737 680,720Q680,703 691.5,691.5Q703,680 720,680Q737,680 748.5,691.5Q760,703 760,720Q760,737 748.5,748.5Q737,760 720,760ZM720,600Q703,600 691.5,588.5Q680,577 680,560Q680,543 691.5,531.5Q703,520 720,520Q737,520 748.5,531.5Q760,543 760,560Q760,577 748.5,588.5Q737,600 720,600ZM720,440Q703,440 691.5,428.5Q680,417 680,400Q680,383 691.5,371.5Q703,360 720,360Q737,360 748.5,371.5Q760,383 760,400Q760,417 748.5,428.5Q737,440 720,440ZM720,280Q703,280 691.5,268.5Q680,257 680,240Q680,223 691.5,211.5Q703,200 720,200Q737,200 748.5,211.5Q760,223 760,240Q760,257 748.5,268.5Q737,280 720,280ZM840,580Q832,580 826,574Q820,568 820,560Q820,552 826,546Q832,540 840,540Q848,540 854,546Q860,552 860,560Q860,568 854,574Q848,580 840,580ZM840,420Q832,420 826,414Q820,408 820,400Q820,392 826,386Q832,380 840,380Q848,380 854,386Q860,392 860,400Q860,408 854,414Q848,420 840,420Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_broken_image.xml b/app/src/main/res/drawable/ic_broken_image.xml
index d092e89..bb32c55 100644
--- a/app/src/main/res/drawable/ic_broken_image.xml
+++ b/app/src/main/res/drawable/ic_broken_image.xml
@@ -7,9 +7,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M21,5v6.59l-3,-3.01 -4,4.01 -4,-4 -4,4 -3,-3.01L3,5c0,-1.1 0.9,-2 2,-2h14c1.1,0 2,0.9 2,2zM18,11.42l3,3.01L21,19c0,1.1 -0.9,2 -2,2L5,21c-1.1,0 -2,-0.9 -2,-2v-6.58l3,2.99 4,-4 4,4 4,-3.99z" />
+        android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM240,503L400,343L560,503L720,343L760,383L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,463L240,503ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,496L720,456L560,616L400,456L240,616L200,576L200,760Q200,760 200,760Q200,760 200,760ZM200,760L200,760Q200,760 200,760Q200,760 200,760L200,496L200,576L200,463L200,383L200,200Q200,200 200,200Q200,200 200,200L200,200Q200,200 200,200Q200,200 200,200L200,463L200,463L200,576L200,576L200,760Q200,760 200,760Q200,760 200,760Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear_night.xml b/app/src/main/res/drawable/ic_clear_night.xml
new file mode 100644
index 0000000..8cdaa5c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clear_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M524,920Q440,920 366.5,888Q293,856 238.5,801.5Q184,747 152,673.5Q120,600 120,516Q120,370 213,258.5Q306,147 450,120Q432,219 461,313.5Q490,408 561,479Q632,550 726.5,579Q821,608 920,590Q894,734 782,827Q670,920 524,920ZM524,840Q612,840 687,796Q762,752 805,675Q719,667 642,631.5Q565,596 504,535Q443,474 407,397Q371,320 364,234Q287,277 243.5,352.5Q200,428 200,516Q200,651 294.5,745.5Q389,840 524,840ZM504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Q504,535 504,535Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml
new file mode 100644
index 0000000..66112fe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_content_copy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M360,720Q327,720 303.5,696.5Q280,673 280,640L280,160Q280,127 303.5,103.5Q327,80 360,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,640Q800,673 776.5,696.5Q753,720 720,720L360,720ZM360,640L720,640Q720,640 720,640Q720,640 720,640L720,160Q720,160 720,160Q720,160 720,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640ZM200,880Q167,880 143.5,856.5Q120,833 120,800L120,240L200,240L200,800Q200,800 200,800Q200,800 200,800L640,800L640,880L200,880ZM360,640Q360,640 360,640Q360,640 360,640L360,160Q360,160 360,160Q360,160 360,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640L360,640Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
deleted file mode 100644
index 877f548..0000000
--- a/app/src/main/res/drawable/ic_copy.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.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="@android:color/white"
-        android:pathData="M5,22Q4.175,22 3.587,21.413Q3,20.825 3,20V6H5V20Q5,20 5,20Q5,20 5,20H16V22ZM9,18Q8.175,18 7.588,17.413Q7,16.825 7,16V4Q7,3.175 7.588,2.587Q8.175,2 9,2H18Q18.825,2 19.413,2.587Q20,3.175 20,4V16Q20,16.825 19.413,17.413Q18.825,18 18,18ZM9,16H18Q18,16 18,16Q18,16 18,16V4Q18,4 18,4Q18,4 18,4H9Q9,4 9,4Q9,4 9,4V16Q9,16 9,16Q9,16 9,16ZM9,16Q9,16 9,16Q9,16 9,16V4Q9,4 9,4Q9,4 9,4Q9,4 9,4Q9,4 9,4V16Q9,16 9,16Q9,16 9,16Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_effect_auto.xml b/app/src/main/res/drawable/ic_effect_auto.xml
deleted file mode 100644
index b294d1f..0000000
--- a/app/src/main/res/drawable/ic_effect_auto.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12.04,8.04l-0.09,0l-1.6,4.55l3.29,0z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM15.21,17l-0.98,-2.81H9.78l-1,2.81h-1.9l4.13,-11h1.97l4.13,11H15.21z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_effect_face_retouch.xml b/app/src/main/res/drawable/ic_effect_face_retouch.xml
deleted file mode 100644
index 1b79566..0000000
--- a/app/src/main/res/drawable/ic_effect_face_retouch.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9,13m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20.77,8.58l-0.92,2.01c0.09,0.46 0.15,0.93 0.15,1.41 0,4.41 -3.59,8 -8,8s-8,-3.59 -8,-8c0,-0.05 0.01,-0.1 0,-0.14 2.6,-0.98 4.69,-2.99 5.74,-5.55C11.58,8.56 14.37,10 17.5,10c0.45,0 0.89,-0.04 1.33,-0.1l-0.6,-1.32 -0.88,-1.93 -1.93,-0.88 -2.79,-1.27 2.79,-1.27 0.71,-0.32C14.87,2.33 13.47,2 12,2 6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10c0,-1.47 -0.33,-2.87 -0.9,-4.13l-0.33,0.71z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15,13m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20.6,5.6L19.5,8l-1.1,-2.4L16,4.5l2.4,-1.1L19.5,1l1.1,2.4L23,4.5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_effect_hdr.xml b/app/src/main/res/drawable/ic_effect_hdr.xml
deleted file mode 100644
index 4b9a996..0000000
--- a/app/src/main/res/drawable/ic_effect_hdr.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M21,11.5v-1c0,-0.8 -0.7,-1.5 -1.5,-1.5L16,9v6h1.5v-2h1.1l0.9,2L21,15l-0.9,-2.1c0.5,-0.3 0.9,-0.8 0.9,-1.4zM19.5,11.5h-2v-1h2v1zM6.5,11h-2L4.5,9L3,9v6h1.5v-2.5h2L6.5,15L8,15L8,9L6.5,9v2zM13,9L9.5,9v6L13,15c0.8,0 1.5,-0.7 1.5,-1.5v-3c0,-0.8 -0.7,-1.5 -1.5,-1.5zM13,13.5h-2v-3h2v3z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_effect_night.xml b/app/src/main/res/drawable/ic_effect_night.xml
deleted file mode 100644
index 408ed46..0000000
--- a/app/src/main/res/drawable/ic_effect_night.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9.5,2c-1.82,0 -3.53,0.5 -5,1.35c2.99,1.73 5,4.95 5,8.65s-2.01,6.92 -5,8.65C5.97,21.5 7.68,22 9.5,22c5.52,0 10,-4.48 10,-10S15.02,2 9.5,2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_effect_none.xml b/app/src/main/res/drawable/ic_effect_none.xml
deleted file mode 100644
index 9ca73f9..0000000
--- a/app/src/main/res/drawable/ic_effect_none.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M21.99,12.34C22,12.23 22,12.11 22,12c0,-5.52 -4.48,-10 -10,-10S2,6.48 2,12c0,5.17 3.93,9.43 8.96,9.95c-0.93,-0.73 -1.72,-1.64 -2.32,-2.68C5.9,18 4,15.22 4,12c0,-1.85 0.63,-3.55 1.69,-4.9l5.66,5.66c0.56,-0.4 1.17,-0.73 1.82,-1L7.1,5.69C8.45,4.63 10.15,4 12,4c4.24,0 7.7,3.29 7.98,7.45C20.69,11.67 21.37,11.97 21.99,12.34zM17,13c-3.18,0 -5.9,1.87 -7,4.5c1.1,2.63 3.82,4.5 7,4.5s5.9,-1.87 7,-4.5C22.9,14.87 20.18,13 17,13zM17,20c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5C19.5,18.88 18.38,20 17,20zM18.5,17.5c0,0.83 -0.67,1.5 -1.5,1.5s-1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5S18.5,16.67 18.5,17.5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_face_retouching_natural.xml b/app/src/main/res/drawable/ic_face_retouching_natural.xml
new file mode 100644
index 0000000..ea25004
--- /dev/null
+++ b/app/src/main/res/drawable/ic_face_retouching_natural.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.89,10.75C19.96,11.16 20,11.57 20,12c0,4.41 -3.59,8 -8,8s-8,-3.59 -8,-8c0,-0.05 0.01,-0.1 0,-0.14c2.6,-0.98 4.69,-2.99 5.74,-5.55c3.38,4.14 7.97,3.73 8.99,3.61l-0.89,-1.93c-0.13,0.01 -4.62,0.38 -7.18,-3.86c1.01,-0.16 1.71,-0.15 2.59,-0.01c2.52,-1.15 1.93,-0.89 2.76,-1.26C14.78,2.3 13.43,2 12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10c0,-1.43 -0.3,-2.78 -0.84,-4.01L19.89,10.75zM8.08,5.03C7.45,6.92 6.13,8.5 4.42,9.47C5.05,7.58 6.37,6 8.08,5.03z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,13m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9,13m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M23,4.5l-2.4,-1.1l-1.1,-2.4l-1.1,2.4l-2.4,1.1l2.4,1.1l1.1,2.4l1.1,-2.4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_flash_auto.xml b/app/src/main/res/drawable/ic_flash_auto.xml
index 192f490..0172b50 100644
--- a/app/src/main/res/drawable/ic_flash_auto.xml
+++ b/app/src/main/res/drawable/ic_flash_auto.xml
@@ -7,9 +7,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M3,2v12h3v9l7,-12L9,11l4,-9L3,2zM19,2h-2l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L19,2zM16.85,7.65L18,4l1.15,3.65h-2.3z" />
+        android:pathData="M280,624L408,440L294,440L374,160L160,160L160,480L280,480L280,624ZM200,880L200,560L80,560L80,80L480,80L400,360L560,360L200,880ZM280,480L280,480L160,480L160,480L280,480L280,480L280,480L280,480ZM585,440L720,80L784,80L921,440L859,440L827,348L679,348L647,440L585,440ZM697,296L807,296L754,146L752,146L697,296Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_flash_off.xml b/app/src/main/res/drawable/ic_flash_off.xml
index 398a44b..5743716 100644
--- a/app/src/main/res/drawable/ic_flash_off.xml
+++ b/app/src/main/res/drawable/ic_flash_off.xml
@@ -7,9 +7,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M3.27,3L2,4.27l5,5V13h3v9l3.58,-6.14L17.73,20 19,18.73 3.27,3zM17,10h-4l4,-8H7v2.18l8.46,8.46L17,10z" />
+        android:pathData="M280,80L680,80L600,360L760,360L643,529L586,472L608,440L554,440L507,393L574,160L360,160L360,246L280,166L280,80ZM400,880L400,560L280,560L280,394L55,169L112,112L848,848L791,905L550,664L400,880ZM473,359L473,359L473,359L473,359L473,359L473,359L473,359L473,359Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_flash_on.xml b/app/src/main/res/drawable/ic_flash_on.xml
index 1f4d005..009ca1a 100644
--- a/app/src/main/res/drawable/ic_flash_on.xml
+++ b/app/src/main/res/drawable/ic_flash_on.xml
@@ -7,9 +7,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M7,2v11h3v9l7,-12h-4l4,-8z" />
+        android:pathData="M480,624L608,440L494,440L574,160L360,160L360,480L480,480L480,624ZM400,880L400,560L280,560L280,80L680,80L600,360L760,360L400,880ZM480,480L480,480L360,480L360,480L480,480L480,480L480,480L480,480Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_flash_torch.xml b/app/src/main/res/drawable/ic_flash_torch.xml
deleted file mode 100644
index db2e589..0000000
--- a/app/src/main/res/drawable/ic_flash_torch.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,2h12v3h-12z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,7v1l2,3v11h8V11l2,-3V7H6zM12,15.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S12.83,15.5 12,15.5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_flashlight_on.xml b/app/src/main/res/drawable/ic_flashlight_on.xml
new file mode 100644
index 0000000..873cdb6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flashlight_on.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M320,880L320,440L240,320L240,80L720,80L720,320L640,440L640,880L320,880ZM480,620Q455,620 437.5,602.5Q420,585 420,560Q420,535 437.5,517.5Q455,500 480,500Q505,500 522.5,517.5Q540,535 540,560Q540,585 522.5,602.5Q505,620 480,620ZM320,200L640,200L640,160L320,160L320,200ZM640,280L320,280L320,296L400,416L400,800L560,800L560,416L640,296L640,280ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_full_hd.xml b/app/src/main/res/drawable/ic_full_hd.xml
new file mode 100644
index 0000000..d55803b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_full_hd.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M380,600L440,600L440,520L500,520L500,600L560,600L560,360L500,360L500,460L440,460L440,360L380,360L380,600ZM600,600L740,600Q757,600 768.5,588.5Q780,577 780,560L780,400Q780,383 768.5,371.5Q757,360 740,360L600,360L600,600ZM660,540L660,420L720,420Q720,420 720,420Q720,420 720,420L720,540Q720,540 720,540Q720,540 720,540L660,540ZM180,600L240,600L240,520L320,520L320,460L240,460L240,420L340,420L340,360L180,360L180,600ZM120,800Q87,800 63.5,776.5Q40,753 40,720L40,240Q40,207 63.5,183.5Q87,160 120,160L840,160Q873,160 896.5,183.5Q920,207 920,240L920,720Q920,753 896.5,776.5Q873,800 840,800L120,800ZM120,720L840,720Q840,720 840,720Q840,720 840,720L840,240Q840,240 840,240Q840,240 840,240L120,240Q120,240 120,240Q120,240 120,240L120,720Q120,720 120,720Q120,720 120,720ZM120,720Q120,720 120,720Q120,720 120,720L120,240Q120,240 120,240Q120,240 120,240L120,240Q120,240 120,240Q120,240 120,240L120,720Q120,720 120,720Q120,720 120,720L120,720Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_grid_3x3.xml b/app/src/main/res/drawable/ic_grid_3x3.xml
new file mode 100644
index 0000000..998877e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_grid_3x3.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M320,800L320,640L160,640L160,560L320,560L320,400L160,400L160,320L320,320L320,160L400,160L400,320L560,320L560,160L640,160L640,320L800,320L800,400L640,400L640,560L800,560L800,640L640,640L640,800L560,800L560,640L400,640L400,800L320,800ZM400,560L560,560L560,400L400,400L400,560Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_grid_3x3_off.xml b/app/src/main/res/drawable/ic_grid_3x3_off.xml
new file mode 100644
index 0000000..deee63b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_grid_3x3_off.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M753,640L673,560L800,560L800,640L753,640ZM640,527L433,320L560,320L560,160L640,160L640,320L800,320L800,400L640,400L640,527ZM400,287L320,207L320,160L400,160L400,287ZM791,904L640,753L640,800L560,800L560,673L527,640L400,640L400,800L320,800L320,640L160,640L160,560L320,560L320,433L287,400L160,400L160,320L207,320L56,169L112,112L848,848L791,904Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_grid_4x4.xml b/app/src/main/res/drawable/ic_grid_4x4.xml
new file mode 100644
index 0000000..9bf421f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_grid_4x4.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,880L200,760L80,760L80,680L200,680L200,520L80,520L80,440L200,440L200,280L80,280L80,200L200,200L200,80L280,80L280,200L440,200L440,80L520,80L520,200L680,200L680,80L760,80L760,200L880,200L880,280L760,280L760,440L880,440L880,520L760,520L760,680L880,680L880,760L760,760L760,880L680,880L680,760L520,760L520,880L440,880L440,760L280,760L280,880L200,880ZM280,680L440,680L440,520L280,520L280,680ZM520,680L680,680L680,520L520,520L520,680ZM280,440L440,440L440,280L280,280L280,440ZM520,440L680,440L680,280L520,280L520,440Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_grid_goldenratio.xml b/app/src/main/res/drawable/ic_grid_goldenratio.xml
new file mode 100644
index 0000000..1dd9f52
--- /dev/null
+++ b/app/src/main/res/drawable/ic_grid_goldenratio.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M360,880L360,600L80,600L80,520L360,520L360,440L80,440L80,360L360,360L360,80L440,80L440,360L520,360L520,80L600,80L600,360L880,360L880,440L600,440L600,520L880,520L880,600L600,600L600,880L520,880L520,600L440,600L440,880L360,880ZM440,520L520,520L520,440L440,440L440,520Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_grid_off.xml b/app/src/main/res/drawable/ic_grid_off.xml
deleted file mode 100644
index 5a6b957..0000000
--- a/app/src/main/res/drawable/ic_grid_off.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M8,4v1.45l2,2L10,4h4v4h-3.45l2,2L14,10v1.45l2,2L16,10h4v4h-3.45l2,2L20,16v1.45l2,2L22,4c0,-1.1 -0.9,-2 -2,-2L4.55,2l2,2L8,4zM16,4h4v4h-4L16,4zM1.27,1.27L0,2.55l2,2L2,20c0,1.1 0.9,2 2,2h15.46l2,2 1.27,-1.27L1.27,1.27zM10,12.55L11.45,14L10,14v-1.45zM4,6.55L5.45,8L4,8L4,6.55zM8,20L4,20v-4h4v4zM8,14L4,14v-4h3.45l0.55,0.55L8,14zM14,20h-4v-4h3.45l0.55,0.54L14,20zM16,20v-1.46L17.46,20L16,20z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_grid_on_3.xml b/app/src/main/res/drawable/ic_grid_on_3.xml
deleted file mode 100644
index 6dec591..0000000
--- a/app/src/main/res/drawable/ic_grid_on_3.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M8,20V16H4V14H8V10H4V8H8V4H10V8H14V4H16V8H20V10H16V14H20V16H16V20H14V16H10V20ZM10,14H14V10H10Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_grid_on_4.xml b/app/src/main/res/drawable/ic_grid_on_4.xml
deleted file mode 100644
index a17f98c..0000000
--- a/app/src/main/res/drawable/ic_grid_on_4.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M5,22V19H2V17H5V13H2V11H5V7H2V5H5V2H7V5H11V2H13V5H17V2H19V5H22V7H19V11H22V13H19V17H22V19H19V22H17V19H13V22H11V19H7V22ZM7,17H11V13H7ZM13,17H17V13H13ZM7,11H11V7H7ZM13,11H17V7H13Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_grid_on_goldenratio.xml b/app/src/main/res/drawable/ic_grid_on_goldenratio.xml
deleted file mode 100644
index 429a1e8..0000000
--- a/app/src/main/res/drawable/ic_grid_on_goldenratio.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M22,11V9h-7V2h-2v7h-2V2H9v7H2v2h7v2H2v2h7v7h2v-7h2v7h2v-7h7v-2h-7v-2H22zM13,13h-2v-2h2V13z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_hd.xml b/app/src/main/res/drawable/ic_hd.xml
new file mode 100644
index 0000000..45bc34b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hd.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M240,600L300,600L300,520L380,520L380,600L440,600L440,360L380,360L380,460L300,460L300,360L240,360L240,600ZM520,600L680,600Q697,600 708.5,588.5Q720,577 720,560L720,400Q720,383 708.5,371.5Q697,360 680,360L520,360L520,600ZM580,540L580,420L660,420Q660,420 660,420Q660,420 660,420L660,540Q660,540 660,540Q660,540 660,540L580,540ZM160,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,800L160,800ZM160,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,720ZM160,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_hdr_auto.xml b/app/src/main/res/drawable/ic_hdr_auto.xml
new file mode 100644
index 0000000..358b866
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hdr_auto.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M276,680L352,680L392,568L568,568L608,680L684,680L520,240L440,240L276,680ZM414,504L478,322L482,322L546,504L414,504ZM480,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,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q613,800 706.5,706.5Q800,613 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_image.xml b/app/src/main/res/drawable/ic_image.xml
index bcef0e4..4edc386 100644
--- a/app/src/main/res/drawable/ic_image.xml
+++ b/app/src/main/res/drawable/ic_image.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#000000"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM6,17H18L14.25,12L11.25,16L9,13ZM5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Z" />
+        android:pathData="M19,5v14L5,19L5,5h14m0,-2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14.14,11.86l-3,3.87L9,13.14 6,17h12l-3.86,-5.14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 2976381..edea97e 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V10Q4,9.175 4.588,8.587Q5.175,8 6,8H7V6Q7,3.925 8.463,2.462Q9.925,1 12,1Q14.075,1 15.538,2.462Q17,3.925 17,6V8H18Q18.825,8 19.413,8.587Q20,9.175 20,10V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM6,20H18Q18,20 18,20Q18,20 18,20V10Q18,10 18,10Q18,10 18,10H6Q6,10 6,10Q6,10 6,10V20Q6,20 6,20Q6,20 6,20ZM12,17Q12.825,17 13.413,16.413Q14,15.825 14,15Q14,14.175 13.413,13.587Q12.825,13 12,13Q11.175,13 10.588,13.587Q10,14.175 10,15Q10,15.825 10.588,16.413Q11.175,17 12,17ZM9,8H15V6Q15,4.75 14.125,3.875Q13.25,3 12,3Q10.75,3 9.875,3.875Q9,4.75 9,6ZM6,20Q6,20 6,20Q6,20 6,20V10Q6,10 6,10Q6,10 6,10Q6,10 6,10Q6,10 6,10V20Q6,20 6,20Q6,20 6,20Z" />
+        android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L280,320L280,240Q280,157 338.5,98.5Q397,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM360,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,320ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800L240,800Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sd.xml b/app/src/main/res/drawable/ic_sd.xml
new file mode 100644
index 0000000..23c71d6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sd.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M160,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,800L160,800ZM160,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,720ZM280,600L400,600Q417,600 428.5,588.5Q440,577 440,560L440,500Q440,483 428.5,471.5Q417,460 400,460L300,460L300,420L380,420L380,440L440,440L440,400Q440,383 428.5,371.5Q417,360 400,360L280,360Q263,360 251.5,371.5Q240,383 240,400L240,460Q240,477 251.5,488.5Q263,500 280,500L380,500L380,540L300,540L300,520L240,520L240,560Q240,577 251.5,588.5Q263,600 280,600ZM520,600L680,600Q697,600 708.5,588.5Q720,577 720,560L720,400Q720,383 708.5,371.5Q697,360 680,360L520,360L520,600ZM580,540L580,420L660,420Q660,420 660,420Q660,420 660,420L660,540Q660,540 660,540Q660,540 660,540L580,540ZM160,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_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index eefb649..2f75c00 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -7,9 +7,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
+        android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_10.xml b/app/src/main/res/drawable/ic_timer_10.xml
deleted file mode 100644
index de1da8e..0000000
--- a/app/src/main/res/drawable/ic_timer_10.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M8.75,17.225H10.55V8.775H7.55V10.6H8.75ZM13.2,17.225H14.4Q15.15,17.225 15.688,16.7Q16.225,16.175 16.225,15.425V10.6Q16.225,9.85 15.688,9.312Q15.15,8.775 14.4,8.775H13.2Q12.45,8.775 11.925,9.312Q11.4,9.85 11.4,10.6V15.425Q11.4,16.175 11.925,16.7Q12.45,17.225 13.2,17.225ZM13.2,15.425Q13.2,15.425 13.2,15.425Q13.2,15.425 13.2,15.425V10.6Q13.2,10.6 13.2,10.6Q13.2,10.6 13.2,10.6H14.4Q14.4,10.6 14.4,10.6Q14.4,10.6 14.4,10.6V15.425Q14.4,15.425 14.4,15.425Q14.4,15.425 14.4,15.425ZM9,3V1H15V3ZM12,22Q10.15,22 8.512,21.288Q6.875,20.575 5.65,19.35Q4.425,18.125 3.712,16.488Q3,14.85 3,13Q3,11.15 3.712,9.512Q4.425,7.875 5.65,6.65Q6.875,5.425 8.512,4.713Q10.15,4 12,4Q13.55,4 14.975,4.5Q16.4,5 17.65,5.95L19.05,4.55L20.45,5.95L19.05,7.35Q20,8.6 20.5,10.025Q21,11.45 21,13Q21,14.85 20.288,16.488Q19.575,18.125 18.35,19.35Q17.125,20.575 15.488,21.288Q13.85,22 12,22ZM12,20Q14.9,20 16.95,17.95Q19,15.9 19,13Q19,10.1 16.95,8.05Q14.9,6 12,6Q9.1,6 7.05,8.05Q5,10.1 5,13Q5,15.9 7.05,17.95Q9.1,20 12,20Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_timer_10_alt_1.xml b/app/src/main/res/drawable/ic_timer_10_alt_1.xml
new file mode 100644
index 0000000..0dcf774
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timer_10_alt_1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M350,689L422,689L422,351L302,351L302,424L350,424L350,689ZM528,689L576,689Q606,689 627.5,668Q649,647 649,617L649,424Q649,394 627.5,372.5Q606,351 576,351L528,351Q498,351 477,372.5Q456,394 456,424L456,617Q456,647 477,668Q498,689 528,689ZM528,617Q528,617 528,617Q528,617 528,617L528,424Q528,424 528,424Q528,424 528,424L576,424Q576,424 576,424Q576,424 576,424L576,617Q576,617 576,617Q576,617 576,617L528,617ZM360,120L360,40L600,40L600,120L360,120ZM480,880Q406,880 340.5,851.5Q275,823 226,774Q177,725 148.5,659.5Q120,594 120,520Q120,446 148.5,380.5Q177,315 226,266Q275,217 340.5,188.5Q406,160 480,160Q542,160 599,180Q656,200 706,238L762,182L818,238L762,294Q800,344 820,401Q840,458 840,520Q840,594 811.5,659.5Q783,725 734,774Q685,823 619.5,851.5Q554,880 480,880ZM480,800Q596,800 678,718Q760,636 760,520Q760,404 678,322Q596,240 480,240Q364,240 282,322Q200,404 200,520Q200,636 282,718Q364,800 480,800Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_timer_3.xml b/app/src/main/res/drawable/ic_timer_3.xml
deleted file mode 100644
index bd0faef..0000000
--- a/app/src/main/res/drawable/ic_timer_3.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M8.95,17.225H13.175Q14.05,17.225 14.675,16.688Q15.3,16.15 15.3,15.4V14.1Q15.3,13.525 14.838,13.137Q14.375,12.75 13.725,12.75Q14.375,12.75 14.838,12.35Q15.3,11.95 15.3,11.375V10.575Q15.3,9.825 14.675,9.3Q14.05,8.775 13.175,8.775H8.95V10.575H13.175V11.85H11.075V13.65H13.175V15.4H8.95ZM9,3V1H15V3ZM12,22Q10.15,22 8.512,21.288Q6.875,20.575 5.65,19.35Q4.425,18.125 3.712,16.488Q3,14.85 3,13Q3,11.15 3.712,9.512Q4.425,7.875 5.65,6.65Q6.875,5.425 8.512,4.713Q10.15,4 12,4Q13.55,4 14.975,4.5Q16.4,5 17.65,5.95L19.05,4.55L20.45,5.95L19.05,7.35Q20,8.6 20.5,10.025Q21,11.45 21,13Q21,14.85 20.288,16.488Q19.575,18.125 18.35,19.35Q17.125,20.575 15.488,21.288Q13.85,22 12,22ZM12,20Q14.9,20 16.95,17.95Q19,15.9 19,13Q19,10.1 16.95,8.05Q14.9,6 12,6Q9.1,6 7.05,8.05Q5,10.1 5,13Q5,15.9 7.05,17.95Q9.1,20 12,20Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_timer_3_alt_1.xml b/app/src/main/res/drawable/ic_timer_3_alt_1.xml
new file mode 100644
index 0000000..6d233c0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timer_3_alt_1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M358,689L527,689Q562,689 587,667.5Q612,646 612,616L612,564Q612,541 593.5,525.5Q575,510 549,510Q575,510 593.5,494Q612,478 612,455L612,423Q612,393 587,372Q562,351 527,351L358,351L358,423L527,423L527,474L443,474L443,546L527,546L527,616L358,616L358,689ZM360,120L360,40L600,40L600,120L360,120ZM480,880Q406,880 340.5,851.5Q275,823 226,774Q177,725 148.5,659.5Q120,594 120,520Q120,446 148.5,380.5Q177,315 226,266Q275,217 340.5,188.5Q406,160 480,160Q542,160 599,180Q656,200 706,238L762,182L818,238L762,294Q800,344 820,401Q840,458 840,520Q840,594 811.5,659.5Q783,725 734,774Q685,823 619.5,851.5Q554,880 480,880ZM480,800Q596,800 678,718Q760,636 760,520Q760,404 678,322Q596,240 480,240Q364,240 282,322Q200,404 200,520Q200,636 282,718Q364,800 480,800Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_timer_off.xml b/app/src/main/res/drawable/ic_timer_off.xml
index a786175..fa46b7a 100644
--- a/app/src/main/res/drawable/ic_timer_off.xml
+++ b/app/src/main/res/drawable/ic_timer_off.xml
@@ -7,9 +7,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M19.04,4.55l-1.42,1.42C16.07,4.74 14.12,4 12,4c-1.83,0 -3.53,0.55 -4.95,1.48l1.46,1.46C9.53,6.35 10.73,6 12,6c3.87,0 7,3.13 7,7 0,1.27 -0.35,2.47 -0.94,3.49l1.45,1.45C20.45,16.53 21,14.83 21,13c0,-2.12 -0.74,-4.07 -1.97,-5.61l1.42,-1.42 -1.41,-1.42zM15,1L9,1v2h6L15,1zM11,9.44l2,2L13,8h-2v1.44zM3.02,4L1.75,5.27 4.5,8.03C3.55,9.45 3,11.16 3,13c0,4.97 4.02,9 9,9 1.84,0 3.55,-0.55 4.98,-1.5l2.5,2.5 1.27,-1.27 -7.71,-7.71L3.02,4zM12,20c-3.87,0 -7,-3.13 -7,-7 0,-1.28 0.35,-2.48 0.95,-3.52l9.56,9.56c-1.03,0.61 -2.23,0.96 -3.51,0.96z" />
+        android:pathData="M798,686L738,626Q749,599 754.5,572.5Q760,546 760,520Q760,404 678,322Q596,240 480,240Q456,240 429,245Q402,250 373,261L313,201Q351,181 393.5,170.5Q436,160 480,160Q540,160 597.5,180Q655,200 706,238L762,182L818,238L762,294Q800,345 820,402.5Q840,460 840,520Q840,562 829.5,603.5Q819,645 798,686ZM520,408L520,320L440,320L440,328L520,408ZM792,904L696,808Q648,843 592.5,861.5Q537,880 480,880Q406,880 340.5,851.5Q275,823 226,774Q177,725 148.5,659.5Q120,594 120,520Q120,460 138.5,404.5Q157,349 192,304L56,168L112,112L848,848L792,904ZM480,800Q522,800 562,787Q602,774 637,750L248,361Q224,396 212,436Q200,476 200,520Q200,636 282,718Q364,800 480,800ZM360,120L360,40L600,40L600,120L360,120ZM443,555Q443,555 443,555Q443,555 443,555Q443,555 443,555Q443,555 443,555L443,555Q443,555 443,555Q443,555 443,555ZM556,443Q556,443 556,443Q556,443 556,443Q556,443 556,443Q556,443 556,443Q556,443 556,443Q556,443 556,443L556,443Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_video_quality_hd.xml b/app/src/main/res/drawable/ic_video_quality_hd.xml
deleted file mode 100644
index 585acff..0000000
--- a/app/src/main/res/drawable/ic_video_quality_hd.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM11,15L9.5,15v-2h-2v2L6,15L6,9h1.5v2.5h2L9.5,9L11,9v6zM13,9h4c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1h-4L13,9zM14.5,13.5h2v-3h-2v3z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_video_quality_sd.xml b/app/src/main/res/drawable/ic_video_quality_sd.xml
deleted file mode 100644
index 9aa8e05..0000000
--- a/app/src/main/res/drawable/ic_video_quality_sd.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM13,9h4c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1h-4L13,9zM9.5,13.5v-1L7,12.5c-0.55,0 -1,-0.45 -1,-1L6,10c0,-0.55 0.45,-1 1,-1h3c0.55,0 1,0.45 1,1v1L9.5,11v-0.5h-2v1L10,11.5c0.55,0 1,0.45 1,1L11,14c0,0.55 -0.45,1 -1,1L7,15c-0.55,0 -1,-0.45 -1,-1v-1h1.5v0.5h2zM14.5,13.5h2v-3h-2v3z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_video_quality_uhd.xml b/app/src/main/res/drawable/ic_video_quality_uhd.xml
deleted file mode 100644
index eb05f21..0000000
--- a/app/src/main/res/drawable/ic_video_quality_uhd.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,13.5h-1L11,15L9.5,15v-1.5h-3L6.5,9L8,9v3h1.5L9.5,9L11,9v3h1v1.5zM18,15h-1.75l-1.75,-2.25L14.5,15L13,15L13,9h1.5v2.25L16.25,9L18,9l-2.25,3L18,15z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index 18bee78..0db8723 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -140,7 +140,7 @@
             <Button
                 android:id="@+id/aspectRatioButton"
                 style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
-                android:drawableTop="@drawable/ic_aspect_ratio_4_3"
+                android:drawableTop="@drawable/ic_aspect_ratio"
                 android:text="@string/aspect_ratio_4_3"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/effectButton"
@@ -150,7 +150,7 @@
             <Button
                 android:id="@+id/effectButton"
                 style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
-                android:drawableTop="@drawable/ic_effect_none"
+                android:drawableTop="@drawable/ic_blur_off"
                 android:text="@string/effect_none"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/videoQualityButton"
@@ -161,7 +161,7 @@
             <Button
                 android:id="@+id/videoQualityButton"
                 style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
-                android:drawableTop="@drawable/ic_video_quality_hd"
+                android:drawableTop="@drawable/ic_hd"
                 android:text="@string/video_quality_fhd"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/videoFrameRateButton"
@@ -212,7 +212,7 @@
             <Button
                 android:id="@+id/gridButton"
                 style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
-                android:drawableTop="@drawable/ic_grid_off"
+                android:drawableTop="@drawable/ic_grid_3x3_off"
                 android:text="@string/grid_off"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/settingsButton"
@@ -314,12 +314,29 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <ImageView
-                android:id="@+id/galleryButton"
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/gallery_button_description"
-                android:scaleType="centerCrop" />
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/galleryButtonIconImageView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/gallery_button_description"
+                    android:scaleX="0.50"
+                    android:scaleY="0.50"
+                    app:tint="?attr/colorOnSecondaryContainer" />
+
+                <ImageView
+                    android:id="@+id/galleryButtonPreviewImageView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/gallery_button_description"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone" />
+
+            </FrameLayout>
+
         </androidx.cardview.widget.CardView>
 
         <ImageButton
diff --git a/app/src/main/res/layout/qr_bottom_sheet_dialog.xml b/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
index f23a72e..0bcfa0e 100644
--- a/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
@@ -53,7 +53,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_copy" />
+                tools:src="@drawable/ic_content_copy" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="0dp"
@@ -124,7 +124,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/qr_copy_description"
                 android:padding="5dp"
-                android:src="@drawable/ic_copy"
+                android:src="@drawable/ic_content_copy"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"