diff --git a/res/css/views/dialogs/_RebrandDialog.scss b/res/css/views/dialogs/_RebrandDialog.scss
index 6c916e0f1d..534584ae2a 100644
--- a/res/css/views/dialogs/_RebrandDialog.scss
+++ b/res/css/views/dialogs/_RebrandDialog.scss
@@ -53,11 +53,12 @@ limitations under the License.
 .mx_RebrandDialog_chevron::after {
     content: '';
     display: inline-block;
-    width: 24px;
-    height: 24px;
+    width: 30px;
+    height: 30px;
     mask-position: center;
     mask-size: contain;
     mask-repeat: no-repeat;
     background-color: $muted-fg-color;
-    mask-image: url('$(res)/img/feather-customised/chevron-right.svg');
+    mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+    transform: rotate(-90deg);
 }
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index bd5c67c7ed..ae0927386a 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -145,13 +145,14 @@ limitations under the License.
     &::after {
         content: "";
         position: absolute;
-        width: 24px;
-        height: 24px;
-        right: -28px; // - (24 + 4)
+        width: 26px;
+        height: 26px;
+        right: -27.5px; // - (width: 26 + spacing to align with X above: 1.5)
+        top: -3px;
         mask-repeat: no-repeat;
         mask-position: center;
         mask-size: contain;
-        mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+        mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
         background-color: $primary-fg-color;
     }
 
diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index 4659442d9b..6cb3b6bce9 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -67,9 +67,8 @@ limitations under the License.
     bottom: 0;
     left: 0;
     right: 0;
-    mask: url('$(res)/img/icon-jump-to-bottom.svg');
+    mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
     mask-repeat: no-repeat;
-    mask-position: center;
-    mask-size: 50%;
+    mask-size: contain;
     background: $muted-fg-color;
 }
diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss
index b907d06d36..d3c9b79c69 100644
--- a/res/css/views/rooms/_RoomSublist.scss
+++ b/res/css/views/rooms/_RoomSublist.scss
@@ -142,26 +142,24 @@ limitations under the License.
             .mx_RoomSublist_collapseBtn {
                 display: inline-block;
                 position: relative;
-                width: 12px;
-                height: 12px;
-                margin-right: 8px;
+                width: 14px;
+                height: 14px;
+                margin-right: 6px;
 
                 &::before {
                     content: '';
-                    width: 12px;
-                    height: 12px;
+                    width: 18px;
+                    height: 18px;
                     position: absolute;
-                    top: 1px;
-                    left: 1px;
                     mask-position: center;
                     mask-size: contain;
                     mask-repeat: no-repeat;
-                    background-color: $primary-fg-color;
+                    background-color: $roomlist-header-color;
                     mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
                 }
 
                 &.mx_RoomSublist_collapseBtn_collapsed::before {
-                    mask-image: url('$(res)/img/feather-customised/chevron-right.svg');
+                    transform: rotate(-90deg);
                 }
             }
         }
@@ -251,22 +249,24 @@ limitations under the License.
 
         .mx_RoomSublist_showNButtonChevron {
             position: relative;
-            width: 16px;
-            height: 16px;
+            width: 18px;
+            height: 18px;
             margin-left: 12px;
-            margin-right: 18px;
+            margin-right: 16px;
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            background: $roomtile-preview-color;
+            background: $roomlist-header-color;
+            left: -1px; // adjust for image position
         }
 
-        .mx_RoomSublist_showMoreButtonChevron {
+        .mx_RoomSublist_showMoreButtonChevron,
+        .mx_RoomSublist_showLessButtonChevron {
             mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
         }
 
         .mx_RoomSublist_showLessButtonChevron {
-            mask-image: url('$(res)/img/feather-customised/chevron-up.svg');
+            transform: rotate(180deg);
         }
     }
 
diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index d9970ef037..8841b042a0 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -51,11 +51,11 @@ limitations under the License.
     position: absolute;
     width: 36px;
     height: 36px;
-    mask-image: url('$(res)/img/icon-jump-to-first-unread.svg');
+    mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
     mask-repeat: no-repeat;
-    mask-position: center;
-    mask-size: 50%;
+    mask-size: contain;
     background: $muted-fg-color;
+    transform: rotate(180deg);
 }
 
 .mx_TopUnreadMessagesBar_markAsRead {
diff --git a/res/img/feather-customised/chevron-down-thin.svg b/res/img/feather-customised/chevron-down-thin.svg
new file mode 100644
index 0000000000..109c83def6
--- /dev/null
+++ b/res/img/feather-customised/chevron-down-thin.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 7.5L9 10.5L12 7.5" stroke="black" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/feather-customised/chevron-down.svg b/res/img/feather-customised/chevron-down.svg
index bcb185ede7..a091913b42 100644
--- a/res/img/feather-customised/chevron-down.svg
+++ b/res/img/feather-customised/chevron-down.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 9L12 15L18 9" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 7.5L9 10.5L12 7.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/res/img/feather-customised/chevron-right.svg b/res/img/feather-customised/chevron-right.svg
deleted file mode 100644
index 258de414a1..0000000000
--- a/res/img/feather-customised/chevron-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-right"><polyline points="9 18 15 12 9 6"></polyline></svg>
\ No newline at end of file
diff --git a/res/img/feather-customised/chevron-up.svg b/res/img/feather-customised/chevron-up.svg
deleted file mode 100644
index 4eb5ecc33e..0000000000
--- a/res/img/feather-customised/chevron-up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-up"><polyline points="18 15 12 9 6 15"></polyline></svg>
\ No newline at end of file
diff --git a/res/img/icon-jump-to-bottom.svg b/res/img/icon-jump-to-bottom.svg
deleted file mode 100644
index c4210b4ebe..0000000000
--- a/res/img/icon-jump-to-bottom.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   width="18.666187"
-   height="8.7375822"
-   viewBox="0 0 18.666187 8.7375818"
-   version="1.1"
-   style="fill:none">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2-8-3"
-     style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 17.909095,0.75599092 9.3330939,7.987602 0.75709259,0.75599092" />
-</svg>
diff --git a/res/img/icon-jump-to-first-unread.svg b/res/img/icon-jump-to-first-unread.svg
deleted file mode 100644
index 652ccec20d..0000000000
--- a/res/img/icon-jump-to-first-unread.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   style="fill:none"
-   version="1.1"
-   viewBox="0 0 18.666187 8.7375818"
-   height="8.7375822"
-   width="18.666187">
-  <defs
-     id="defs8" />
-  <path
-     d="M 17.909095,7.981591 9.3330939,0.74997995 0.75709259,7.981591"
-     style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path2-8-3" />
-</svg>
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 15155ba854..e39bb29044 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -18,6 +18,10 @@ $primary-fg-color: $text-primary-color;
 $primary-bg-color: $bg-color;
 $muted-fg-color: $header-panel-text-primary-color;
 
+// additional text colors
+$secondary-fg-color: #A9B2BC;
+$tertiary-fg-color: #8E99A4;
+
 // used for dialog box text
 $light-fg-color: $header-panel-text-secondary-color;
 
@@ -112,10 +116,10 @@ $theme-button-bg-color: #e3e8f0;
 
 $roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
 $roomlist-bg-color: rgba(33, 38, 44, 0.90);
-$roomlist-header-color: #8E99A4;
+$roomlist-header-color: $tertiary-fg-color;
 $roomsublist-divider-color: $primary-fg-color;
 
-$roomtile-preview-color: #A9B2BC;
+$roomtile-preview-color: $secondary-fg-color;
 $roomtile-default-badge-bg-color: #61708b;
 $roomtile-selected-bg-color: rgba(141, 151, 165, 0.2);
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index e317683963..e67bcdf89a 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -19,8 +19,8 @@ $accent-bg-color: rgba(3, 179, 129, 0.16);
 $notice-primary-color: #ff4b55;
 $notice-primary-bg-color: rgba(255, 75, 85, 0.16);
 $primary-fg-color: #2e2f32;
-$roomlist-header-color: $primary-fg-color;
-$notice-secondary-color: $roomlist-header-color;
+$secondary-fg-color: #737D8C;
+$tertiary-fg-color: #8D99A5;
 $header-panel-bg-color: #f3f8fd;
 
 // typical text (dark-on-white in light skin)
@@ -52,10 +52,6 @@ $info-bg-color: #2A9EDF;
 $mention-user-pill-bg-color: $warning-color;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 
-// pinned events indicator
-$pinned-unread-color: $notice-primary-color;
-$pinned-color: $notice-secondary-color;
-
 // informational plinth
 $info-plinth-bg-color: #f7f7f7;
 $info-plinth-fg-color: #888;
@@ -178,9 +174,10 @@ $theme-button-bg-color: #e3e8f0;
 
 $roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
 $roomlist-bg-color: rgba(245, 245, 245, 0.90);
+$roomlist-header-color: $tertiary-fg-color;
 $roomsublist-divider-color: $primary-fg-color;
 
-$roomtile-preview-color: #737D8C;
+$roomtile-preview-color: $secondary-fg-color;
 $roomtile-default-badge-bg-color: #61708b;
 $roomtile-selected-bg-color: #FFF;
 
@@ -199,8 +196,14 @@ $username-variant6-color: #2dc2c5;
 $username-variant7-color: #5c56f5;
 $username-variant8-color: #74d12c;
 
+$notice-secondary-color: $roomlist-header-color;
+
 $panel-divider-color: transparent;
 
+// pinned events indicator
+$pinned-unread-color: $notice-primary-color;
+$pinned-color: $notice-secondary-color;
+
 // ********************
 
 $widget-menu-bar-bg-color: $secondary-accent-color;