diff --git a/Mariana-Theme-Light.sublime-theme b/Mariana-Theme-Light.sublime-theme
index bd9b7442..5d668d37 100644
--- a/Mariana-Theme-Light.sublime-theme
+++ b/Mariana-Theme-Light.sublime-theme
@@ -42,37 +42,6 @@
         ],
         "layer0.opacity": 1
     },
-    {
-        "class": "fold_button_control",
-        "layer0.texture": "mariana-theme/assets/light/fold_right.png",
-        "layer0.opacity": 1,
-        "layer0.inner_margin": 0,
-        "layer1.texture": "mariana-theme/assets/light/fold_right_hover.png",
-        "layer1.opacity": 0,
-        "layer1.inner_margin": 0,
-        "content_margin": [
-            9,
-            7,
-            8,
-            6
-        ]
-    },
-    {
-        "class": "fold_button_control",
-        "attributes": [
-            "hover"
-        ],
-        "layer0.opacity": 0,
-        "layer1.opacity": 1
-    },
-    {
-        "class": "fold_button_control",
-        "attributes": [
-            "expanded"
-        ],
-        "layer0.texture": "mariana-theme/assets/light/fold_down.png",
-        "layer1.texture": "mariana-theme/assets/light/fold_down_hover.png"
-    },
     {
         "class": "button_control",
         "layer0.tint": [
@@ -408,7 +377,7 @@
     },
     {
         "class": "icon_context",
-        "layer0.texture": "mariana-theme/assets/light/in_context.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_in_context.png",
         "layer0.opacity": {
             "target": 0.5,
             "speed": 5,
@@ -478,6 +447,30 @@
         ],
         "layer0.opacity": 1
     },
+    {
+        "class": "fold_button_control",
+        "layer0.texture": "mariana-theme/assets/light/arrow_right.png",
+        "layer0.opacity": 1,
+        "layer0.inner_margin": 0,
+        "content_margin": [
+            4,
+            4
+        ]
+    },
+    {
+        "class": "fold_button_control",
+        "attributes": [
+            "hover"
+        ],
+        "layer0.opacity": 0.8
+    },
+    {
+        "class": "fold_button_control",
+        "attributes": [
+            "expanded"
+        ],
+        "layer0.texture": "mariana-theme/assets/light/arrow_down.png"
+    },
     {
         "class": "dialog",
         "layer0.tint": [
@@ -548,8 +541,8 @@
         "layer0.texture": "mariana-theme/assets/light/folder_closed.png",
         "layer0.opacity": 1,
         "content_margin": [
-            11,
-            7
+            10,
+            10
         ]
     },
     {
@@ -565,25 +558,26 @@
         "layer0.texture": "mariana-theme/assets/light/folder_open.png",
         "layer0.opacity": 1,
         "content_margin": [
-            11,
-            7
+            10,
+            10
         ]
     },
     {
         "class": "icon_folder_loading",
         "layer0.texture": {
             "keyframes": [
-                "mariana-theme/assets/light/spinner01.png",
-                "mariana-theme/assets/light/spinner02.png",
-                "mariana-theme/assets/light/spinner03.png",
-                "mariana-theme/assets/light/spinner04.png",
-                "mariana-theme/assets/light/spinner05.png",
-                "mariana-theme/assets/light/spinner06.png",
-                "mariana-theme/assets/light/spinner07.png",
-                "mariana-theme/assets/light/spinner08.png",
-                "mariana-theme/assets/light/spinner09.png",
+                "mariana-theme/assets/light/spinner11.png",
                 "mariana-theme/assets/light/spinner10.png",
-                "mariana-theme/assets/light/spinner11.png"
+                "mariana-theme/assets/light/spinner9.png",
+                "mariana-theme/assets/light/spinner8.png",
+                "mariana-theme/assets/light/spinner7.png",
+                "mariana-theme/assets/light/spinner6.png",
+                "mariana-theme/assets/light/spinner5.png",
+                "mariana-theme/assets/light/spinner4.png",
+                "mariana-theme/assets/light/spinner3.png",
+                "mariana-theme/assets/light/spinner2.png",
+                "mariana-theme/assets/light/spinner1.png",
+                "mariana-theme/assets/light/spinner.png"
             ],
             "loop": true,
             "frame_time": 0.08
@@ -611,32 +605,6 @@
             9
         ]
     },
-    {
-        "class": "label_control",
-        "fg": [
-            64,
-            64,
-            64
-        ],
-        "font.size": 12
-    },
-    {
-        "class": "title_label_control",
-        "fg": [
-            64,
-            64,
-            64
-        ],
-        "font.size": 24
-    },
-    {
-        "class": "label_control",
-        "parents": [
-            {
-                "class": "button_control"
-            }
-        ]
-    },
     {
         "class": "text_line_control",
         "layer0.tint": [
@@ -693,7 +661,7 @@
             0,
             0
         ],
-        "layer1.texture": "mariana-theme/assets/light/overflow_menu_hover.png",
+        "layer1.texture": "mariana-theme/assets/light/overflow_menu.png",
         "layer1.opacity": 0,
         "layer1.inner_margin": [
             0,
@@ -707,9 +675,35 @@
         ],
         "layer1.opacity": 1
     },
+    {
+        "class": "label_control",
+        "fg": [
+            64,
+            64,
+            64
+        ],
+        "font.size": 12
+    },
+    {
+        "class": "title_label_control",
+        "fg": [
+            64,
+            64,
+            64
+        ],
+        "font.size": 24
+    },
+    {
+        "class": "label_control",
+        "parents": [
+            {
+                "class": "button_control"
+            }
+        ]
+    },
     {
         "class": "close_button",
-        "layer0.texture": "mariana-theme/assets/light/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": 1,
         "content_margin": [
             8,
@@ -721,7 +715,7 @@
         "attributes": [
             "hover"
         ],
-        "layer0.texture": "mariana-theme/assets/light/close_icon_hover.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": 1
     },
     {
@@ -737,13 +731,14 @@
             "hover",
             "dirty"
         ],
-        "layer0.texture": "mariana-theme/assets/light/dirty_icon_hover.png"
+        "layer0.texture": "mariana-theme/assets/light/dirty_icon.png"
     },
     {
         "class": "panel_control",
         "layer0.tint": [
-            "background",
-            0.4
+            250,
+            250,
+            250
         ],
         "layer0.inner_margin": [
             2,
@@ -753,9 +748,9 @@
         ],
         "layer0.opacity": 1,
         "layer1.tint": [
-            220,
-            222,
-            224
+            250,
+            250,
+            250
         ],
         "layer1.inner_margin": [
             2,
@@ -779,9 +774,8 @@
             }
         ],
         "layer0.tint": [
-            220,
-            222,
-            224
+            "background",
+            1
         ]
     },
     {
@@ -792,7 +786,7 @@
     },
     {
         "class": "panel_close_button",
-        "layer0.texture": "mariana-theme/assets/light/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": {
             "target": 0.4,
             "speed": 4,
@@ -817,110 +811,218 @@
     },
     {
         "class": "overlay_control",
-        "layer1.tint": [
-            220,
-            222,
-            224
+        "layer0.inner_margin": [
+            24,
+            4,
+            24,
+            33
         ],
         "layer0.opacity": 1,
-        "content_margin": 4
-    },
-    {
-        "class": "quick_panel",
-        "row_padding": 6,
-        "layer0.tint": [
-            220,
-            222,
-            224
+        "layer1.inner_margin": [
+            16,
+            0,
+            16,
+            25
         ],
-        "layer0.opacity": 1,
-        "dark_content": false
+        "layer1.opacity": 1,
+        "content_margin": [
+            13,
+            13,
+            13,
+            33
+        ]
     },
     {
         "class": "mini_quick_panel_row",
         "layer0.tint": [
-            199,
-            203,
-            209
+            250,
+            250,
+            250
         ],
-        "layer0.opacity": 0
+        "layer0.inner_margin": [
+            2,
+            2,
+            2,
+            2
+        ],
+        "layer0.opacity": 1
     },
     {
         "class": "mini_quick_panel_row",
         "attributes": [
             "selected"
         ],
+        "layer0.tint": [
+            144,
+            164,
+            174
+        ]
+    },
+    {
+        "class": "quick_panel",
+        "row_padding": [
+            32,
+            12
+        ],
+        "layer0.tint": [
+            250,
+            250,
+            250
+        ],
         "layer0.opacity": 1
     },
     {
         "class": "quick_panel_row",
         "layer0.tint": [
-            199,
-            203,
-            209
+            38,
+            50,
+            56,
+            0
         ],
-        "layer0.opacity": 0
+        "layer0.opacity": 1
+    },
+    {
+        "class": "quick_panel_row",
+        "parents": [
+            {
+                "class": "overlay_control"
+            }
+        ],
+        "layer0.tint": [
+            250,
+            250,
+            250
+        ],
+        "layer0.opacity": 1
+    },
+    {
+        "class": "quick_panel",
+        "parents": [
+            {
+                "class": "overlay_control"
+            }
+        ],
+        "row_padding": [
+            32,
+            12
+        ],
+        "layer0.tint": [
+            38,
+            50,
+            56,
+            0
+        ],
+        "layer0.opacity": 1
     },
     {
         "class": "quick_panel_row",
         "attributes": [
             "selected"
         ],
-        "layer0.opacity": 1
+        "layer0.tint": [
+            144,
+            164,
+            174
+        ],
+        "layer1.opacity": 0
     },
     {
         "class": "quick_panel_label",
         "fg": [
-            69,
-            74,
-            85
+            128,
+            203,
+            196,
+            255
         ],
         "match_fg": [
-            0,
-            0,
-            0
+            128,
+            203,
+            196,
+            255
         ],
         "selected_fg": [
-            46,
-            49,
-            56
+            255,
+            255,
+            255,
+            255
         ],
         "selected_match_fg": [
-            0,
-            0,
-            0
+            128,
+            203,
+            196,
+            255
         ]
     },
     {
         "class": "quick_panel_label",
         "parents": [
             {
-                "class": "mini_quick_panel_row"
+                "class": "overlay_control"
             }
         ],
-        "font.size": 14
+        "fg": [
+            84,
+            110,
+            122
+        ],
+        "match_fg": [
+            128,
+            203,
+            196,
+            255
+        ],
+        "selected_fg": [
+            255,
+            255,
+            255,
+            255
+        ],
+        "selected_match_fg": [
+            128,
+            203,
+            196,
+            255
+        ]
     },
     {
         "class": "quick_panel_path_label",
         "fg": [
-            115,
-            125,
-            140
+            176,
+            190,
+            197,
+            255
         ],
         "match_fg": [
-            92,
-            100,
-            112
+            128,
+            203,
+            196,
+            255
         ],
         "selected_fg": [
-            92,
-            100,
-            112
+            255,
+            255,
+            255,
+            255
         ],
         "selected_match_fg": [
-            69,
-            74,
-            85
+            128,
+            203,
+            196,
+            255
+        ]
+    },
+    {
+        "class": "quick_panel_score_label",
+        "fg": [
+            84,
+            110,
+            122
+        ],
+        "selected_fg": [
+            255,
+            255,
+            255,
+            255
         ]
     },
     {
@@ -1198,30 +1300,70 @@
         "font.bold": true
     },
     {
-        "class": "title_bar",
-        "bg": [
-            115,
-            128,
-            140
+        "class": "status_bar",
+        "layer0.tint": [
+            171,
+            177,
+            186
         ],
-        "fg": [
-            235,
-            237,
-            239
+        "layer0.opacity": 1,
+        "content_margin": [
+            10,
+            2,
+            0,
+            2
         ]
     },
     {
-        "class": "title_bar",
-        "settings": [
-            "mariana_theme_titlebar"
+        "class": "panel_button_control",
+        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png",
+        "layer0.opacity": 1,
+        "content_margin": [
+            8,
+            8
+        ]
+    },
+    {
+        "class": "panel_button_control",
+        "attributes": [
+            "hover"
         ],
-        "bg": [
-            "background",
-            0.96
+        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png"
+    },
+    {
+        "class": "status_container",
+        "content_margin": [
+            8,
+            0,
+            0,
+            0
+        ]
+    },
+    {
+        "class": "status_button",
+        "content_margin": [
+            10,
+            0,
+            10,
+            0
         ],
-        "fg": [
-            "foreground",
-            1
+        "min_size": [
+            80,
+            0
+        ]
+    },
+    {
+        "class": "label_control",
+        "parents": [
+            {
+                "class": "status_bar"
+            }
+        ],
+        "font.size": 11,
+        "color": [
+            30,
+            40,
+            44
         ]
     },
     {
@@ -1374,13 +1516,13 @@
     {
         "class": "tab_close_button",
         "content_margin": [
-            0,
-            0
+            6,
+            6
         ],
-        "layer0.texture": "mariana-theme/assets/light/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": 1,
         "layer0.inner_margin": 0,
-        "layer1.texture": "mariana-theme/assets/light/close_icon_hover.png",
+        "layer1.texture": "mariana-theme/assets/light/icon_close.png",
         "layer1.opacity": {
             "target": 0,
             "speed": 5,
@@ -1388,7 +1530,7 @@
         },
         "layer2.texture": "mariana-theme/assets/light/dirty_icon.png",
         "layer2.inner_margin": 0,
-        "layer3.texture": "mariana-theme/assets/light/dirty_icon_hover.png",
+        "layer3.texture": "mariana-theme/assets/light/dirty_icon.png",
         "layer3.opacity": {
             "target": 0,
             "speed": 5,
@@ -1401,8 +1543,8 @@
             "show_tab_close_buttons"
         ],
         "content_margin": [
-            8,
-            8
+            7,
+            7
         ]
     },
     {
@@ -1447,8 +1589,8 @@
         "layer2.opacity": 0,
         "layer3.opacity": 1,
         "content_margin": [
-            8,
-            8
+            7,
+            7
         ]
     },
     {
@@ -1513,8 +1655,8 @@
             "interpolation": "smoothstep"
         },
         "content_margin": [
-            14,
-            7
+            10,
+            10
         ]
     },
     {
@@ -1537,8 +1679,8 @@
             "interpolation": "smoothstep"
         },
         "content_margin": [
-            14,
-            7
+            10,
+            10
         ]
     },
     {
@@ -1561,7 +1703,7 @@
         "layer0.texture": "mariana-theme/assets/light/overflow_menu.png",
         "layer0.opacity": 1,
         "layer0.inner_margin": 0,
-        "layer1.texture": "mariana-theme/assets/light/overflow_menu_hover.png",
+        "layer1.texture": "mariana-theme/assets/light/overflow_menu.png",
         "layer1.opacity": {
             "target": 0,
             "speed": 8,
@@ -1581,70 +1723,30 @@
         }
     },
     {
-        "class": "status_bar",
-        "layer0.tint": [
-            171,
-            177,
-            186
-        ],
-        "layer0.opacity": 1,
-        "content_margin": [
-            10,
-            2,
-            0,
-            2
-        ]
-    },
-    {
-        "class": "panel_button_control",
-        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png",
-        "layer0.opacity": 1,
-        "content_margin": [
-            8,
-            8
-        ]
-    },
-    {
-        "class": "panel_button_control",
-        "attributes": [
-            "hover"
+        "class": "title_bar",
+        "bg": [
+            115,
+            128,
+            140
         ],
-        "layer0.texture": "mariana-theme/assets/light/overflow_menu_hover.png"
-    },
-    {
-        "class": "status_container",
-        "content_margin": [
-            8,
-            0,
-            0,
-            0
+        "fg": [
+            235,
+            237,
+            239
         ]
     },
     {
-        "class": "status_button",
-        "content_margin": [
-            10,
-            0,
-            10,
-            0
+        "class": "title_bar",
+        "settings": [
+            "mariana_theme_titlebar"
         ],
-        "min_size": [
-            80,
-            0
-        ]
-    },
-    {
-        "class": "label_control",
-        "parents": [
-            {
-                "class": "status_bar"
-            }
+        "bg": [
+            "background",
+            0.96
         ],
-        "font.size": 11,
-        "color": [
-            30,
-            40,
-            44
+        "fg": [
+            "foreground",
+            1
         ]
     },
     {
diff --git a/assets/light/arrow_down.png b/assets/light/arrow_down.png
new file mode 100644
index 00000000..49025482
Binary files /dev/null and b/assets/light/arrow_down.png differ
diff --git a/assets/light/arrow_down@2x.png b/assets/light/arrow_down@2x.png
new file mode 100644
index 00000000..9b4a5d58
Binary files /dev/null and b/assets/light/arrow_down@2x.png differ
diff --git a/assets/light/arrow_down@3x.png b/assets/light/arrow_down@3x.png
new file mode 100644
index 00000000..a10f5972
Binary files /dev/null and b/assets/light/arrow_down@3x.png differ
diff --git a/assets/light/arrow_left.png b/assets/light/arrow_left.png
index fd08be3c..70cb6535 100755
Binary files a/assets/light/arrow_left.png and b/assets/light/arrow_left.png differ
diff --git a/assets/light/arrow_left@2x.png b/assets/light/arrow_left@2x.png
index eaf202fc..127be8f9 100755
Binary files a/assets/light/arrow_left@2x.png and b/assets/light/arrow_left@2x.png differ
diff --git a/assets/light/arrow_left@3x.png b/assets/light/arrow_left@3x.png
new file mode 100644
index 00000000..c8650035
Binary files /dev/null and b/assets/light/arrow_left@3x.png differ
diff --git a/assets/light/arrow_right.png b/assets/light/arrow_right.png
index 6d81a7a9..2f94e42a 100755
Binary files a/assets/light/arrow_right.png and b/assets/light/arrow_right.png differ
diff --git a/assets/light/arrow_right@2x.png b/assets/light/arrow_right@2x.png
index 13c2df48..9bd4e644 100755
Binary files a/assets/light/arrow_right@2x.png and b/assets/light/arrow_right@2x.png differ
diff --git a/assets/light/arrow_right@3x.png b/assets/light/arrow_right@3x.png
new file mode 100644
index 00000000..082c1e9c
Binary files /dev/null and b/assets/light/arrow_right@3x.png differ
diff --git a/assets/light/arrow_up.png b/assets/light/arrow_up.png
new file mode 100644
index 00000000..8677c172
Binary files /dev/null and b/assets/light/arrow_up.png differ
diff --git a/assets/light/arrow_up@2x.png b/assets/light/arrow_up@2x.png
new file mode 100644
index 00000000..78261356
Binary files /dev/null and b/assets/light/arrow_up@2x.png differ
diff --git a/assets/light/arrow_up@3x.png b/assets/light/arrow_up@3x.png
new file mode 100644
index 00000000..bea87883
Binary files /dev/null and b/assets/light/arrow_up@3x.png differ
diff --git a/assets/light/close_icon.png b/assets/light/close_icon.png
deleted file mode 100755
index 8d1ec205..00000000
Binary files a/assets/light/close_icon.png and /dev/null differ
diff --git a/assets/light/close_icon@2x.png b/assets/light/close_icon@2x.png
deleted file mode 100755
index 834338b8..00000000
Binary files a/assets/light/close_icon@2x.png and /dev/null differ
diff --git a/assets/light/close_icon_hover.png b/assets/light/close_icon_hover.png
deleted file mode 100755
index 040b4245..00000000
Binary files a/assets/light/close_icon_hover.png and /dev/null differ
diff --git a/assets/light/close_icon_hover@2x.png b/assets/light/close_icon_hover@2x.png
deleted file mode 100755
index cd909d36..00000000
Binary files a/assets/light/close_icon_hover@2x.png and /dev/null differ
diff --git a/assets/light/dirty_icon.png b/assets/light/dirty_icon.png
index 92c5d3ed..1179d0e0 100755
Binary files a/assets/light/dirty_icon.png and b/assets/light/dirty_icon.png differ
diff --git a/assets/light/dirty_icon@2x.png b/assets/light/dirty_icon@2x.png
index c707345c..2c736be7 100755
Binary files a/assets/light/dirty_icon@2x.png and b/assets/light/dirty_icon@2x.png differ
diff --git a/assets/light/dirty_icon@3x.png b/assets/light/dirty_icon@3x.png
new file mode 100644
index 00000000..955cafd7
Binary files /dev/null and b/assets/light/dirty_icon@3x.png differ
diff --git a/assets/light/dirty_icon_hover.png b/assets/light/dirty_icon_hover.png
deleted file mode 100755
index cead0c89..00000000
Binary files a/assets/light/dirty_icon_hover.png and /dev/null differ
diff --git a/assets/light/dirty_icon_hover@2x.png b/assets/light/dirty_icon_hover@2x.png
deleted file mode 100755
index 9d0a6702..00000000
Binary files a/assets/light/dirty_icon_hover@2x.png and /dev/null differ
diff --git a/assets/light/fold_down.png b/assets/light/fold_down.png
deleted file mode 100755
index 1719d3ab..00000000
Binary files a/assets/light/fold_down.png and /dev/null differ
diff --git a/assets/light/fold_down@2x.png b/assets/light/fold_down@2x.png
deleted file mode 100755
index 0380300e..00000000
Binary files a/assets/light/fold_down@2x.png and /dev/null differ
diff --git a/assets/light/fold_down_hover.png b/assets/light/fold_down_hover.png
deleted file mode 100755
index eb2a41ef..00000000
Binary files a/assets/light/fold_down_hover.png and /dev/null differ
diff --git a/assets/light/fold_down_hover@2x.png b/assets/light/fold_down_hover@2x.png
deleted file mode 100755
index 98230197..00000000
Binary files a/assets/light/fold_down_hover@2x.png and /dev/null differ
diff --git a/assets/light/fold_right.png b/assets/light/fold_right.png
deleted file mode 100755
index 5d3f95c4..00000000
Binary files a/assets/light/fold_right.png and /dev/null differ
diff --git a/assets/light/fold_right@2x.png b/assets/light/fold_right@2x.png
deleted file mode 100755
index d0a563d2..00000000
Binary files a/assets/light/fold_right@2x.png and /dev/null differ
diff --git a/assets/light/fold_right_hover.png b/assets/light/fold_right_hover.png
deleted file mode 100755
index 33bb2463..00000000
Binary files a/assets/light/fold_right_hover.png and /dev/null differ
diff --git a/assets/light/fold_right_hover@2x.png b/assets/light/fold_right_hover@2x.png
deleted file mode 100755
index 6aedcf32..00000000
Binary files a/assets/light/fold_right_hover@2x.png and /dev/null differ
diff --git a/assets/light/folder_closed.png b/assets/light/folder_closed.png
index 92a0ca62..9d0563be 100755
Binary files a/assets/light/folder_closed.png and b/assets/light/folder_closed.png differ
diff --git a/assets/light/folder_closed@2x.png b/assets/light/folder_closed@2x.png
index d492f6ff..153aec42 100755
Binary files a/assets/light/folder_closed@2x.png and b/assets/light/folder_closed@2x.png differ
diff --git a/assets/light/folder_closed@3x.png b/assets/light/folder_closed@3x.png
index f7eb8ecd..49bade57 100755
Binary files a/assets/light/folder_closed@3x.png and b/assets/light/folder_closed@3x.png differ
diff --git a/assets/light/folder_dup.png b/assets/light/folder_dup.png
index 0b7da24f..d3194a52 100755
Binary files a/assets/light/folder_dup.png and b/assets/light/folder_dup.png differ
diff --git a/assets/light/folder_dup@2x.png b/assets/light/folder_dup@2x.png
index 1e5d7172..478815fd 100755
Binary files a/assets/light/folder_dup@2x.png and b/assets/light/folder_dup@2x.png differ
diff --git a/assets/light/folder_dup@3x.png b/assets/light/folder_dup@3x.png
index 546cdf08..ff8d668d 100755
Binary files a/assets/light/folder_dup@3x.png and b/assets/light/folder_dup@3x.png differ
diff --git a/assets/light/folder_open.png b/assets/light/folder_open.png
index 86d0ee1e..0301430a 100755
Binary files a/assets/light/folder_open.png and b/assets/light/folder_open.png differ
diff --git a/assets/light/folder_open@2x.png b/assets/light/folder_open@2x.png
index b49e9cbf..13e15505 100755
Binary files a/assets/light/folder_open@2x.png and b/assets/light/folder_open@2x.png differ
diff --git a/assets/light/folder_open@3x.png b/assets/light/folder_open@3x.png
index 17c4b8e0..a80f57a0 100755
Binary files a/assets/light/folder_open@3x.png and b/assets/light/folder_open@3x.png differ
diff --git a/assets/light/icon_case_sensitive.png b/assets/light/icon_case_sensitive.png
index 90abf23b..aff28319 100755
Binary files a/assets/light/icon_case_sensitive.png and b/assets/light/icon_case_sensitive.png differ
diff --git a/assets/light/icon_case_sensitive@2x.png b/assets/light/icon_case_sensitive@2x.png
index bd128235..7652d44e 100755
Binary files a/assets/light/icon_case_sensitive@2x.png and b/assets/light/icon_case_sensitive@2x.png differ
diff --git a/assets/light/icon_case_sensitive@3x.png b/assets/light/icon_case_sensitive@3x.png
index 02bcb127..7cd89550 100755
Binary files a/assets/light/icon_case_sensitive@3x.png and b/assets/light/icon_case_sensitive@3x.png differ
diff --git a/assets/light/icon_close.png b/assets/light/icon_close.png
new file mode 100644
index 00000000..043e4bc3
Binary files /dev/null and b/assets/light/icon_close.png differ
diff --git a/assets/light/icon_close@2x.png b/assets/light/icon_close@2x.png
new file mode 100644
index 00000000..d16118e3
Binary files /dev/null and b/assets/light/icon_close@2x.png differ
diff --git a/assets/light/icon_close@3x.png b/assets/light/icon_close@3x.png
new file mode 100644
index 00000000..17968257
Binary files /dev/null and b/assets/light/icon_close@3x.png differ
diff --git a/assets/light/icon_highlight_matches.png b/assets/light/icon_highlight_matches.png
index 40696b21..3588cba1 100644
Binary files a/assets/light/icon_highlight_matches.png and b/assets/light/icon_highlight_matches.png differ
diff --git a/assets/light/icon_highlight_matches@2x.png b/assets/light/icon_highlight_matches@2x.png
index f6f1475f..dd57a302 100644
Binary files a/assets/light/icon_highlight_matches@2x.png and b/assets/light/icon_highlight_matches@2x.png differ
diff --git a/assets/light/icon_highlight_matches@3x.png b/assets/light/icon_highlight_matches@3x.png
index 5334b7b1..a851cdf9 100644
Binary files a/assets/light/icon_highlight_matches@3x.png and b/assets/light/icon_highlight_matches@3x.png differ
diff --git a/assets/light/icon_in_context.png b/assets/light/icon_in_context.png
new file mode 100644
index 00000000..8f656b5f
Binary files /dev/null and b/assets/light/icon_in_context.png differ
diff --git a/assets/light/icon_in_context@2x.png b/assets/light/icon_in_context@2x.png
new file mode 100644
index 00000000..765ef312
Binary files /dev/null and b/assets/light/icon_in_context@2x.png differ
diff --git a/assets/light/icon_in_context@3x.png b/assets/light/icon_in_context@3x.png
new file mode 100644
index 00000000..b3cfc55d
Binary files /dev/null and b/assets/light/icon_in_context@3x.png differ
diff --git a/assets/light/icon_in_selection.png b/assets/light/icon_in_selection.png
index 33000376..080c2de1 100644
Binary files a/assets/light/icon_in_selection.png and b/assets/light/icon_in_selection.png differ
diff --git a/assets/light/icon_in_selection@2x.png b/assets/light/icon_in_selection@2x.png
index d3d1f52f..d6a94b47 100644
Binary files a/assets/light/icon_in_selection@2x.png and b/assets/light/icon_in_selection@2x.png differ
diff --git a/assets/light/icon_in_selection@3x.png b/assets/light/icon_in_selection@3x.png
index 3d216d6b..5ee8fd14 100644
Binary files a/assets/light/icon_in_selection@3x.png and b/assets/light/icon_in_selection@3x.png differ
diff --git a/assets/light/icon_preserve_case.png b/assets/light/icon_preserve_case.png
index c74a0c51..38265c03 100755
Binary files a/assets/light/icon_preserve_case.png and b/assets/light/icon_preserve_case.png differ
diff --git a/assets/light/icon_preserve_case@2x.png b/assets/light/icon_preserve_case@2x.png
index 1be28855..7712379a 100755
Binary files a/assets/light/icon_preserve_case@2x.png and b/assets/light/icon_preserve_case@2x.png differ
diff --git a/assets/light/icon_preserve_case@3x.png b/assets/light/icon_preserve_case@3x.png
index b9db2477..8dfad3be 100755
Binary files a/assets/light/icon_preserve_case@3x.png and b/assets/light/icon_preserve_case@3x.png differ
diff --git a/assets/light/icon_regex.png b/assets/light/icon_regex.png
index a6e8a75e..f936f153 100755
Binary files a/assets/light/icon_regex.png and b/assets/light/icon_regex.png differ
diff --git a/assets/light/icon_regex@2x.png b/assets/light/icon_regex@2x.png
index 5acb85b2..5156c206 100755
Binary files a/assets/light/icon_regex@2x.png and b/assets/light/icon_regex@2x.png differ
diff --git a/assets/light/icon_regex@3x.png b/assets/light/icon_regex@3x.png
index fc164901..37ad6b10 100755
Binary files a/assets/light/icon_regex@3x.png and b/assets/light/icon_regex@3x.png differ
diff --git a/assets/light/icon_use_buffer.png b/assets/light/icon_use_buffer.png
index b76afb1c..15b98e7c 100755
Binary files a/assets/light/icon_use_buffer.png and b/assets/light/icon_use_buffer.png differ
diff --git a/assets/light/icon_use_buffer@2x.png b/assets/light/icon_use_buffer@2x.png
index 04cc649e..8da2cb59 100755
Binary files a/assets/light/icon_use_buffer@2x.png and b/assets/light/icon_use_buffer@2x.png differ
diff --git a/assets/light/icon_use_buffer@3x.png b/assets/light/icon_use_buffer@3x.png
index cd446a21..4e510f06 100755
Binary files a/assets/light/icon_use_buffer@3x.png and b/assets/light/icon_use_buffer@3x.png differ
diff --git a/assets/light/icon_whole_word.png b/assets/light/icon_whole_word.png
old mode 100755
new mode 100644
index dc2cd217..c5a70257
Binary files a/assets/light/icon_whole_word.png and b/assets/light/icon_whole_word.png differ
diff --git a/assets/light/icon_whole_word@2x.png b/assets/light/icon_whole_word@2x.png
old mode 100755
new mode 100644
index 212dd608..46d9b37a
Binary files a/assets/light/icon_whole_word@2x.png and b/assets/light/icon_whole_word@2x.png differ
diff --git a/assets/light/icon_whole_word@3x.png b/assets/light/icon_whole_word@3x.png
old mode 100755
new mode 100644
index 258524aa..942aa8b4
Binary files a/assets/light/icon_whole_word@3x.png and b/assets/light/icon_whole_word@3x.png differ
diff --git a/assets/light/icon_wrap.png b/assets/light/icon_wrap.png
index e4010799..4cbf3517 100755
Binary files a/assets/light/icon_wrap.png and b/assets/light/icon_wrap.png differ
diff --git a/assets/light/icon_wrap@2x.png b/assets/light/icon_wrap@2x.png
index 82e39fe7..42866cc0 100755
Binary files a/assets/light/icon_wrap@2x.png and b/assets/light/icon_wrap@2x.png differ
diff --git a/assets/light/icon_wrap@3x.png b/assets/light/icon_wrap@3x.png
index 15d29076..e73d8d20 100755
Binary files a/assets/light/icon_wrap@3x.png and b/assets/light/icon_wrap@3x.png differ
diff --git a/assets/light/in_context.png b/assets/light/in_context.png
deleted file mode 100755
index 224c08b7..00000000
Binary files a/assets/light/in_context.png and /dev/null differ
diff --git a/assets/light/in_context@2x.png b/assets/light/in_context@2x.png
deleted file mode 100755
index 33fbf574..00000000
Binary files a/assets/light/in_context@2x.png and /dev/null differ
diff --git a/assets/light/in_context@3x.png b/assets/light/in_context@3x.png
deleted file mode 100755
index a865879f..00000000
Binary files a/assets/light/in_context@3x.png and /dev/null differ
diff --git a/assets/light/overflow_menu.png b/assets/light/overflow_menu.png
index 2f663080..1caa6195 100755
Binary files a/assets/light/overflow_menu.png and b/assets/light/overflow_menu.png differ
diff --git a/assets/light/overflow_menu@2x.png b/assets/light/overflow_menu@2x.png
index a4b8563a..dc92dfe7 100755
Binary files a/assets/light/overflow_menu@2x.png and b/assets/light/overflow_menu@2x.png differ
diff --git a/assets/light/overflow_menu@3x.png b/assets/light/overflow_menu@3x.png
index 65a58f8a..a24a34d6 100755
Binary files a/assets/light/overflow_menu@3x.png and b/assets/light/overflow_menu@3x.png differ
diff --git a/assets/light/overflow_menu_hover.png b/assets/light/overflow_menu_hover.png
deleted file mode 100755
index 78710661..00000000
Binary files a/assets/light/overflow_menu_hover.png and /dev/null differ
diff --git a/assets/light/overflow_menu_hover@2x.png b/assets/light/overflow_menu_hover@2x.png
deleted file mode 100755
index 61f6ef19..00000000
Binary files a/assets/light/overflow_menu_hover@2x.png and /dev/null differ
diff --git a/assets/light/overflow_menu_hover@3x.png b/assets/light/overflow_menu_hover@3x.png
deleted file mode 100755
index da34e0d4..00000000
Binary files a/assets/light/overflow_menu_hover@3x.png and /dev/null differ
diff --git a/assets/light/spinner.png b/assets/light/spinner.png
index e5f9becb..ef805ea8 100755
Binary files a/assets/light/spinner.png and b/assets/light/spinner.png differ
diff --git a/assets/light/spinner01.png b/assets/light/spinner01.png
deleted file mode 100755
index 08d639dd..00000000
Binary files a/assets/light/spinner01.png and /dev/null differ
diff --git a/assets/light/spinner01@2x.png b/assets/light/spinner01@2x.png
deleted file mode 100755
index 843e022b..00000000
Binary files a/assets/light/spinner01@2x.png and /dev/null differ
diff --git a/assets/light/spinner01@3x.png b/assets/light/spinner01@3x.png
deleted file mode 100755
index 2157be18..00000000
Binary files a/assets/light/spinner01@3x.png and /dev/null differ
diff --git a/assets/light/spinner02.png b/assets/light/spinner02.png
deleted file mode 100755
index 82cad759..00000000
Binary files a/assets/light/spinner02.png and /dev/null differ
diff --git a/assets/light/spinner02@2x.png b/assets/light/spinner02@2x.png
deleted file mode 100755
index e1d397c1..00000000
Binary files a/assets/light/spinner02@2x.png and /dev/null differ
diff --git a/assets/light/spinner02@3x.png b/assets/light/spinner02@3x.png
deleted file mode 100755
index 170984c4..00000000
Binary files a/assets/light/spinner02@3x.png and /dev/null differ
diff --git a/assets/light/spinner03.png b/assets/light/spinner03.png
deleted file mode 100755
index 6e145f6e..00000000
Binary files a/assets/light/spinner03.png and /dev/null differ
diff --git a/assets/light/spinner03@2x.png b/assets/light/spinner03@2x.png
deleted file mode 100755
index 2d2f5f9e..00000000
Binary files a/assets/light/spinner03@2x.png and /dev/null differ
diff --git a/assets/light/spinner03@3x.png b/assets/light/spinner03@3x.png
deleted file mode 100755
index dc11b87d..00000000
Binary files a/assets/light/spinner03@3x.png and /dev/null differ
diff --git a/assets/light/spinner04.png b/assets/light/spinner04.png
deleted file mode 100755
index fcd847c6..00000000
Binary files a/assets/light/spinner04.png and /dev/null differ
diff --git a/assets/light/spinner04@2x.png b/assets/light/spinner04@2x.png
deleted file mode 100755
index ab5b0694..00000000
Binary files a/assets/light/spinner04@2x.png and /dev/null differ
diff --git a/assets/light/spinner04@3x.png b/assets/light/spinner04@3x.png
deleted file mode 100755
index f33dcfde..00000000
Binary files a/assets/light/spinner04@3x.png and /dev/null differ
diff --git a/assets/light/spinner05.png b/assets/light/spinner05.png
deleted file mode 100755
index 55b89e35..00000000
Binary files a/assets/light/spinner05.png and /dev/null differ
diff --git a/assets/light/spinner05@2x.png b/assets/light/spinner05@2x.png
deleted file mode 100755
index 8ea82766..00000000
Binary files a/assets/light/spinner05@2x.png and /dev/null differ
diff --git a/assets/light/spinner05@3x.png b/assets/light/spinner05@3x.png
deleted file mode 100755
index 426b1d06..00000000
Binary files a/assets/light/spinner05@3x.png and /dev/null differ
diff --git a/assets/light/spinner06.png b/assets/light/spinner06.png
deleted file mode 100755
index 44ee662a..00000000
Binary files a/assets/light/spinner06.png and /dev/null differ
diff --git a/assets/light/spinner06@2x.png b/assets/light/spinner06@2x.png
deleted file mode 100755
index 14f42cee..00000000
Binary files a/assets/light/spinner06@2x.png and /dev/null differ
diff --git a/assets/light/spinner06@3x.png b/assets/light/spinner06@3x.png
deleted file mode 100755
index 796d1d9b..00000000
Binary files a/assets/light/spinner06@3x.png and /dev/null differ
diff --git a/assets/light/spinner07.png b/assets/light/spinner07.png
deleted file mode 100755
index e3fdd1f5..00000000
Binary files a/assets/light/spinner07.png and /dev/null differ
diff --git a/assets/light/spinner07@2x.png b/assets/light/spinner07@2x.png
deleted file mode 100755
index fe459364..00000000
Binary files a/assets/light/spinner07@2x.png and /dev/null differ
diff --git a/assets/light/spinner07@3x.png b/assets/light/spinner07@3x.png
deleted file mode 100755
index b81176c0..00000000
Binary files a/assets/light/spinner07@3x.png and /dev/null differ
diff --git a/assets/light/spinner08.png b/assets/light/spinner08.png
deleted file mode 100755
index 2848f753..00000000
Binary files a/assets/light/spinner08.png and /dev/null differ
diff --git a/assets/light/spinner08@2x.png b/assets/light/spinner08@2x.png
deleted file mode 100755
index 3973a525..00000000
Binary files a/assets/light/spinner08@2x.png and /dev/null differ
diff --git a/assets/light/spinner08@3x.png b/assets/light/spinner08@3x.png
deleted file mode 100755
index dacc7ab5..00000000
Binary files a/assets/light/spinner08@3x.png and /dev/null differ
diff --git a/assets/light/spinner09.png b/assets/light/spinner09.png
deleted file mode 100755
index 590bb0de..00000000
Binary files a/assets/light/spinner09.png and /dev/null differ
diff --git a/assets/light/spinner09@2x.png b/assets/light/spinner09@2x.png
deleted file mode 100755
index 50f82ffb..00000000
Binary files a/assets/light/spinner09@2x.png and /dev/null differ
diff --git a/assets/light/spinner09@3x.png b/assets/light/spinner09@3x.png
deleted file mode 100755
index 23c334f1..00000000
Binary files a/assets/light/spinner09@3x.png and /dev/null differ
diff --git a/assets/light/spinner1.png b/assets/light/spinner1.png
new file mode 100755
index 00000000..ae57447d
Binary files /dev/null and b/assets/light/spinner1.png differ
diff --git a/assets/light/spinner10.png b/assets/light/spinner10.png
index cfbd2741..91f7d2a5 100755
Binary files a/assets/light/spinner10.png and b/assets/light/spinner10.png differ
diff --git a/assets/light/spinner10@2x.png b/assets/light/spinner10@2x.png
index 38f2e1bd..11ef1f91 100755
Binary files a/assets/light/spinner10@2x.png and b/assets/light/spinner10@2x.png differ
diff --git a/assets/light/spinner10@3x.png b/assets/light/spinner10@3x.png
index 9c0fd909..ec612366 100755
Binary files a/assets/light/spinner10@3x.png and b/assets/light/spinner10@3x.png differ
diff --git a/assets/light/spinner11.png b/assets/light/spinner11.png
index c8ad6c29..8ecb405e 100755
Binary files a/assets/light/spinner11.png and b/assets/light/spinner11.png differ
diff --git a/assets/light/spinner11@2x.png b/assets/light/spinner11@2x.png
index 0e44b272..1df62dff 100755
Binary files a/assets/light/spinner11@2x.png and b/assets/light/spinner11@2x.png differ
diff --git a/assets/light/spinner11@3x.png b/assets/light/spinner11@3x.png
index ee749606..b83e9788 100755
Binary files a/assets/light/spinner11@3x.png and b/assets/light/spinner11@3x.png differ
diff --git a/assets/light/spinner1@2x.png b/assets/light/spinner1@2x.png
new file mode 100755
index 00000000..dff2f339
Binary files /dev/null and b/assets/light/spinner1@2x.png differ
diff --git a/assets/light/spinner1@3x.png b/assets/light/spinner1@3x.png
new file mode 100755
index 00000000..7a9b35ad
Binary files /dev/null and b/assets/light/spinner1@3x.png differ
diff --git a/assets/light/spinner2.png b/assets/light/spinner2.png
new file mode 100755
index 00000000..184f4023
Binary files /dev/null and b/assets/light/spinner2.png differ
diff --git a/assets/light/spinner2@2x.png b/assets/light/spinner2@2x.png
new file mode 100755
index 00000000..839aef6e
Binary files /dev/null and b/assets/light/spinner2@2x.png differ
diff --git a/assets/light/spinner2@3x.png b/assets/light/spinner2@3x.png
new file mode 100755
index 00000000..a018c90c
Binary files /dev/null and b/assets/light/spinner2@3x.png differ
diff --git a/assets/light/spinner3.png b/assets/light/spinner3.png
new file mode 100755
index 00000000..bb6e9de7
Binary files /dev/null and b/assets/light/spinner3.png differ
diff --git a/assets/light/spinner3@2x.png b/assets/light/spinner3@2x.png
new file mode 100755
index 00000000..ec0bbb17
Binary files /dev/null and b/assets/light/spinner3@2x.png differ
diff --git a/assets/light/spinner3@3x.png b/assets/light/spinner3@3x.png
new file mode 100755
index 00000000..204fa7f2
Binary files /dev/null and b/assets/light/spinner3@3x.png differ
diff --git a/assets/light/spinner4.png b/assets/light/spinner4.png
new file mode 100755
index 00000000..4712f7b5
Binary files /dev/null and b/assets/light/spinner4.png differ
diff --git a/assets/light/spinner4@2x.png b/assets/light/spinner4@2x.png
new file mode 100755
index 00000000..e6ca2c84
Binary files /dev/null and b/assets/light/spinner4@2x.png differ
diff --git a/assets/light/spinner4@3x.png b/assets/light/spinner4@3x.png
new file mode 100755
index 00000000..41d155ba
Binary files /dev/null and b/assets/light/spinner4@3x.png differ
diff --git a/assets/light/spinner5.png b/assets/light/spinner5.png
new file mode 100755
index 00000000..2ed556c6
Binary files /dev/null and b/assets/light/spinner5.png differ
diff --git a/assets/light/spinner5@2x.png b/assets/light/spinner5@2x.png
new file mode 100755
index 00000000..ac30925c
Binary files /dev/null and b/assets/light/spinner5@2x.png differ
diff --git a/assets/light/spinner5@3x.png b/assets/light/spinner5@3x.png
new file mode 100755
index 00000000..c0bcd25d
Binary files /dev/null and b/assets/light/spinner5@3x.png differ
diff --git a/assets/light/spinner6.png b/assets/light/spinner6.png
new file mode 100755
index 00000000..eee001b3
Binary files /dev/null and b/assets/light/spinner6.png differ
diff --git a/assets/light/spinner6@2x.png b/assets/light/spinner6@2x.png
new file mode 100755
index 00000000..412498ef
Binary files /dev/null and b/assets/light/spinner6@2x.png differ
diff --git a/assets/light/spinner6@3x.png b/assets/light/spinner6@3x.png
new file mode 100755
index 00000000..33a1e3be
Binary files /dev/null and b/assets/light/spinner6@3x.png differ
diff --git a/assets/light/spinner7.png b/assets/light/spinner7.png
new file mode 100755
index 00000000..85f34619
Binary files /dev/null and b/assets/light/spinner7.png differ
diff --git a/assets/light/spinner7@2x.png b/assets/light/spinner7@2x.png
new file mode 100755
index 00000000..2b296f0a
Binary files /dev/null and b/assets/light/spinner7@2x.png differ
diff --git a/assets/light/spinner7@3x.png b/assets/light/spinner7@3x.png
new file mode 100755
index 00000000..8bb3c561
Binary files /dev/null and b/assets/light/spinner7@3x.png differ
diff --git a/assets/light/spinner8.png b/assets/light/spinner8.png
new file mode 100755
index 00000000..fa19dccc
Binary files /dev/null and b/assets/light/spinner8.png differ
diff --git a/assets/light/spinner8@2x.png b/assets/light/spinner8@2x.png
new file mode 100755
index 00000000..97cd86cc
Binary files /dev/null and b/assets/light/spinner8@2x.png differ
diff --git a/assets/light/spinner8@3x.png b/assets/light/spinner8@3x.png
new file mode 100755
index 00000000..8b56646f
Binary files /dev/null and b/assets/light/spinner8@3x.png differ
diff --git a/assets/light/spinner9.png b/assets/light/spinner9.png
new file mode 100755
index 00000000..557afee5
Binary files /dev/null and b/assets/light/spinner9.png differ
diff --git a/assets/light/spinner9@2x.png b/assets/light/spinner9@2x.png
new file mode 100755
index 00000000..5fa60664
Binary files /dev/null and b/assets/light/spinner9@2x.png differ
diff --git a/assets/light/spinner9@3x.png b/assets/light/spinner9@3x.png
new file mode 100755
index 00000000..6d2a40de
Binary files /dev/null and b/assets/light/spinner9@3x.png differ
diff --git a/assets/light/spinner@2x.png b/assets/light/spinner@2x.png
index 5c2aec7b..496973ab 100755
Binary files a/assets/light/spinner@2x.png and b/assets/light/spinner@2x.png differ
diff --git a/assets/light/spinner@3x.png b/assets/light/spinner@3x.png
index 803d9327..9f838b28 100755
Binary files a/assets/light/spinner@3x.png and b/assets/light/spinner@3x.png differ
diff --git a/assets/light/use_buffer--hover.png b/assets/light/use_buffer--hover.png
deleted file mode 100755
index 12a46f68..00000000
Binary files a/assets/light/use_buffer--hover.png and /dev/null differ
diff --git a/assets/light/use_buffer--hover@2x.png b/assets/light/use_buffer--hover@2x.png
deleted file mode 100755
index b49993a0..00000000
Binary files a/assets/light/use_buffer--hover@2x.png and /dev/null differ
diff --git a/assets/light/use_buffer--hover@3x.png b/assets/light/use_buffer--hover@3x.png
deleted file mode 100755
index 62a28c4f..00000000
Binary files a/assets/light/use_buffer--hover@3x.png and /dev/null differ
diff --git a/gulp-tasks/icons.js b/gulp-tasks/icons.js
index 5da5c243..7b6b7fa6 100644
--- a/gulp-tasks/icons.js
+++ b/gulp-tasks/icons.js
@@ -9,11 +9,11 @@ const debug = true;
 function __icons(variation) {
     let iconPath;
     fs.readdirSync("./src/icons/svg").forEach(icon => {
-        if (debug) console.log(`👁  - Reading ${icon} icon.`);
         iconPath = path.join(__dirname, `/../src/icons/svg/${icon}`);
+        icon = icon.split(".").slice(0, -1).join(".");
+        if (debug) console.log(`👁  - Reading ${icon} icon.`);
         fs.readFile(iconPath, (err, data) => {
             if (err) throw err;
-            icon = icon.split(".").slice(0, -1).join(".");
             options.settings.forEach(setting => {
                 svg2png(data, { width: setting.size, height: setting.size })
                     .then(buffer => {
diff --git a/src/icons/svg/arrow_down.svg b/src/icons/svg/arrow_down.svg
new file mode 100644
index 00000000..7977a729
--- /dev/null
+++ b/src/icons/svg/arrow_down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/>
+</svg>
diff --git a/src/icons/svg/arrow_left.svg b/src/icons/svg/arrow_left.svg
new file mode 100644
index 00000000..6b4f3528
--- /dev/null
+++ b/src/icons/svg/arrow_left.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+</svg>
diff --git a/src/icons/svg/arrow_right.svg b/src/icons/svg/arrow_right.svg
new file mode 100644
index 00000000..c3134ce3
--- /dev/null
+++ b/src/icons/svg/arrow_right.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
+</svg>
diff --git a/src/icons/svg/arrow_up.svg b/src/icons/svg/arrow_up.svg
new file mode 100644
index 00000000..16b84cb4
--- /dev/null
+++ b/src/icons/svg/arrow_up.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"/>
+</svg>
diff --git a/src/icons/svg/dirty_icon.svg b/src/icons/svg/dirty_icon.svg
new file mode 100644
index 00000000..1eeba08e
--- /dev/null
+++ b/src/icons/svg/dirty_icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
+</svg>
diff --git a/src/icons/svg/folder_closed.svg b/src/icons/svg/folder_closed.svg
new file mode 100644
index 00000000..fd1480a7
--- /dev/null
+++ b/src/icons/svg/folder_closed.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/>
+</svg>
diff --git a/src/icons/svg/folder_dup.svg b/src/icons/svg/folder_dup.svg
new file mode 100644
index 00000000..7a4e8c4f
--- /dev/null
+++ b/src/icons/svg/folder_dup.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M20 6h-8l-2-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm-2.06 11L15 15.28 12.06 17l.78-3.33-2.59-2.24 3.41-.29L15 8l1.34 3.14 3.41.29-2.59 2.24.78 3.33z"/>
+</svg>
diff --git a/src/icons/svg/folder_open.svg b/src/icons/svg/folder_open.svg
new file mode 100644
index 00000000..f7aff799
--- /dev/null
+++ b/src/icons/svg/folder_open.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z"/>
+</svg>
diff --git a/src/icons/svg/icon_case_sensitive.svg b/src/icons/svg/icon_case_sensitive.svg
index 0f465f52..07ef8b74 100644
--- a/src/icons/svg/icon_case_sensitive.svg
+++ b/src/icons/svg/icon_case_sensitive.svg
@@ -1,4 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"><defs>
-    <path id="a" d="M24 24H0V0h24v24z"/></defs>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
     <path d="M2.5 4v3h5v12h3V7h5V4h-13zm19 5h-9v3h3v7h3v-7h3V9z"/>
 </svg>
diff --git a/src/icons/svg/icon_close.svg b/src/icons/svg/icon_close.svg
new file mode 100644
index 00000000..3a289c02
--- /dev/null
+++ b/src/icons/svg/icon_close.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+</svg>
diff --git a/src/icons/svg/icon_highlight_matches.svg b/src/icons/svg/icon_highlight_matches.svg
index 69e6de47..6d68a56a 100644
--- a/src/icons/svg/icon_highlight_matches.svg
+++ b/src/icons/svg/icon_highlight_matches.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000" viewBox="0 0 24 24">
-    <path d="M6 14l3 3v5h6v-5l3-3V9H6zm5-12h2v3h-2zM3.5 5.875L4.914 4.46l2.12 2.122L5.62 7.997zm13.46.71l2.123-2.12 1.414 1.414L18.375 8z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M3.55 18.54l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8zM11 22.45h2V19.5h-2v2.95zM4 10.5H1v2h3v-2zm11-4.19V1.5H9v4.81C7.21 7.35 6 9.28 6 11.5c0 3.31 2.69 6 6 6s6-2.69 6-6c0-2.22-1.21-4.15-3-5.19zm5 4.19v2h3v-2h-3zm-2.76 7.66l1.79 1.8 1.41-1.41-1.8-1.79-1.4 1.4z"/>
 </svg>
diff --git a/src/icons/svg/icon_in_context.svg b/src/icons/svg/icon_in_context.svg
new file mode 100644
index 00000000..29654cf3
--- /dev/null
+++ b/src/icons/svg/icon_in_context.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M19.07 4.93l-1.41 1.41C19.1 7.79 20 9.79 20 12c0 4.42-3.58 8-8 8s-8-3.58-8-8c0-4.08 3.05-7.44 7-7.93v2.02C8.16 6.57 6 9.03 6 12c0 3.31 2.69 6 6 6s6-2.69 6-6c0-1.66-.67-3.16-1.76-4.24l-1.41 1.41C15.55 9.9 16 10.9 16 12c0 2.21-1.79 4-4 4s-4-1.79-4-4c0-1.86 1.28-3.41 3-3.86v2.14c-.6.35-1 .98-1 1.72 0 1.1.9 2 2 2s2-.9 2-2c0-.74-.4-1.38-1-1.72V2h-1C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10c0-2.76-1.12-5.26-2.93-7.07z"/>
+</svg>
diff --git a/src/icons/svg/icon_in_selection.svg b/src/icons/svg/icon_in_selection.svg
index 54262e5a..d0caed18 100644
--- a/src/icons/svg/icon_in_selection.svg
+++ b/src/icons/svg/icon_in_selection.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path d="M3 5h2V3c-1.1 0-2 .9-2 2zm0 8h2v-2H3v2zm4 8h2v-2H7v2zM3 9h2V7H3v2zm10-6h-2v2h2V3zm6 0v2h2c0-1.1-.9-2-2-2zM5 21v-2H3c0 1.1.9 2 2 2zm-2-4h2v-2H3v2zM9 3H7v2h2V3zm2 18h2v-2h-2v2zm8-8h2v-2h-2v2zm0 8c1.1 0 2-.9 2-2h-2v2zm0-12h2V7h-2v2zm0 8h2v-2h-2v2zm-4 4h2v-2h-2v2zm0-16h2V3h-2v2zM7 17h10V7H7v10zm2-8h6v6H9V9z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm8.94 3c-.46-4.17-3.77-7.48-7.94-7.94V1h-2v2.06C6.83 3.52 3.52 6.83 3.06 11H1v2h2.06c.46 4.17 3.77 7.48 7.94 7.94V23h2v-2.06c4.17-.46 7.48-3.77 7.94-7.94H23v-2h-2.06zM12 19c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z"/>
 </svg>
diff --git a/src/icons/svg/icon_preserve_case.svg b/src/icons/svg/icon_preserve_case.svg
new file mode 100644
index 00000000..945034ce
--- /dev/null
+++ b/src/icons/svg/icon_preserve_case.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/>
+</svg>
diff --git a/src/icons/svg/icon_regex.svg b/src/icons/svg/icon_regex.svg
new file mode 100644
index 00000000..50a440a6
--- /dev/null
+++ b/src/icons/svg/icon_regex.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-4 6h-4v2h4v2h-4v2h4v2H9V7h6v2z"/>
+</svg>
diff --git a/src/icons/svg/icon_use_buffer.svg b/src/icons/svg/icon_use_buffer.svg
new file mode 100644
index 00000000..4f91b2a3
--- /dev/null
+++ b/src/icons/svg/icon_use_buffer.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M19 8l-4 4h3c0 3.31-2.69 6-6 6-1.01 0-1.97-.25-2.8-.7l-1.46 1.46C8.97 19.54 10.43 20 12 20c4.42 0 8-3.58 8-8h3l-4-4zM6 12c0-3.31 2.69-6 6-6 1.01 0 1.97.25 2.8.7l1.46-1.46C15.03 4.46 13.57 4 12 4c-4.42 0-8 3.58-8 8H1l4 4 4-4H6z"/>
+</svg>
diff --git a/src/icons/svg/icon_whole_word.svg b/src/icons/svg/icon_whole_word.svg
new file mode 100644
index 00000000..f44973b1
--- /dev/null
+++ b/src/icons/svg/icon_whole_word.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M6 17h3l2-4V7H5v6h3zm8 0h3l2-4V7h-6v6h3z"/>
+</svg>
diff --git a/src/icons/svg/icon_wrap.svg b/src/icons/svg/icon_wrap.svg
index 54b8a0a2..c1874e75 100644
--- a/src/icons/svg/icon_wrap.svg
+++ b/src/icons/svg/icon_wrap.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
     <path d="M4 19h6v-2H4v2zM20 5H4v2h16V5zm-3 6H4v2h13.25c1.1 0 2 .9 2 2s-.9 2-2 2H15v-2l-3 3 3 3v-2h2c2.21 0 4-1.79 4-4s-1.79-4-4-4z"/>
 </svg>
diff --git a/src/icons/svg/overflow_menu.svg b/src/icons/svg/overflow_menu.svg
new file mode 100644
index 00000000..ec8cb345
--- /dev/null
+++ b/src/icons/svg/overflow_menu.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#4A616C">
+    <path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/>
+</svg>
diff --git a/src/themes/light/buttons.json b/src/themes/light/buttons.json
index 8931f82f..b7777f4f 100644
--- a/src/themes/light/buttons.json
+++ b/src/themes/light/buttons.json
@@ -153,7 +153,7 @@
     },
     {
         "class": "icon_context",
-        "layer0.texture": "mariana-theme/assets/light/in_context.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_in_context.png",
         "layer0.opacity": { "target": 0.5, "speed": 5.0, "interpolation": "smoothstep" },
         "content_margin": [12, 12]
     },
diff --git a/src/themes/light/code_folding.json b/src/themes/light/code_folding.json
index 9339c12d..88ba64fa 100644
--- a/src/themes/light/code_folding.json
+++ b/src/themes/light/code_folding.json
@@ -1,24 +1,19 @@
 [
     {
         "class": "fold_button_control",
-        "layer0.texture": "mariana-theme/assets/light/fold_right.png",
+        "layer0.texture": "mariana-theme/assets/light/arrow_right.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": 0,
-        "layer1.texture": "mariana-theme/assets/light/fold_right_hover.png",
-        "layer1.opacity": 0.0,
-        "layer1.inner_margin": 0,
-        "content_margin": [9, 7, 8, 6]
+        "content_margin": [4, 4]
     },
     {
         "class": "fold_button_control",
         "attributes": ["hover"],
-        "layer0.opacity": 0.0,
-        "layer1.opacity": 1.0
+        "layer0.opacity": 0.8
     },
     {
         "class": "fold_button_control",
         "attributes": ["expanded"],
-        "layer0.texture": "mariana-theme/assets/light/fold_down.png",
-        "layer1.texture": "mariana-theme/assets/light/fold_down_hover.png"
+        "layer0.texture": "mariana-theme/assets/light/arrow_down.png"
     }
 ]
diff --git a/src/themes/light/folder_files_icons.json b/src/themes/light/folder_files_icons.json
index 6cfc97f4..33f46f47 100644
--- a/src/themes/light/folder_files_icons.json
+++ b/src/themes/light/folder_files_icons.json
@@ -19,14 +19,14 @@
         "class": "icon_folder",
         "layer0.texture": "mariana-theme/assets/light/folder_closed.png",
         "layer0.opacity": 1.0,
-        "content_margin": [11, 7]
+        "content_margin": [10, 10]
     },
     {
         "class": "icon_folder",
         "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
         "layer0.texture": "mariana-theme/assets/light/folder_open.png",
         "layer0.opacity": 1.0,
-        "content_margin": [11, 7]
+        "content_margin": [10, 10]
     },
     {
         "class": "icon_folder_loading",
@@ -34,17 +34,18 @@
         {
             "keyframes":
             [
-                "mariana-theme/assets/light/spinner01.png",
-                "mariana-theme/assets/light/spinner02.png",
-                "mariana-theme/assets/light/spinner03.png",
-                "mariana-theme/assets/light/spinner04.png",
-                "mariana-theme/assets/light/spinner05.png",
-                "mariana-theme/assets/light/spinner06.png",
-                "mariana-theme/assets/light/spinner07.png",
-                "mariana-theme/assets/light/spinner08.png",
-                "mariana-theme/assets/light/spinner09.png",
+                "mariana-theme/assets/light/spinner11.png",
                 "mariana-theme/assets/light/spinner10.png",
-                "mariana-theme/assets/light/spinner11.png"
+                "mariana-theme/assets/light/spinner9.png",
+                "mariana-theme/assets/light/spinner8.png",
+                "mariana-theme/assets/light/spinner7.png",
+                "mariana-theme/assets/light/spinner6.png",
+                "mariana-theme/assets/light/spinner5.png",
+                "mariana-theme/assets/light/spinner4.png",
+                "mariana-theme/assets/light/spinner3.png",
+                "mariana-theme/assets/light/spinner2.png",
+                "mariana-theme/assets/light/spinner1.png",
+                "mariana-theme/assets/light/spinner.png"
             ],
             "loop": true,
             "frame_time": 0.08
diff --git a/src/themes/light/inputs.json b/src/themes/light/inputs.json
index 2762974c..2a836fa8 100644
--- a/src/themes/light/inputs.json
+++ b/src/themes/light/inputs.json
@@ -22,7 +22,7 @@
         "layer0.texture": "mariana-theme/assets/light/overflow_menu.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [0, 0],
-        "layer1.texture": "mariana-theme/assets/light/overflow_menu_hover.png",
+        "layer1.texture": "mariana-theme/assets/light/overflow_menu.png",
         "layer1.opacity": 0.0,
         "layer1.inner_margin": [0, 0]
     },
diff --git a/src/themes/light/open_files.json b/src/themes/light/open_files.json
index 88921707..73fbf7c1 100644
--- a/src/themes/light/open_files.json
+++ b/src/themes/light/open_files.json
@@ -1,14 +1,14 @@
 [
     {
         "class": "close_button",
-        "layer0.texture": "mariana-theme/assets/light/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": 1.0,
         "content_margin": [8, 8]
     },
     {
         "class": "close_button",
         "attributes": ["hover"],
-        "layer0.texture": "mariana-theme/assets/light/close_icon_hover.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": 1.0
     },
     {
@@ -19,6 +19,6 @@
     {
         "class": "close_button",
         "attributes": ["hover", "dirty"],
-        "layer0.texture": "mariana-theme/assets/light/dirty_icon_hover.png"
+        "layer0.texture": "mariana-theme/assets/light/dirty_icon.png"
     }
 ]
diff --git a/src/themes/light/panels.json b/src/themes/light/panels.json
index 348a088a..94c175af 100644
--- a/src/themes/light/panels.json
+++ b/src/themes/light/panels.json
@@ -1,10 +1,10 @@
 [
     {
         "class": "panel_control",
-        "layer0.tint": ["background", 0.4],
+        "layer0.tint": [250, 250, 250],
         "layer0.inner_margin": [2, 2, 2, 2],
         "layer0.opacity": 1.0,
-        "layer1.tint": [220, 222, 224],
+        "layer1.tint": [250, 250, 250],
         "layer1.inner_margin": [2, 2, 2, 2],
         "layer1.opacity": 1.0,
         "content_margin": [6, 14, 6, 8]
@@ -12,7 +12,7 @@
     {
         "class": "panel_control",
         "parents": [{"class": "switch_project_window"}],
-        "layer0.tint": [220, 222, 224]
+        "layer0.tint": ["background", 1.0]
     },
     {
         "class": "panel_grid_control",
@@ -22,7 +22,7 @@
     },
     {
         "class": "panel_close_button",
-        "layer0.texture": "mariana-theme/assets/light/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": { "target": 0.4, "speed": 4.0, "interpolation": "smoothstep" },
         "layer1.opacity": 0.0,
         "content_margin": [0, 0]
diff --git a/src/themes/light/quick_panel.json b/src/themes/light/quick_panel.json
index a89dab22..04ef314d 100644
--- a/src/themes/light/quick_panel.json
+++ b/src/themes/light/quick_panel.json
@@ -1,54 +1,78 @@
 [
     {
         "class": "overlay_control",
-        "layer1.tint": [220, 222, 224],
+        "layer0.inner_margin": [24, 4, 24, 33],
         "layer0.opacity": 1.0,
-        "content_margin": 4
-    },
-    {
-        "class": "quick_panel",
-        "row_padding": 6,
-        "layer0.tint": [220, 222, 224],
-        "layer0.opacity": 1.0,
-        "dark_content": false
+        "layer1.inner_margin": [16, 0, 16, 25],
+        "layer1.opacity": 1.0,
+        "content_margin": [13, 13, 13, 33]
     },
     {
         "class": "mini_quick_panel_row",
-        "layer0.tint": [199, 203, 209],
-        "layer0.opacity": 0.0
+        "layer0.tint": [250, 250, 250],
+        "layer0.inner_margin": [2, 2, 2, 2],
+        "layer0.opacity": 1.0
     },
     {
         "class": "mini_quick_panel_row",
         "attributes": ["selected"],
+        "layer0.tint": [144, 164, 174]
+    },
+    {
+        "class": "quick_panel",
+        "row_padding": [32, 12],
+        "layer0.tint": [250, 250, 250],
         "layer0.opacity": 1.0
     },
     {
         "class": "quick_panel_row",
-        "layer0.tint": [199, 203, 209],
-        "layer0.opacity": 0.0
+        "layer0.tint": [38, 50, 56, 0],
+        "layer0.opacity": 1.0
     },
     {
         "class": "quick_panel_row",
-        "attributes": ["selected"],
+        "parents": [{"class": "overlay_control"}],
+        "layer0.tint": [250, 250, 250],
         "layer0.opacity": 1.0
     },
+    {
+        "class": "quick_panel",
+        "parents": [{"class": "overlay_control"}],
+        "row_padding": [32, 12],
+        "layer0.tint": [38, 50, 56, 0],
+        "layer0.opacity": 1.0
+    },
+    {
+        "class": "quick_panel_row",
+        "attributes": ["selected"],
+        "layer0.tint": [144, 164, 174],
+        "layer1.opacity": 0.0
+    },
     {
         "class": "quick_panel_label",
-        "fg": [69, 74, 85],
-        "match_fg": [0, 0, 0],
-        "selected_fg": [46, 49, 56],
-        "selected_match_fg": [0, 0, 0]
+        "fg": [128, 203, 196, 255],
+        "match_fg": [128, 203, 196, 255],
+        "selected_fg": [255, 255, 255, 255],
+        "selected_match_fg": [128, 203, 196, 255]
     },
     {
         "class": "quick_panel_label",
-        "parents": [{"class": "mini_quick_panel_row"}],
-        "font.size": 14
+        "parents": [{"class": "overlay_control"}],
+        "fg": [84, 110, 122],
+        "match_fg": [128, 203, 196, 255],
+        "selected_fg": [255, 255, 255, 255],
+        "selected_match_fg": [128, 203, 196, 255]
     },
     {
         "class": "quick_panel_path_label",
-        "fg": [115, 125, 140],
-        "match_fg": [92, 100, 112],
-        "selected_fg": [92, 100, 112],
-        "selected_match_fg": [69, 74, 85]
+        "fg": [176, 190, 197, 255],
+        "match_fg": [128, 203, 196, 255],
+        "selected_fg": [255, 255, 255, 255],
+        "selected_match_fg": [128, 203, 196, 255]
+    },
+    {
+        "class": "quick_panel_score_label",
+        "fg": [84, 110, 122],
+        "selected_fg": [255, 255, 255, 255]
     }
 ]
diff --git a/src/themes/light/status_bar.json b/src/themes/light/status_bar.json
index bf6463d9..fb6a6546 100644
--- a/src/themes/light/status_bar.json
+++ b/src/themes/light/status_bar.json
@@ -14,7 +14,7 @@
     {
         "class": "panel_button_control",
         "attributes": ["hover"],
-        "layer0.texture": "mariana-theme/assets/light/overflow_menu_hover.png"
+        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png"
     },
     {
         "class": "status_container",
diff --git a/src/themes/light/tabs.json b/src/themes/light/tabs.json
index a3b1f586..bd843570 100644
--- a/src/themes/light/tabs.json
+++ b/src/themes/light/tabs.json
@@ -77,21 +77,21 @@
     },
     {
         "class": "tab_close_button",
-        "content_margin": [0, 0],
-        "layer0.texture": "mariana-theme/assets/light/close_icon.png",
+        "content_margin": [6, 6],
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
         "layer0.opacity": 1,
         "layer0.inner_margin": 0,
-        "layer1.texture": "mariana-theme/assets/light/close_icon_hover.png",
+        "layer1.texture": "mariana-theme/assets/light/icon_close.png",
         "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" },
         "layer2.texture": "mariana-theme/assets/light/dirty_icon.png",
         "layer2.inner_margin": 0,
-        "layer3.texture": "mariana-theme/assets/light/dirty_icon_hover.png",
+        "layer3.texture": "mariana-theme/assets/light/dirty_icon.png",
         "layer3.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" }
     },
     {
         "class": "tab_close_button",
         "settings": ["show_tab_close_buttons"],
-        "content_margin": [8,8]
+        "content_margin": [7, 7]
     },
     {
         "class": "tab_close_button",
@@ -114,7 +114,7 @@
         "layer1.opacity": 0,
         "layer2.opacity": 0,
         "layer3.opacity": 1,
-        "content_margin": [8,8]
+        "content_margin": [7, 7]
     },
     {
         "class": "tab_close_button",
@@ -146,7 +146,7 @@
         "class": "scroll_tabs_left_button",
         "layer0.texture": "mariana-theme/assets/light/arrow_left.png",
         "layer0.opacity": { "target": 0.6, "speed": 4.0, "interpolation": "smoothstep" },
-        "content_margin": [14, 7]
+        "content_margin": [10, 10]
     },
     {
         "class": "scroll_tabs_left_button",
@@ -157,7 +157,7 @@
         "class": "scroll_tabs_right_button",
         "layer0.texture": "mariana-theme/assets/light/arrow_right.png",
         "layer0.opacity": { "target": 0.6, "speed": 4.0, "interpolation": "smoothstep" },
-        "content_margin": [14, 7]
+        "content_margin": [10, 10]
     },
     {
         "class": "scroll_tabs_right_button",
@@ -170,7 +170,7 @@
         "layer0.texture": "mariana-theme/assets/light/overflow_menu.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": 0,
-        "layer1.texture": "mariana-theme/assets/light/overflow_menu_hover.png",
+        "layer1.texture": "mariana-theme/assets/light/overflow_menu.png",
         "layer1.opacity": { "target": 0.0, "speed": 8.0, "interpolation": "smoothstep" },
         "layer1.inner_margin": 0
     },