diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4d5cd0c52..082d76f7a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 - Fixed an issue where room names would not show up in the connected peers list.
+- Update the color palette used in the navigation bars and the main tab bar. #1059
 - Added new redesigned Discover screen. #587
 - Publish announcement messages of newly registered room aliases on the SSB log. #899
 
diff --git a/Resources/Assets.xcassets/Colors/selectedTab.colorset/Contents.json b/Resources/Assets.xcassets/Colors/selectedTab.colorset/Contents.json
deleted file mode 100644
index e229cb9431..0000000000
--- a/Resources/Assets.xcassets/Colors/selectedTab.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xEA",
-          "green" : "0x74",
-          "red" : "0x84"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Resources/Assets.xcassets/Colors/textInputDropShadow.colorset/Contents.json b/Resources/Assets.xcassets/Colors/textInputDropShadow.colorset/Contents.json
deleted file mode 100644
index ecc51df1d4..0000000000
--- a/Resources/Assets.xcassets/Colors/textInputDropShadow.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.275",
-          "green" : "0.106",
-          "red" : "0.180"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Resources/Assets.xcassets/Colors/textInputInnerShadow.colorset/Contents.json b/Resources/Assets.xcassets/Colors/textInputInnerShadow.colorset/Contents.json
deleted file mode 100644
index d5e9083a70..0000000000
--- a/Resources/Assets.xcassets/Colors/textInputInnerShadow.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xE3",
-          "green" : "0xE3",
-          "red" : "0xE3"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x33",
-          "green" : "0x16",
-          "red" : "0x20"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Resources/Assets.xcassets/New Colors/accent-txt.colorset/Contents.json b/Resources/Assets.xcassets/New Colors/accent.colorset/Contents.json
similarity index 100%
rename from Resources/Assets.xcassets/New Colors/accent-txt.colorset/Contents.json
rename to Resources/Assets.xcassets/New Colors/accent.colorset/Contents.json
diff --git a/Resources/Assets.xcassets/Colors/unselectedTab.colorset/Contents.json b/Resources/Assets.xcassets/New Colors/navigationbar-bg.colorset/Contents.json
similarity index 80%
rename from Resources/Assets.xcassets/Colors/unselectedTab.colorset/Contents.json
rename to Resources/Assets.xcassets/New Colors/navigationbar-bg.colorset/Contents.json
index 2b7a7b96b1..3e5de21484 100644
--- a/Resources/Assets.xcassets/Colors/unselectedTab.colorset/Contents.json
+++ b/Resources/Assets.xcassets/New Colors/navigationbar-bg.colorset/Contents.json	
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x51",
-          "green" : "0x51",
-          "red" : "0x51"
+          "blue" : "0xF4",
+          "green" : "0xF5",
+          "red" : "0xFC"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xA6",
-          "green" : "0x88",
-          "red" : "0x9A"
+          "blue" : "0x51",
+          "green" : "0x22",
+          "red" : "0x33"
         }
       },
       "idiom" : "universal"
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Contents.json
index 6922a80242..1e490a9e0e 100644
--- a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Channels--selected@1x.png",
+      "filename" : "Topics_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--selected@1x-1.png",
+      "filename" : "Topics_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Channels--selected@2x.png",
+      "filename" : "Topics_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--selected@2x-1.png",
+      "filename" : "Topics_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Channels--selected@3x.png",
+      "filename" : "Topics_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--selected@3x-1.png",
+      "filename" : "Topics_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@1x-1.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@1x-1.png
deleted file mode 100644
index e43701141a..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@1x.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@1x.png
deleted file mode 100644
index 50dcb84717..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@2x-1.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@2x-1.png
deleted file mode 100644
index bde6297832..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@2x.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@2x.png
deleted file mode 100644
index ed139d3fac..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@3x-1.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@3x-1.png
deleted file mode 100644
index 130bf431f7..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@3x.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@3x.png
deleted file mode 100644
index 2d4eeb42da..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Light - Channels--selected@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active.png
new file mode 100644
index 0000000000..0f2de4a419
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active@2x.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active@2x.png
new file mode 100644
index 0000000000..7c92c96770
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active@3x.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active@3x.png
new file mode 100644
index 0000000000..cab5c11fdf
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_dark--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active.png
new file mode 100644
index 0000000000..a5a76c18bc
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active@2x.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active@2x.png
new file mode 100644
index 0000000000..f15c2962b6
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active@3x.png b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active@3x.png
new file mode 100644
index 0000000000..99b95125ff
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Topics_light--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-channels.imageset/Contents.json
index 49e94e58c5..2e5000addc 100644
--- a/Resources/Assets.xcassets/tab-icon-channels.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-channels.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Channels--default@1x.png",
+      "filename" : "Topics_light--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--default@1x-1.png",
+      "filename" : "Topics_dark--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Channels--default@2x.png",
+      "filename" : "Topics_light--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--default@2x-1.png",
+      "filename" : "Topics_dark--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Channels--default@3x.png",
+      "filename" : "Topics_light--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--default@3x-1.png",
+      "filename" : "Topics_dark--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@1x-1.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@1x-1.png
deleted file mode 100644
index 658c5f3545..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@1x.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@1x.png
deleted file mode 100644
index 2ee6c6a15c..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@2x-1.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@2x-1.png
deleted file mode 100644
index 261956d350..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@2x.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@2x.png
deleted file mode 100644
index 73f6fc6985..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@3x-1.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@3x-1.png
deleted file mode 100644
index b052458289..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@3x.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@3x.png
deleted file mode 100644
index 0a679f5e72..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-channels.imageset/Light - Channels--default@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default.png
new file mode 100644
index 0000000000..dde2a3bffa
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default@2x.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default@2x.png
new file mode 100644
index 0000000000..8116182b1f
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default@3x.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default@3x.png
new file mode 100644
index 0000000000..a3bc858a60
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_dark--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default.png
new file mode 100644
index 0000000000..33b838066c
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default@2x.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default@2x.png
new file mode 100644
index 0000000000..bde9c07027
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default@3x.png b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default@3x.png
new file mode 100644
index 0000000000..c88a170f49
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-channels.imageset/Topics_light--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity.png
deleted file mode 100644
index 14d1284b45..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity@2x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity@2x.png
deleted file mode 100644
index 904740d91f..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity@3x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity@3x.png
deleted file mode 100644
index 22df24edba..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Activity@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Contents.json
index 45ee1fbf52..cc08172d49 100644
--- a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Network--selected@1x.png",
+      "filename" : "Network_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Activity.png",
+      "filename" : "Network_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Network--selected@2x.png",
+      "filename" : "Network_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Activity@2x.png",
+      "filename" : "Network_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Network--selected@3x.png",
+      "filename" : "Network_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Activity@3x.png",
+      "filename" : "Network_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@1x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@1x.png
deleted file mode 100644
index 732f2181a0..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@2x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@2x.png
deleted file mode 100644
index dbe050cade..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@3x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@3x.png
deleted file mode 100644
index 4cca03a3e1..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Light - Network--selected@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active.png
new file mode 100644
index 0000000000..eb6e34ba2b
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active@2x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active@2x.png
new file mode 100644
index 0000000000..3dc8b81cfd
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active@3x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active@3x.png
new file mode 100644
index 0000000000..b68bda59f5
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_dark--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active.png
new file mode 100644
index 0000000000..9fbdb3c90f
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active@2x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active@2x.png
new file mode 100644
index 0000000000..0d1c1febeb
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active@3x.png b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active@3x.png
new file mode 100644
index 0000000000..9751e8375d
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Network_light--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-directory.imageset/Contents.json
index 291dfbe546..8b9908d9b9 100644
--- a/Resources/Assets.xcassets/tab-icon-directory.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-directory.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Network--default@1x.png",
+      "filename" : "Network_light--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Network--default@1x-1.png",
+      "filename" : "Network_dark--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Network--default@2x.png",
+      "filename" : "Network_light--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Network--default@2x-1.png",
+      "filename" : "Network_dark--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Network--default@3x.png",
+      "filename" : "Network_light--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Network--default@3x-1.png",
+      "filename" : "Network_dark--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@1x-1.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@1x-1.png
deleted file mode 100644
index dbf82af932..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@1x.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@1x.png
deleted file mode 100644
index 149b816a3c..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@2x-1.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@2x-1.png
deleted file mode 100644
index 90f6c4284c..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@2x.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@2x.png
deleted file mode 100644
index 4a3e044487..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@3x-1.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@3x-1.png
deleted file mode 100644
index 0e571007bd..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@3x.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@3x.png
deleted file mode 100644
index 42c8d7ed6b..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-directory.imageset/Light - Network--default@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default.png
new file mode 100644
index 0000000000..6e05d836fe
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default@2x.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default@2x.png
new file mode 100644
index 0000000000..55adaafa93
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default@3x.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default@3x.png
new file mode 100644
index 0000000000..a2ba4acf98
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_dark--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default.png
new file mode 100644
index 0000000000..a4ad34cb23
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default@2x.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default@2x.png
new file mode 100644
index 0000000000..e63ce44da7
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default@3x.png b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default@3x.png
new file mode 100644
index 0000000000..3b8a6a54a0
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-directory.imageset/Network_light--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Contents.json
index 0d759ff49d..14af38e1e6 100644
--- a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Search--selected@1x.png",
+      "filename" : "Discover_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--selected@1x-1.png",
+      "filename" : "Discover_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Search--selected@2x.png",
+      "filename" : "Discover_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--selected@2x-1.png",
+      "filename" : "Discover_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Search--selected@3x.png",
+      "filename" : "Discover_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--selected@3x-1.png",
+      "filename" : "Discover_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active.png
new file mode 100644
index 0000000000..58c1011dbf
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active@2x.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active@2x.png
new file mode 100644
index 0000000000..12e30646a2
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active@3x.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active@3x.png
new file mode 100644
index 0000000000..f0f62ec51c
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_dark--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active.png
new file mode 100644
index 0000000000..ce1bf7fafd
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active@2x.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active@2x.png
new file mode 100644
index 0000000000..45b855a95b
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active@3x.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active@3x.png
new file mode 100644
index 0000000000..58a802f651
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Discover_light--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@1x-1.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@1x-1.png
deleted file mode 100644
index 0a59257e45..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@1x.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@1x.png
deleted file mode 100644
index 37aa4a9bac..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@2x-1.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@2x-1.png
deleted file mode 100644
index 1be563f005..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@2x.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@2x.png
deleted file mode 100644
index ad4b0476bd..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@3x-1.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@3x-1.png
deleted file mode 100644
index 3eb53f58ab..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@3x.png b/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@3x.png
deleted file mode 100644
index 6d0070639c..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Light - Search--selected@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Contents.json
index 12397010b8..73fbb4d534 100644
--- a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Search--default@1x.png",
+      "filename" : "Discover_light--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--default@1x-1.png",
+      "filename" : "Discover_dark--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Search--default@2x.png",
+      "filename" : "Discover_light--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--default@2x-1.png",
+      "filename" : "Discover_dark--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Search--default@3x.png",
+      "filename" : "Discover_light--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--default@3x-1.png",
+      "filename" : "Discover_dark--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default.png
new file mode 100644
index 0000000000..afd0d8893d
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default@2x.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default@2x.png
new file mode 100644
index 0000000000..8977038323
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default@3x.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default@3x.png
new file mode 100644
index 0000000000..403028178a
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_dark--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default.png
new file mode 100644
index 0000000000..f929727d8a
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default@2x.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default@2x.png
new file mode 100644
index 0000000000..8c615f5ad7
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default@3x.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default@3x.png
new file mode 100644
index 0000000000..c1ccf74714
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Discover_light--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@1x-1.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@1x-1.png
deleted file mode 100644
index 84b261369a..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@1x.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@1x.png
deleted file mode 100644
index 14a395122a..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@2x-1.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@2x-1.png
deleted file mode 100644
index 722311f2ec..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@2x.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@2x.png
deleted file mode 100644
index fc784f3b3b..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@3x-1.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@3x-1.png
deleted file mode 100644
index 02d71ac7f0..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@3x.png b/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@3x.png
deleted file mode 100644
index 9b5cefb43a..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-everyone.imageset/Light - Search--default@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Contents.json
deleted file mode 100644
index a3d2d043e5..0000000000
--- a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Contents.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Light - Alerts--selected@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Light - Alerts--selected@1x-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Light - Alerts--selected@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Light - Alerts--selected@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Light - Alerts--selected@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Light - Alerts--selected@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "original"
-  }
-}
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@1x-1.png b/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@1x-1.png
deleted file mode 100644
index 827793b00b..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@1x.png b/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@1x.png
deleted file mode 100644
index 79f8e584db..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@2x-1.png b/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@2x-1.png
deleted file mode 100644
index f4a43d326a..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@2x.png b/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@2x.png
deleted file mode 100644
index d2e3b7fddd..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@3x-1.png b/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@3x-1.png
deleted file mode 100644
index 34b2c7adf8..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@3x.png b/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@3x.png
deleted file mode 100644
index 0be909afda..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications-selected.imageset/Light - Alerts--selected@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Contents.json
deleted file mode 100644
index 14bd2ad976..0000000000
--- a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Contents.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Light - Alerts--default@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Light - Alerts--default@1x-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Light - Alerts--default@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Light - Alerts--default@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Light - Alerts--default@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Light - Alerts--default@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "original"
-  }
-}
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@1x-1.png b/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@1x-1.png
deleted file mode 100644
index a63b223a15..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@1x.png b/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@1x.png
deleted file mode 100644
index 9cd72354be..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@2x-1.png b/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@2x-1.png
deleted file mode 100644
index 17fd362d6b..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@2x.png b/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@2x.png
deleted file mode 100644
index 6e0fe1c198..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@3x-1.png b/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@3x-1.png
deleted file mode 100644
index 6d00403d90..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@3x.png b/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@3x.png
deleted file mode 100644
index d30df5e3a6..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-has-notifications.imageset/Light - Alerts--default@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Contents.json
index 0461d72d28..87b97a6493 100644
--- a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Home--selected@1x.png",
+      "filename" : "Feed_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Home--selected@1x-1.png",
+      "filename" : "Feed_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Home--selected@2x.png",
+      "filename" : "Feed_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Home--selected@2x-1.png",
+      "filename" : "Feed_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Home--selected@3x.png",
+      "filename" : "Feed_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Home--selected@3x-1.png",
+      "filename" : "Feed_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active.png
new file mode 100644
index 0000000000..3c317d06e9
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active@2x.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active@2x.png
new file mode 100644
index 0000000000..695df9cba1
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active@3x.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active@3x.png
new file mode 100644
index 0000000000..8897079996
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_dark--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active.png
new file mode 100644
index 0000000000..0f673d620f
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active@2x.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active@2x.png
new file mode 100644
index 0000000000..4d838d8482
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active@3x.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active@3x.png
new file mode 100644
index 0000000000..8a5c883b8b
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Feed_light--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@1x-1.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@1x-1.png
deleted file mode 100644
index d3b777f16c..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@1x.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@1x.png
deleted file mode 100644
index d3b777f16c..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@2x-1.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@2x-1.png
deleted file mode 100644
index d6346f87de..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@2x.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@2x.png
deleted file mode 100644
index d6346f87de..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@3x-1.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@3x-1.png
deleted file mode 100644
index fd2cec6400..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@3x.png b/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@3x.png
deleted file mode 100644
index fd2cec6400..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home-selected.imageset/Light - Home--selected@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-home.imageset/Contents.json
index 6b733d0f81..e514e423a4 100644
--- a/Resources/Assets.xcassets/tab-icon-home.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-home.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Home--default@1x.png",
+      "filename" : "Feed_light--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Home--default@1x-1.png",
+      "filename" : "Feed_dark--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Home--default@2x.png",
+      "filename" : "Feed_light--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Home--default@2x-1.png",
+      "filename" : "Feed_dark--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Home--default@3x.png",
+      "filename" : "Feed_light--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Home--default@3x-1.png",
+      "filename" : "Feed_dark--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default.png
new file mode 100644
index 0000000000..f5398feaaf
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default@2x.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default@2x.png
new file mode 100644
index 0000000000..459404586f
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default@3x.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default@3x.png
new file mode 100644
index 0000000000..92ff2f8834
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_dark--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default.png
new file mode 100644
index 0000000000..487b12fec9
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default@2x.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default@2x.png
new file mode 100644
index 0000000000..cbd74b93ec
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default@3x.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default@3x.png
new file mode 100644
index 0000000000..b2a261da1d
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-home.imageset/Feed_light--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@1x-1.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@1x-1.png
deleted file mode 100644
index 4b4a95dc53..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@1x.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@1x.png
deleted file mode 100644
index b77b5217a6..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@2x-1.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@2x-1.png
deleted file mode 100644
index 6f16024d90..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@2x.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@2x.png
deleted file mode 100644
index 863b4410d4..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@3x-1.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@3x-1.png
deleted file mode 100644
index f24357282c..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@3x.png b/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@3x.png
deleted file mode 100644
index 244e3add99..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-home.imageset/Light - Home--default@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active.png
new file mode 100644
index 0000000000..2757cc09a1
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active@2x.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active@2x.png
new file mode 100644
index 0000000000..c0fdd3f706
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active@3x.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active@3x.png
new file mode 100644
index 0000000000..1a1b8c9ef7
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_dark--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active.png
new file mode 100644
index 0000000000..dc162854cb
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active@2x.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active@2x.png
new file mode 100644
index 0000000000..6dd1c29558
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active@3x.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active@3x.png
new file mode 100644
index 0000000000..5b86ee39c0
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Alerts_light--active@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Contents.json
index a3d2d043e5..edb3dc95ea 100644
--- a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Alerts--selected@1x.png",
+      "filename" : "Alerts_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Alerts--selected@1x-1.png",
+      "filename" : "Alerts_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Alerts--selected@2x.png",
+      "filename" : "Alerts_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Alerts--selected@2x-1.png",
+      "filename" : "Alerts_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Alerts--selected@3x.png",
+      "filename" : "Alerts_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Alerts--selected@3x-1.png",
+      "filename" : "Alerts_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@1x-1.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@1x-1.png
deleted file mode 100644
index 827793b00b..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@1x.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@1x.png
deleted file mode 100644
index 79f8e584db..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@2x-1.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@2x-1.png
deleted file mode 100644
index f4a43d326a..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@2x.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@2x.png
deleted file mode 100644
index d2e3b7fddd..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@3x-1.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@3x-1.png
deleted file mode 100644
index 34b2c7adf8..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@3x.png b/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@3x.png
deleted file mode 100644
index 0be909afda..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications-selected.imageset/Light - Alerts--selected@3x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default.png
new file mode 100644
index 0000000000..ba7fd53e90
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default@2x.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default@2x.png
new file mode 100644
index 0000000000..47afbd23ca
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default@3x.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default@3x.png
new file mode 100644
index 0000000000..aa502af5aa
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_dark--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default.png
new file mode 100644
index 0000000000..14e5ab04d2
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default@2x.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default@2x.png
new file mode 100644
index 0000000000..1ce74757fd
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default@2x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default@3x.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default@3x.png
new file mode 100644
index 0000000000..92ac23aef5
Binary files /dev/null and b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Alerts_light--default@3x.png differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Contents.json b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Contents.json
index 14bd2ad976..403773ab30 100644
--- a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Contents.json
+++ b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Alerts--default@1x.png",
+      "filename" : "Alerts_light--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Alerts--default@1x-1.png",
+      "filename" : "Alerts_dark--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Alerts--default@2x.png",
+      "filename" : "Alerts_light--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Alerts--default@2x-1.png",
+      "filename" : "Alerts_dark--default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Alerts--default@3x.png",
+      "filename" : "Alerts_light--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Alerts--default@3x-1.png",
+      "filename" : "Alerts_dark--default@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@1x-1.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@1x-1.png
deleted file mode 100644
index a63b223a15..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@1x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@1x.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@1x.png
deleted file mode 100644
index 9cd72354be..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@1x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@2x-1.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@2x-1.png
deleted file mode 100644
index 17fd362d6b..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@2x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@2x.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@2x.png
deleted file mode 100644
index 6e0fe1c198..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@2x.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@3x-1.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@3x-1.png
deleted file mode 100644
index 6d00403d90..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@3x-1.png and /dev/null differ
diff --git a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@3x.png b/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@3x.png
deleted file mode 100644
index d30df5e3a6..0000000000
Binary files a/Resources/Assets.xcassets/tab-icon-notifications.imageset/Light - Alerts--default@3x.png and /dev/null differ
diff --git a/Source/App/AppController.swift b/Source/App/AppController.swift
index f7f873d99a..dc0a8adf96 100644
--- a/Source/App/AppController.swift
+++ b/Source/App/AppController.swift
@@ -42,7 +42,7 @@ class AppController: UIViewController, ObservableObject {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.backgroundColor = .appBackground
+        self.view.backgroundColor = .appBg
         self.addObservers()
     }
     
diff --git a/Source/App/AppDelegate+UIAppearance.swift b/Source/App/AppDelegate+UIAppearance.swift
index 1d47a37b21..9866fbb2fd 100644
--- a/Source/App/AppDelegate+UIAppearance.swift
+++ b/Source/App/AppDelegate+UIAppearance.swift
@@ -19,7 +19,7 @@ extension AppDelegate {
     func configureAppearance() {
 
         // default tint across app, affects buttons
-        UIWindow.appearance().tintColor = UIColor.tint.default
+        UIWindow.appearance().tintColor = UIColor.accent
 
         // nav bar
         // we have to set the image because setting the backgroundColor
@@ -28,31 +28,31 @@ extension AppDelegate {
         let appearance = UINavigationBar.appearance()
         appearance.backIndicatorImage = image
         appearance.backIndicatorTransitionMaskImage = image
-        appearance.tintColor = UIColor.tint.default
+        appearance.tintColor = UIColor.accent
         appearance.titleTextAttributes = [
             .font: UIFont.systemFont(ofSize: 20, weight: .medium),
-            .foregroundColor: UIColor.secondaryText
+            .foregroundColor: UIColor.secondaryTxt
         ]
 
         // clear the bottom shadow edge to allow for a custom edge
         appearance.shadowImage = UIColor.clear.image(dimension: 1)
 
         appearance.isTranslucent = false
-        appearance.backgroundColor = .cardBackground
-        appearance.barTintColor = .cardBackground
+        appearance.backgroundColor = .navigationbarBg
+        appearance.barTintColor = .navigationbarBg
 
         // refresh control
         UIRefreshControl.appearance().tintColor = .loadingIcon
 
         // search bar
-        UISearchBar.appearance().backgroundColor = .cardBackground
+        UISearchBar.appearance().backgroundColor = .navigationbarBg
         
         // table footers and headers
-        let footerColor = UIColor.secondaryText
+        let footerColor = UIColor.secondaryTxt
         UILabel.appearance(whenContainedInInstancesOf: [UITableViewHeaderFooterView.self]).textColor = footerColor
         
         // table views
-        UITableView.appearance().backgroundColor = .appBackground
+        UITableView.appearance().backgroundColor = .appBg
     }
 }
 
@@ -64,15 +64,13 @@ extension UITabBar {
     /// to be used for all versions.
     func configureAppearance() {
         let itemAppearance = UITabBarItemAppearance()
-        itemAppearance.normal.iconColor = .unselectedTab
-        itemAppearance.normal.badgeBackgroundColor = .selectedTab
-        itemAppearance.selected.iconColor = .selectedTab
-        itemAppearance.selected.badgeBackgroundColor = .selectedTab
+        itemAppearance.normal.badgeBackgroundColor = .accent
+        itemAppearance.selected.badgeBackgroundColor = .accent
         
         let appearance = UITabBarAppearance()
         appearance.stackedLayoutAppearance = itemAppearance
         appearance.configureWithOpaqueBackground()
-        appearance.backgroundColor = .cardBackground
+        appearance.backgroundColor = .navigationbarBg
         appearance.backgroundImage = UIImage()
         appearance.shadowColor = nil
         appearance.shadowImage = UIImage()
diff --git a/Source/Controller/FeatureViewController.swift b/Source/Controller/FeatureViewController.swift
index 54fd90afeb..1bb710b948 100644
--- a/Source/Controller/FeatureViewController.swift
+++ b/Source/Controller/FeatureViewController.swift
@@ -47,7 +47,7 @@ class FeatureViewController: UINavigationController {
     }
 
     private func setTabBarItem(title: String?, image named: String? = nil) {
-        guard let name = named ?? cachedTabBarItemImageName, setTabBarItemImage(name) else {
+        guard let name = named ?? cachedTabBarItemImageName, setTabBarItemImage(title: title, image: name) else {
             return
         }
         self.tabBarItem.accessibilityLabel = title
@@ -60,11 +60,13 @@ class FeatureViewController: UINavigationController {
     }
 
     override func viewWillLayoutSubviews() {
-        navigationBar.topItem?.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+        let backButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+        backButtonItem.tintColor = .primaryTxt
+        navigationBar.topItem?.backBarButtonItem = backButtonItem
     }
 
     @discardableResult
-    func setTabBarItemImage(_ name: String) -> Bool {
+    func setTabBarItemImage(title: String?, image name: String) -> Bool {
         guard let image = UIImage(named: name) else {
             return false
         }
@@ -72,9 +74,7 @@ class FeatureViewController: UINavigationController {
             return false
         }
         cachedTabBarItemImageName = name
-        let tabBarItem = UITabBarItem(title: nil, image: image, selectedImage: selected)
-        tabBarItem.imageInsets = UIEdgeInsets(top: 6, left: 0, bottom: -6, right: 0)
-        self.tabBarItem = tabBarItem
+        self.tabBarItem = UITabBarItem(title: title, image: image, selectedImage: selected)
         return true
     }
 
diff --git a/Source/Controller/HelpDrawerCoordinator.swift b/Source/Controller/HelpDrawerCoordinator.swift
index 5643b65dab..b120e4c529 100644
--- a/Source/Controller/HelpDrawerCoordinator.swift
+++ b/Source/Controller/HelpDrawerCoordinator.swift
@@ -196,7 +196,7 @@ enum HelpDrawerCoordinator {
         case .discover:
             return {
                 host.dismissDrawer {
-                    let featureVC = tabBar?.everyoneViewController
+                    let featureVC = tabBar?.everyoneFeatureViewController
                     tabBar?.selectedViewController = featureVC
                     tabBar?.helpDrawerState.isShowingDiscoverHelpDrawer = true
                 }
diff --git a/Source/Controller/MainViewController.swift b/Source/Controller/MainViewController.swift
index 8cfc616b09..d9964bfaef 100644
--- a/Source/Controller/MainViewController.swift
+++ b/Source/Controller/MainViewController.swift
@@ -65,7 +65,7 @@ enum MainTab {
         case .discover:
             return {
                 tabBar?.selectedViewController?.dismiss(animated: true)
-                let featureVC = tabBar?.everyoneViewController
+                let featureVC = tabBar?.everyoneFeatureViewController
                 tabBar?.selectedViewController = featureVC
             }
         case .notifications:
@@ -108,28 +108,34 @@ class MainViewController: UITabBarController {
         tabBarItemImageName: "tab-icon-directory"
     )
 
-    let everyoneViewController: FeatureViewController
+    let everyoneFeatureViewController: FeatureViewController
 
     // custom separator on the top edge of the tab bar
     private var topBorder: UIView?
 
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        let homeViewController = UIHostingController(
+            rootView: HomeView(helpDrawerState: helpDrawerState, bot: Bots.current).injectAppEnvironment()
+        )
+        homeViewController.navigationItem.title = Localized.home.text
         homeFeatureViewController = FeatureViewController(
-            rootViewController: UIHostingController(
-                rootView: HomeView(helpDrawerState: helpDrawerState, bot: Bots.current).injectAppEnvironment()
-            ),
+            rootViewController: homeViewController,
             tabBarItemImageName: "tab-icon-home"
         )
-        everyoneViewController = FeatureViewController(
-            rootViewController: UIHostingController(
-                rootView: DiscoverView(helpDrawerState: helpDrawerState, bot: Bots.current).injectAppEnvironment()
-            ),
+        let everyoneViewController = UIHostingController(
+            rootView: DiscoverView(helpDrawerState: helpDrawerState, bot: Bots.current).injectAppEnvironment()
+        )
+        everyoneViewController.navigationItem.title = Localized.explore.text
+        everyoneFeatureViewController = FeatureViewController(
+            rootViewController: everyoneViewController,
             tabBarItemImageName: "tab-icon-everyone"
         )
+        let channelsViewController = UIHostingController(
+            rootView: HashtagListView(helpDrawerState: helpDrawerState).injectAppEnvironment()
+        )
+        channelsViewController.navigationItem.title = Localized.channels.text
         channelsFeatureViewController = FeatureViewController(
-            rootViewController: UIHostingController(
-                rootView: HashtagListView(helpDrawerState: helpDrawerState).injectAppEnvironment()
-            ),
+            rootViewController: channelsViewController,
             tabBarItemImageName: "tab-icon-channels"
         )
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
@@ -138,13 +144,13 @@ class MainViewController: UITabBarController {
     convenience init() {
         self.init(nibName: nil, bundle: nil)
         self.delegate = self
-        self.view.backgroundColor = .cardBackground
+        self.view.backgroundColor = .navigationbarBg
         self.tabBar.configureAppearance()
         self.topBorder = Layout.addSeparator(toTopOf: self.tabBar, color: UIColor.separator.bar)
         setNotificationsTabBarIcon()
         let controllers = [
             self.homeFeatureViewController,
-            self.everyoneViewController,
+            self.everyoneFeatureViewController,
             self.notificationsFeatureViewController,
             self.channelsFeatureViewController,
             self.directoryFeatureViewController
@@ -161,11 +167,13 @@ class MainViewController: UITabBarController {
     func setNotificationsTabBarIcon() {
         DispatchQueue.main.async { [weak self] in
             let numberOfNotifications = UIApplication.shared.applicationIconBadgeNumber
+            self?.notificationsFeatureViewController.setTabBarItemImage(
+                title: Localized.notifications.text,
+                image: "tab-icon-notifications"
+            )
             if numberOfNotifications > 0 {
-                self?.notificationsFeatureViewController.setTabBarItemImage("tab-icon-has-notifications")
                 self?.notificationsFeatureViewController.setTabBarItemBadge(numberOfNotifications)
             } else {
-                self?.notificationsFeatureViewController.setTabBarItemImage("tab-icon-notifications")
                 self?.notificationsFeatureViewController.setTabBarItemBadge(nil)
             }
         }
diff --git a/Source/Generated/Assets+Planetary.swift b/Source/Generated/Assets+Planetary.swift
index 8c35e35c17..3900ac61e8 100644
--- a/Source/Generated/Assets+Planetary.swift
+++ b/Source/Generated/Assets+Planetary.swift
@@ -51,7 +51,6 @@ extension Color {
        static let screenOverlay = Color("screenOverlay", bundle: Bundle.current)
        static let secondaryAction = Color("secondaryAction", bundle: Bundle.current)
        static let secondaryText = Color("secondaryText", bundle: Bundle.current)
-       static let selectedTab = Color("selectedTab", bundle: Bundle.current)
        static let separatorDefault = Color("separator.default", bundle: Bundle.current)
        static let splashBackgroundColor = Color("splashBackgroundColor", bundle: Bundle.current)
        static let subheadlineText = Color("subheadlineText", bundle: Bundle.current)
@@ -59,10 +58,7 @@ extension Color {
        static let textColor = Color("textColor", bundle: Bundle.current)
        static let textInputBackground = Color("textInputBackground", bundle: Bundle.current)
        static let textInputBorder = Color("textInputBorder", bundle: Bundle.current)
-       static let textInputDropShadow = Color("textInputDropShadow", bundle: Bundle.current)
-       static let textInputInnerShadow = Color("textInputInnerShadow", bundle: Bundle.current)
-       static let unselectedTab = Color("unselectedTab", bundle: Bundle.current)
-       static let accentTxt = Color("accent-txt", bundle: Bundle.current)
+       static let accent = Color("accent", bundle: Bundle.current)
        static let appBg = Color("app-bg", bundle: Bundle.current)
        static let cardBgBottom = Color("card-bg-bottom", bundle: Bundle.current)
        static let cardBgTop = Color("card-bg-top", bundle: Bundle.current)
@@ -71,6 +67,7 @@ extension Color {
        static let cardDivider = Color("card-divider", bundle: Bundle.current)
        static let cardShadowBottom = Color("card-shadow-bottom", bundle: Bundle.current)
        static let hashtagBg = Color("hashtag-bg", bundle: Bundle.current)
+       static let navigationbarBg = Color("navigationbar-bg", bundle: Bundle.current)
        static let postareplyBackground = Color("postareply-background", bundle: Bundle.current)
        static let postareplyShadowBottom = Color("postareply-shadow-bottom", bundle: Bundle.current)
        static let postareplyShadowTop = Color("postareply-shadow-top", bundle: Bundle.current)
@@ -132,7 +129,6 @@ extension UIColor {
        static let screenOverlay = UIColor(named: "screenOverlay", in: Bundle.current, compatibleWith: nil)!
        static let secondaryAction = UIColor(named: "secondaryAction", in: Bundle.current, compatibleWith: nil)!
        static let secondaryText = UIColor(named: "secondaryText", in: Bundle.current, compatibleWith: nil)!
-       static let selectedTab = UIColor(named: "selectedTab", in: Bundle.current, compatibleWith: nil)!
        static let separatorDefault = UIColor(named: "separator.default", in: Bundle.current, compatibleWith: nil)!
        static let splashBackgroundColor = UIColor(named: "splashBackgroundColor", in: Bundle.current, compatibleWith: nil)!
        static let subheadlineText = UIColor(named: "subheadlineText", in: Bundle.current, compatibleWith: nil)!
@@ -140,10 +136,7 @@ extension UIColor {
        static let textColor = UIColor(named: "textColor", in: Bundle.current, compatibleWith: nil)!
        static let textInputBackground = UIColor(named: "textInputBackground", in: Bundle.current, compatibleWith: nil)!
        static let textInputBorder = UIColor(named: "textInputBorder", in: Bundle.current, compatibleWith: nil)!
-       static let textInputDropShadow = UIColor(named: "textInputDropShadow", in: Bundle.current, compatibleWith: nil)!
-       static let textInputInnerShadow = UIColor(named: "textInputInnerShadow", in: Bundle.current, compatibleWith: nil)!
-       static let unselectedTab = UIColor(named: "unselectedTab", in: Bundle.current, compatibleWith: nil)!
-       static let accentTxt = UIColor(named: "accent-txt", in: Bundle.current, compatibleWith: nil)!
+       static let accent = UIColor(named: "accent", in: Bundle.current, compatibleWith: nil)!
        static let appBg = UIColor(named: "app-bg", in: Bundle.current, compatibleWith: nil)!
        static let cardBgBottom = UIColor(named: "card-bg-bottom", in: Bundle.current, compatibleWith: nil)!
        static let cardBgTop = UIColor(named: "card-bg-top", in: Bundle.current, compatibleWith: nil)!
@@ -152,6 +145,7 @@ extension UIColor {
        static let cardDivider = UIColor(named: "card-divider", in: Bundle.current, compatibleWith: nil)!
        static let cardShadowBottom = UIColor(named: "card-shadow-bottom", in: Bundle.current, compatibleWith: nil)!
        static let hashtagBg = UIColor(named: "hashtag-bg", in: Bundle.current, compatibleWith: nil)!
+       static let navigationbarBg = UIColor(named: "navigationbar-bg", in: Bundle.current, compatibleWith: nil)!
        static let postareplyBackground = UIColor(named: "postareply-background", in: Bundle.current, compatibleWith: nil)!
        static let postareplyShadowBottom = UIColor(named: "postareply-shadow-bottom", in: Bundle.current, compatibleWith: nil)!
        static let postareplyShadowTop = UIColor(named: "postareply-shadow-top", in: Bundle.current, compatibleWith: nil)!
@@ -228,8 +222,6 @@ extension Image {
        static let tabIconDirectory = Image("tab-icon-directory", bundle: Bundle.current)
        static let tabIconEveryoneSelected = Image("tab-icon-everyone-selected", bundle: Bundle.current)
        static let tabIconEveryone = Image("tab-icon-everyone", bundle: Bundle.current)
-       static let tabIconHasNotificationsSelected = Image("tab-icon-has-notifications-selected", bundle: Bundle.current)
-       static let tabIconHasNotifications = Image("tab-icon-has-notifications", bundle: Bundle.current)
        static let tabIconHomeSelected = Image("tab-icon-home-selected", bundle: Bundle.current)
        static let tabIconHome = Image("tab-icon-home", bundle: Bundle.current)
        static let tabIconNotificationsSelected = Image("tab-icon-notifications-selected", bundle: Bundle.current)
@@ -299,8 +291,6 @@ extension UIImage {
        static let tabIconDirectory = UIImage(named: "tab-icon-directory", in: Bundle.current, with: nil)!
        static let tabIconEveryoneSelected = UIImage(named: "tab-icon-everyone-selected", in: Bundle.current, with: nil)!
        static let tabIconEveryone = UIImage(named: "tab-icon-everyone", in: Bundle.current, with: nil)!
-       static let tabIconHasNotificationsSelected = UIImage(named: "tab-icon-has-notifications-selected", in: Bundle.current, with: nil)!
-       static let tabIconHasNotifications = UIImage(named: "tab-icon-has-notifications", in: Bundle.current, with: nil)!
        static let tabIconHomeSelected = UIImage(named: "tab-icon-home-selected", in: Bundle.current, with: nil)!
        static let tabIconHome = UIImage(named: "tab-icon-home", in: Bundle.current, with: nil)!
        static let tabIconNotificationsSelected = UIImage(named: "tab-icon-notifications-selected", in: Bundle.current, with: nil)!
diff --git a/Source/Markdown/MarkdownStyler.swift b/Source/Markdown/MarkdownStyler.swift
index 00bb1f6788..11bdfba04a 100644
--- a/Source/Markdown/MarkdownStyler.swift
+++ b/Source/Markdown/MarkdownStyler.swift
@@ -145,11 +145,11 @@ class MarkdownStyler: DownStyler {
         colors.heading2 = UIColor.primaryTxt
         colors.heading3 = UIColor.primaryTxt
         colors.code = UIColor.secondaryTxt
-        colors.link = UIColor.accentTxt
-        colors.listItemPrefix = UIColor.accentTxt
+        colors.link = UIColor.accent
+        colors.listItemPrefix = UIColor.accent
         colors.quote = UIColor.secondaryTxt
         colors.quoteStripe = UIColor.secondaryTxt
-        colors.thematicBreak = UIColor.accentTxt
+        colors.thematicBreak = UIColor.accent
         return colors
     }
 
diff --git a/Source/UI/Discover/DiscoverView.swift b/Source/UI/Discover/DiscoverView.swift
index 718f47fb3d..9cd534b73d 100644
--- a/Source/UI/Discover/DiscoverView.swift
+++ b/Source/UI/Discover/DiscoverView.swift
@@ -41,7 +41,7 @@ struct DiscoverView: View, HelpDrawerHost {
     let helpDrawerType = HelpDrawer.discover
 
     func dismissDrawer(completion: (() -> Void)?) {
-        helpDrawerState.isShowingHomeHelpDrawer = false
+        helpDrawerState.isShowingDiscoverHelpDrawer = false
         // Unfortunately, there is no good way to know when the popover dismissed in SwiftUI
         // So here I use a nasty simple trick to let the completion open the next drawer.
         // Fortunately, we can get rid of this after we migrate the remaining screens to SwiftUI.
diff --git a/Source/UI/Hashtag/EmptyPostsView.swift b/Source/UI/Hashtag/EmptyPostsView.swift
index 9cfcbbd647..d35d662939 100644
--- a/Source/UI/Hashtag/EmptyPostsView.swift
+++ b/Source/UI/Hashtag/EmptyPostsView.swift
@@ -23,7 +23,7 @@ struct EmptyPostsView: View {
             Text(noPostsDescription)
                 .font(.subheadline)
                 .foregroundColor(.secondaryTxt)
-                .accentColor(.accentTxt)
+                .accentColor(.accent)
                 .multilineTextAlignment(.center)
                 .padding()
         }
diff --git a/Source/UI/Message/CompactPostView.swift b/Source/UI/Message/CompactPostView.swift
index 15b279e654..11b26e026a 100644
--- a/Source/UI/Message/CompactPostView.swift
+++ b/Source/UI/Message/CompactPostView.swift
@@ -51,7 +51,7 @@ struct CompactPostView: View {
                 .lineLimit(5)
                 .font(.body)
                 .foregroundColor(.primaryTxt)
-                .accentColor(.accentTxt)
+                .accentColor(.accent)
                 .padding(15)
                 .background {
                     GeometryReader { geometryProxy in
diff --git a/Source/UI/Message/GoldenPostView.swift b/Source/UI/Message/GoldenPostView.swift
index 0b156da5dc..9b26c0c83c 100644
--- a/Source/UI/Message/GoldenPostView.swift
+++ b/Source/UI/Message/GoldenPostView.swift
@@ -40,7 +40,7 @@ struct GoldenPostView: View {
     var text: some View {
         Text(markdown)
             .foregroundColor(.primaryTxt)
-            .accentColor(.accentTxt)
+            .accentColor(.accent)
     }
 
     var footer: some View {
diff --git a/Source/UI/SelectableText.swift b/Source/UI/SelectableText.swift
index 45a641555e..c24ab9aeba 100644
--- a/Source/UI/SelectableText.swift
+++ b/Source/UI/SelectableText.swift
@@ -32,7 +32,7 @@ struct SelectableText: UIViewRepresentable {
         view.isUserInteractionEnabled = true
         view.isEditable = false
         view.isSelectable = true
-        view.tintColor = .accentTxt
+        view.tintColor = .accent
         view.textContainerInset = insets
         view.backgroundColor = .clear
         return view