diff --git a/extensions/git/package.json b/extensions/git/package.json
index f85fd49c1d7..814f53020aa 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -82,8 +82,8 @@
         "title": "%command.openFile%",
         "category": "Git",
         "icon": {
-          "light": "resources/icons/light/open-file-mono.svg",
-          "dark": "resources/icons/dark/open-file-mono.svg"
+          "light": "resources/icons/light/open-file.svg",
+          "dark": "resources/icons/dark/open-file.svg"
         }
       },
       {
diff --git a/extensions/git/resources/icons/dark/check.svg b/extensions/git/resources/icons/dark/check.svg
index c225b2f597f..02f94482225 100644
--- a/extensions/git/resources/icons/dark/check.svg
+++ b/extensions/git/resources/icons/dark/check.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#C5C5C5" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.2667 3.71007L14.4876 2.87374L9.84292 7.09791L5.19829 11.3221L1.27008 6.99449L0.423831 7.76251L5.12 12.9364L15.2667 3.71007Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/git/resources/icons/dark/clean.svg b/extensions/git/resources/icons/dark/clean.svg
index 3770d63d5f9..eb7bfecd100 100644
--- a/extensions/git/resources/icons/dark/clean.svg
+++ b/extensions/git/resources/icons/dark/clean.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="-0.994 0 16 16" enable-background="new -0.994 0 16 16"><path fill="#C5C5C5" d="M13 6c0 1.461-.636 2.846-1.746 3.797l-5.584 4.951-1.324-1.496 5.595-4.962c.678-.582 1.061-1.413 1.061-2.29 0-1.654-1.345-3-2.997-3-.71 0-1.399.253-1.938.713l-1.521 1.287h2.448l-1.998 2h-3.996v-4l1.998-2v2.692l1.775-1.504c.899-.766 2.047-1.188 3.232-1.188 2.754 0 4.995 2.243 4.995 5z"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 2H4V4.53885L5.2002 3.33859C6.98486 1.5538 9.87891 1.5538 11.6636 3.33859C13.4482 5.12341 13.4482 8.01715 11.6636 9.80194L6.46582 14.9999L5.74561 14.2799L10.9434 9.08188C12.3306 7.69476 12.3306 5.4458 10.9434 4.05869C9.55664 2.67157 7.30762 2.67157 5.92041 4.05869L4.979 5H7V6H3V2Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/git/resources/icons/dark/git.svg b/extensions/git/resources/icons/dark/git.svg
index c08b1c2e403..4d9389336b9 100644
--- a/extensions/git/resources/icons/dark/git.svg
+++ b/extensions/git/resources/icons/dark/git.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M27.459 14.902l-10.439-10.439c-.296-.294-.672-.452-1.089-.452-.417 0-.793.157-1.089.452l-2.248 2.247 2.549 2.549c.249-.112.522-.177.813-.177 1.106 0 2.002.896 2.002 2.002 0 .291-.064.565-.176.814l2.311 2.336c.25-.111.633-.234.923-.234 1.106 0 2 .911 2 2.016s-.894 1.969-2 1.969c-1.105-.001-2.016-.751-2.016-1.985 0-.28.016-.462.119-.704l-2.373-2.374-.023.007v6.274c.747.295 1.277 1.026 1.277 1.875 0 1.105-.878 2.016-1.984 2.016-1.104 0-2.031-.926-2.031-2.031 0-.846.535-1.564 1.28-1.857l.001-6.25c-.762-.282-1.309-1.009-1.309-1.871 0-.28.059-.546.162-.788l-2.555-2.557-7.115 7.114c-.599.601-.601 1.576.001 2.178l10.44 10.518c.296.295.671.45 1.089.45.415 0 .796-.159 1.089-.45l10.391-10.471c.601-.599.599-1.576 0-2.177z" fill="#fff"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 7V8H8V14H7V8H1V7H7V1H8V7H14Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/git/resources/icons/dark/open-change.svg b/extensions/git/resources/icons/dark/open-change.svg
index 6f785c26a5e..ebcd291d745 100644
--- a/extensions/git/resources/icons/dark/open-change.svg
+++ b/extensions/git/resources/icons/dark/open-change.svg
@@ -1 +1,8 @@
-<svg fill="none" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m6 12h-1c-.27-.02-.48-.11-.69-.31s-.3-.42-.31-.69v-6.28c.59-.34 1-.98 1-1.72 0-1.11-.89-2-2-2s-2 .89-2 2c0 .73.41 1.38 1 1.72v6.28c.03.78.34 1.47.94 2.06s1.28.91 2.06.94c0 0 1.02 0 1 0v2l3-3-3-3zm-3-10.2c.66 0 1.2.55 1.2 1.2s-.55 1.2-1.2 1.2-1.2-.55-1.2-1.2.55-1.2 1.2-1.2zm11 9.48c0-1.73 0-6.28 0-6.28-.03-.78-.34-1.47-.94-2.06s-1.28-.91-2.06-.94h-1v-2l-3 3 3 3v-2h1c.27.02.48.11.69.31s.3.42.31.69v6.28c-.59.34-1 .98-1 1.72 0 1.11.89 2 2 2s2-.89 2-2c0-.73-.41-1.38-1-1.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2s.55-1.2 1.2-1.2 1.2.55 1.2 1.2-.55 1.2-1.2 1.2z" fill="#c5c5c5" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.508 13.915C13.3436 13.915 14.021 13.2376 14.021 12.402C14.021 11.5664 13.3436 10.889 12.508 10.889C11.6724 10.889 10.995 11.5664 10.995 12.402C10.995 13.2376 11.6724 13.915 12.508 13.915Z" stroke="#C5C5C5" stroke-miterlimit="10"/>
+<path d="M12.517 11.043V4.672C12.5171 4.51814 12.4869 4.36576 12.4281 4.22357C12.3694 4.08138 12.2831 3.95217 12.1744 3.84333C12.0656 3.73449 11.9365 3.64814 11.7944 3.58923C11.6522 3.53032 11.4999 3.5 11.346 3.5H7.793" stroke="#C5C5C5" stroke-miterlimit="10"/>
+<path d="M9.479 5.691L7.36 3.501L9.532 1.34" stroke="#C5C5C5" stroke-linejoin="bevel"/>
+<path d="M3.512 5.09C4.34761 5.09 5.025 4.4126 5.025 3.577C5.025 2.74139 4.34761 2.064 3.512 2.064C2.67639 2.064 1.999 2.74139 1.999 3.577C1.999 4.4126 2.67639 5.09 3.512 5.09Z" stroke="#C5C5C5" stroke-miterlimit="10"/>
+<path d="M3.5 4.936V11.307C3.5 11.6176 3.62337 11.9154 3.84298 12.135C4.06258 12.3546 4.36043 12.478 4.671 12.478H8.227" stroke="#C5C5C5" stroke-miterlimit="10"/>
+<path d="M6.541 10.287L8.66 12.478L6.488 14.638" stroke="#C5C5C5" stroke-linejoin="bevel"/>
+</svg>
diff --git a/extensions/git/resources/icons/dark/open-file-mono.svg b/extensions/git/resources/icons/dark/open-file-mono.svg
deleted file mode 100644
index 830727e70b3..00000000000
--- a/extensions/git/resources/icons/dark/open-file-mono.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><polygon fill="#C5C5C5" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/><polygon fill="#C5C5C5" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/></svg>
\ No newline at end of file
diff --git a/extensions/git/resources/icons/dark/open-file.svg b/extensions/git/resources/icons/dark/open-file.svg
index f6302185aa4..5cebcad2a8d 100644
--- a/extensions/git/resources/icons/dark/open-file.svg
+++ b/extensions/git/resources/icons/dark/open-file.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><polygon fill="#C5C5C5" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/><polygon fill="#75BEFF" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 5.6C1 4.93696 1.26339 4.30107 1.73223 3.83223C2.20107 3.36339 2.83696 3.1 3.5 3.1H6.625L5.243 1.711L5.931 1L5.942 1.012L8.542 3.612L5.9 6.25L5.891 6.241L5.2 5.55L6.64 4.1H3.5C3.10218 4.1 2.72064 4.25803 2.43934 4.53934C2.15804 4.82064 2 5.20218 2 5.6C2 5.99782 2.15804 6.37936 2.43934 6.66066C2.72064 6.94196 3.10218 7.1 3.5 7.1H4V8.1H3.5C2.83696 8.1 2.20107 7.83661 1.73223 7.36777C1.26339 6.89893 1 6.26304 1 5.6V5.6Z" fill="#C5C5C5"/>
+<path d="M1 5.6C1 4.93696 1.26339 4.30107 1.73223 3.83223C2.20107 3.36339 2.83696 3.1 3.5 3.1H6.625L5.243 1.711L5.931 1L5.942 1.012L8.542 3.612L5.9 6.25L5.891 6.241L5.2 5.55L6.64 4.1H3.5C3.10218 4.1 2.72064 4.25803 2.43934 4.53934C2.15804 4.82064 2 5.20218 2 5.6C2 5.99782 2.15804 6.37936 2.43934 6.66066C2.72064 6.94196 3.10218 7.1 3.5 7.1H4V8.1H3.5C2.83696 8.1 2.20107 7.83661 1.73223 7.36777C1.26339 6.89893 1 6.26304 1 5.6V5.6Z" fill="#C5C5C5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.34423 3L8.34423 2H10.688L11.688 3H11.682L13.975 5.296V5.29L15 6.29V15H5V9.09998V6.76419L5.89946 7.66366L6 7.56327V14H14V7H10.025L10 3H9.34423ZM13.268 6L11 3.707V6H13.268Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/git/resources/icons/dark/refresh.svg b/extensions/git/resources/icons/dark/refresh.svg
index d79fdaa4e8e..31606ae7263 100644
--- a/extensions/git/resources/icons/dark/refresh.svg
+++ b/extensions/git/resources/icons/dark/refresh.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#2D2D30"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#C5C5C5"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.6822 3H2V2H6V6H5V3.99963C3.78555 4.91184 3 6.36418 3 8C3 10.7614 5.23858 13 8 13C10.7614 13 13 10.7614 13 8C13 5.77211 11.5429 3.88455 9.52968 3.23832L9.83199 2.28483C12.2497 3.0592 14 5.3252 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 5.91303 3.06551 4.07492 4.6822 3Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/git/resources/icons/dark/stage.svg b/extensions/git/resources/icons/dark/stage.svg
index 3475c1e1963..4d9389336b9 100644
--- a/extensions/git/resources/icons/dark/stage.svg
+++ b/extensions/git/resources/icons/dark/stage.svg
@@ -1 +1,3 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="11" width="3" y="3" x="7" fill="#C5C5C5"/><rect height="3" width="11" y="7" x="3" fill="#C5C5C5"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 7V8H8V14H7V8H1V7H7V1H8V7H14Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/git/resources/icons/dark/unstage.svg b/extensions/git/resources/icons/dark/unstage.svg
index 2de46fcf5b5..7cb883ecfb2 100644
--- a/extensions/git/resources/icons/dark/unstage.svg
+++ b/extensions/git/resources/icons/dark/unstage.svg
@@ -1 +1,3 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="3" width="11" y="7" x="3" fill="#C5C5C5"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 8H3V7H13V8Z" fill="white"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/check.svg b/extensions/git/resources/icons/light/check.svg
index 3f365c4800e..92f415703c1 100644
--- a/extensions/git/resources/icons/light/check.svg
+++ b/extensions/git/resources/icons/light/check.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#424242" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.2667 3.71009L14.4876 2.87375L9.84292 7.09793L5.19829 11.3221L1.27008 6.9945L0.423831 7.76253L5.12 12.9365L15.2667 3.71009Z" fill="#424242"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/clean.svg b/extensions/git/resources/icons/light/clean.svg
index f86ec7d627d..ccef86a530f 100644
--- a/extensions/git/resources/icons/light/clean.svg
+++ b/extensions/git/resources/icons/light/clean.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="-0.994 0 16 16" enable-background="new -0.994 0 16 16"><path fill="#424242" d="M13 6c0 1.461-.636 2.846-1.746 3.797l-5.584 4.951-1.324-1.496 5.595-4.962c.678-.582 1.061-1.413 1.061-2.29 0-1.654-1.345-3-2.997-3-.71 0-1.399.253-1.938.713l-1.521 1.287h2.448l-1.998 2h-3.996v-4l1.998-2v2.692l1.775-1.504c.899-.766 2.047-1.188 3.232-1.188 2.754 0 4.995 2.243 4.995 5z"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 2H4V4.53885L5.2002 3.33859C6.98486 1.5538 9.87891 1.5538 11.6636 3.33859C13.4482 5.12341 13.4482 8.01715 11.6636 9.80194L6.46582 14.9999L5.74561 14.2799L10.9434 9.08188C12.3306 7.69476 12.3306 5.4458 10.9434 4.05869C9.55664 2.67157 7.30762 2.67157 5.92041 4.05869L4.979 5H7V6H3V2Z" fill="#424242"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/git.svg b/extensions/git/resources/icons/light/git.svg
index d1049a44d0d..01a9de7d5ab 100644
--- a/extensions/git/resources/icons/light/git.svg
+++ b/extensions/git/resources/icons/light/git.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><defs><clipPath><path d="M.06 91.886h91.828v-91.886h-91.828v91.886z"/></clipPath><clipPath id="a"><path d="M0 0h92v92h-92v-92z"/></clipPath></defs><path d="M28.497 14.84l-11.354-11.353c-.653-.654-1.714-.654-2.368 0l-2.357 2.358 2.99 2.991c.695-.235 1.492-.077 2.046.477.557.558.713 1.361.473 2.059l2.882 2.882c.698-.241 1.502-.085 2.059.473.778.778.778 2.039 0 2.818-.779.779-2.04.779-2.819 0-.586-.586-.73-1.446-.434-2.167l-2.688-2.688v7.074c.19.094.369.219.527.377.778.778.778 2.039 0 2.819-.778.778-2.04.778-2.818 0-.778-.779-.778-2.04 0-2.819.192-.192.415-.338.653-.435v-7.14c-.237-.097-.46-.241-.653-.435-.589-.589-.731-1.455-.429-2.179l-2.948-2.949-7.785 7.785c-.654.655-.654 1.715 0 2.369l11.354 11.353c.654.654 1.714.654 2.369 0l11.3-11.301c.654-.654.654-1.715 0-2.369" fill="#424242" clip-path="url(#a)"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 7V8H8V14H7V8H1V7H7V1H8V7H14Z" fill="#424242"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/open-change.svg b/extensions/git/resources/icons/light/open-change.svg
index 873b93d8106..5d361a749f3 100644
--- a/extensions/git/resources/icons/light/open-change.svg
+++ b/extensions/git/resources/icons/light/open-change.svg
@@ -1 +1,8 @@
-<svg fill="none" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m6 12h-1c-.27-.02-.48-.11-.69-.31s-.3-.42-.31-.69v-6.28c.59-.34 1-.98 1-1.72 0-1.11-.89-2-2-2s-2 .89-2 2c0 .73.41 1.38 1 1.72v6.28c.03.78.34 1.47.94 2.06s1.28.91 2.06.94c0 0 1.02 0 1 0v2l3-3-3-3zm-3-10.2c.66 0 1.2.55 1.2 1.2s-.55 1.2-1.2 1.2-1.2-.55-1.2-1.2.55-1.2 1.2-1.2zm11 9.48c0-1.73 0-6.28 0-6.28-.03-.78-.34-1.47-.94-2.06s-1.28-.91-2.06-.94h-1v-2l-3 3 3 3v-2h1c.27.02.48.11.69.31s.3.42.31.69v6.28c-.59.34-1 .98-1 1.72 0 1.11.89 2 2 2s2-.89 2-2c0-.73-.41-1.38-1-1.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2s.55-1.2 1.2-1.2 1.2.55 1.2 1.2-.55 1.2-1.2 1.2z" fill="#424242" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.508 13.915C13.3436 13.915 14.021 13.2376 14.021 12.402C14.021 11.5664 13.3436 10.889 12.508 10.889C11.6724 10.889 10.995 11.5664 10.995 12.402C10.995 13.2376 11.6724 13.915 12.508 13.915Z" stroke="#424242" stroke-miterlimit="10"/>
+<path d="M12.517 11.043V4.672C12.5171 4.51814 12.4869 4.36576 12.4281 4.22357C12.3694 4.08138 12.2831 3.95217 12.1744 3.84333C12.0656 3.73449 11.9365 3.64814 11.7944 3.58923C11.6522 3.53032 11.4999 3.5 11.346 3.5H7.793" stroke="#424242" stroke-miterlimit="10"/>
+<path d="M9.479 5.691L7.36 3.501L9.532 1.34" stroke="#424242" stroke-linejoin="bevel"/>
+<path d="M3.512 5.09C4.34761 5.09 5.025 4.4126 5.025 3.577C5.025 2.74139 4.34761 2.064 3.512 2.064C2.67639 2.064 1.999 2.74139 1.999 3.577C1.999 4.4126 2.67639 5.09 3.512 5.09Z" stroke="#424242" stroke-miterlimit="10"/>
+<path d="M3.5 4.936V11.307C3.5 11.6176 3.62337 11.9154 3.84298 12.135C4.06258 12.3546 4.36043 12.478 4.671 12.478H8.227" stroke="#424242" stroke-miterlimit="10"/>
+<path d="M6.541 10.287L8.66 12.478L6.488 14.638" stroke="#424242" stroke-linejoin="bevel"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/open-file-mono.svg b/extensions/git/resources/icons/light/open-file-mono.svg
deleted file mode 100644
index fa3f245b755..00000000000
--- a/extensions/git/resources/icons/light/open-file-mono.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><polygon fill="#424242" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/><polygon fill="#424242" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/></svg>
\ No newline at end of file
diff --git a/extensions/git/resources/icons/light/open-file.svg b/extensions/git/resources/icons/light/open-file.svg
index d23a23c6b5f..e5b2a034bf8 100644
--- a/extensions/git/resources/icons/light/open-file.svg
+++ b/extensions/git/resources/icons/light/open-file.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><polygon fill="#656565" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/><polygon fill="#00539C" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 5.6C1 4.93696 1.26339 4.30107 1.73223 3.83223C2.20107 3.36339 2.83696 3.1 3.5 3.1H6.625L5.243 1.711L5.931 1L5.942 1.012L8.542 3.612L5.9 6.25L5.891 6.241L5.2 5.55L6.64 4.1H3.5C3.10218 4.1 2.72064 4.25803 2.43934 4.53934C2.15804 4.82064 2 5.20218 2 5.6C2 5.99782 2.15804 6.37936 2.43934 6.66066C2.72064 6.94196 3.10218 7.1 3.5 7.1H4V8.1H3.5C2.83696 8.1 2.20107 7.83661 1.73223 7.36777C1.26339 6.89893 1 6.26304 1 5.6V5.6Z" fill="#424242"/>
+<path d="M1 5.6C1 4.93696 1.26339 4.30107 1.73223 3.83223C2.20107 3.36339 2.83696 3.1 3.5 3.1H6.625L5.243 1.711L5.931 1L5.942 1.012L8.542 3.612L5.9 6.25L5.891 6.241L5.2 5.55L6.64 4.1H3.5C3.10218 4.1 2.72064 4.25803 2.43934 4.53934C2.15804 4.82064 2 5.20218 2 5.6C2 5.99782 2.15804 6.37936 2.43934 6.66066C2.72064 6.94196 3.10218 7.1 3.5 7.1H4V8.1H3.5C2.83696 8.1 2.20107 7.83661 1.73223 7.36777C1.26339 6.89893 1 6.26304 1 5.6V5.6Z" fill="#424242"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.34423 3L8.34423 2H10.688L11.688 3H11.682L13.975 5.296V5.29L15 6.29V15H5V9.09998V6.76419L5.89946 7.66366L6 7.56327V14H14V7H10.025L10 3H9.34423ZM13.268 6L11 3.707V6H13.268Z" fill="#424242"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/refresh.svg b/extensions/git/resources/icons/light/refresh.svg
index e0345748192..78d9826af04 100644
--- a/extensions/git/resources/icons/light/refresh.svg
+++ b/extensions/git/resources/icons/light/refresh.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#F6F6F6"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#424242"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.6822 3H2V2H6V6H5V3.99963C3.78555 4.91184 3 6.36418 3 8C3 10.7614 5.23858 13 8 13C10.7614 13 13 10.7614 13 8C13 5.77211 11.5429 3.88455 9.52968 3.23832L9.83199 2.28483C12.2497 3.0592 14 5.3252 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 5.91303 3.06551 4.07492 4.6822 3Z" fill="#424242"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/stage.svg b/extensions/git/resources/icons/light/stage.svg
index bdecdb0e45b..01a9de7d5ab 100644
--- a/extensions/git/resources/icons/light/stage.svg
+++ b/extensions/git/resources/icons/light/stage.svg
@@ -1 +1,3 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="11" width="3" y="3" x="7" fill="#424242"/><rect height="3" width="11" y="7" x="3" fill="#424242"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 7V8H8V14H7V8H1V7H7V1H8V7H14Z" fill="#424242"/>
+</svg>
diff --git a/extensions/git/resources/icons/light/unstage.svg b/extensions/git/resources/icons/light/unstage.svg
index f5d128b2df8..5392dba3bd9 100644
--- a/extensions/git/resources/icons/light/unstage.svg
+++ b/extensions/git/resources/icons/light/unstage.svg
@@ -1 +1,3 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="3" width="11" y="7" x="3" fill="#424242"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 8H3V7H13V8Z" fill="#424242"/>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index 6ce67206f73..317c4a2736c 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -564,8 +564,8 @@ appendEditorToolItem(
 	{
 		id: editorCommands.GOTO_PREVIOUS_CHANGE,
 		title: nls.localize('navigate.prev.label', "Previous Change"),
-		iconDark: 'previous-diff-inverse.svg',
-		iconLight: 'previous-diff.svg'
+		iconDark: 'previous-diff-dark.svg',
+		iconLight: 'previous-diff-light.svg'
 	},
 	TextCompareEditorActiveContext,
 	10
@@ -576,8 +576,8 @@ appendEditorToolItem(
 	{
 		id: editorCommands.GOTO_NEXT_CHANGE,
 		title: nls.localize('navigate.next.label', "Next Change"),
-		iconDark: 'next-diff-inverse.svg',
-		iconLight: 'next-diff.svg'
+		iconDark: 'next-diff-dark.svg',
+		iconLight: 'next-diff-light.svg'
 	},
 	TextCompareEditorActiveContext,
 	11
@@ -588,8 +588,8 @@ appendEditorToolItem(
 	{
 		id: editorCommands.TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
 		title: nls.localize('ignoreTrimWhitespace.label', "Ignore Trim Whitespace"),
-		iconDark: 'paragraph-inverse.svg',
-		iconLight: 'paragraph.svg'
+		iconDark: 'paragraph-dark.svg',
+		iconLight: 'paragraph-light.svg'
 	},
 	ContextKeyExpr.and(TextCompareEditorActiveContext, ContextKeyExpr.notEquals('config.diffEditor.ignoreTrimWhitespace', true)),
 	20
@@ -600,8 +600,8 @@ appendEditorToolItem(
 	{
 		id: editorCommands.TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
 		title: nls.localize('showTrimWhitespace.label', "Show Trim Whitespace"),
-		iconDark: 'paragraph-disabled-inverse.svg',
-		iconLight: 'paragraph-disabled.svg'
+		iconDark: 'paragraph-disabled-dark.svg',
+		iconLight: 'paragraph-disabled-light.svg'
 	},
 	ContextKeyExpr.and(TextCompareEditorActiveContext, ContextKeyExpr.notEquals('config.diffEditor.ignoreTrimWhitespace', false)),
 	20
diff --git a/src/vs/workbench/browser/parts/editor/media/next-diff-dark.svg b/src/vs/workbench/browser/parts/editor/media/next-diff-dark.svg
new file mode 100644
index 00000000000..368d538fe4d
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/next-diff-dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 9.5L13.293 8.79297L9.00101 13.022L9 1L8 1L7.99899 13.022L3.707 8.79297L3 9.5L8.50101 15L14 9.5Z" fill="#C5C5C5"/>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/next-diff-inverse.svg b/src/vs/workbench/browser/parts/editor/media/next-diff-inverse.svg
deleted file mode 100644
index 16a6dc90633..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/next-diff-inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-1 -3 16 16" enable-background="new -1 -3 16 16"><path fill="#C5C5C5" d="M1 4h7l-3-3h3l4 4-4 4h-3l3-3h-7v-2z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/next-diff-light.svg b/src/vs/workbench/browser/parts/editor/media/next-diff-light.svg
new file mode 100644
index 00000000000..162ee4d2863
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/next-diff-light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 9.5L13.293 8.79297L9.00101 13.022L9 1L8 1L7.99899 13.022L3.707 8.79297L3 9.5L8.50101 15L14 9.5Z" fill="#424242"/>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/next-diff.svg b/src/vs/workbench/browser/parts/editor/media/next-diff.svg
deleted file mode 100644
index 8befbea7ba6..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/next-diff.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-1 -3 16 16" enable-background="new -1 -3 16 16"><path fill="#656565" d="M1 4h7l-3-3h3l4 4-4 4h-3l3-3h-7v-2z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph-dark.svg b/src/vs/workbench/browser/parts/editor/media/paragraph-dark.svg
new file mode 100644
index 00000000000..24708ab31f9
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/paragraph-dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 1H8H9H10H11H12V2H11V13H12V14H11H10H9H8H7V13H8V8H6.5C4.567 8 3 6.433 3 4.5C3 2.567 4.567 1 6.5 1ZM9 13H10V2H9V7V8V13ZM6.5 2H8V7H6.5C5.11929 7 4 5.88071 4 4.5C4 3.11929 5.11929 2 6.5 2Z" fill="#C5C5C5"/>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-dark.svg b/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-dark.svg
new file mode 100644
index 00000000000..3c174668fdc
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-dark.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.5">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 1H8H9H10H11H12V2H11V13H12V14H11H10H9H8H7V13H8V8H6.5C4.567 8 3 6.433 3 4.5C3 2.567 4.567 1 6.5 1ZM9 13H10V2H9V7V8V13ZM6.5 2H8V7H6.5C5.11929 7 4 5.88071 4 4.5C4 3.11929 5.11929 2 6.5 2Z" fill="#C5C5C5"/>
+</g>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-inverse.svg b/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-inverse.svg
deleted file mode 100755
index 174a184bd5b..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;opacity:0.5;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;opacity:0.5;}</style></defs><title>Paragraph_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,1V4H12V16H6V9.973A4.5,4.5,0,0,1,6.5,1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12,2V3H11V15H10V3H8V15H7V8.95A3.588,3.588,0,0,1,6.5,9a3.5,3.5,0,0,1,0-7Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-light.svg b/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-light.svg
new file mode 100644
index 00000000000..5edb9e63eb7
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/paragraph-disabled-light.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.5">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 1H8H9H10H11H12V2H11V13H12V14H11H10H9H8H7V13H8V8H6.5C4.567 8 3 6.433 3 4.5C3 2.567 4.567 1 6.5 1ZM9 13H10V2H9V7V8V13ZM6.5 2H8V7H6.5C5.11929 7 4 5.88071 4 4.5C4 3.11929 5.11929 2 6.5 2Z" fill="#424242"/>
+</g>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph-disabled.svg b/src/vs/workbench/browser/parts/editor/media/paragraph-disabled.svg
deleted file mode 100755
index 969dac32daa..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/paragraph-disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;opacity:0.5;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;opacity:0.5;}</style></defs><title>Paragraph_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,1V4H12V16H6V9.973A4.5,4.5,0,0,1,6.5,1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12,2V3H11V15H10V3H8V15H7V8.95A3.588,3.588,0,0,1,6.5,9a3.5,3.5,0,0,1,0-7Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph-inverse.svg b/src/vs/workbench/browser/parts/editor/media/paragraph-inverse.svg
deleted file mode 100755
index 2cd7be5db69..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/paragraph-inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>Paragraph_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,1V4H12V16H6V9.973A4.5,4.5,0,0,1,6.5,1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12,2V3H11V15H10V3H8V15H7V8.95A3.588,3.588,0,0,1,6.5,9a3.5,3.5,0,0,1,0-7Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph-light.svg b/src/vs/workbench/browser/parts/editor/media/paragraph-light.svg
new file mode 100644
index 00000000000..734fe619208
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/paragraph-light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 1H8H9H10H11H12V2H11V13H12V14H11H10H9H8H7V13H8V8H6.5C4.567 8 3 6.433 3 4.5C3 2.567 4.567 1 6.5 1ZM9 13H10V2H9V7V8V13ZM6.5 2H8V7H6.5C5.11929 7 4 5.88071 4 4.5C4 3.11929 5.11929 2 6.5 2Z" fill="#424242"/>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/paragraph.svg b/src/vs/workbench/browser/parts/editor/media/paragraph.svg
deleted file mode 100755
index 60eb7c92c90..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/paragraph.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>Paragraph_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,1V4H12V16H6V9.973A4.5,4.5,0,0,1,6.5,1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12,2V3H11V15H10V3H8V15H7V8.95A3.588,3.588,0,0,1,6.5,9a3.5,3.5,0,0,1,0-7Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/previous-diff-dark.svg b/src/vs/workbench/browser/parts/editor/media/previous-diff-dark.svg
new file mode 100644
index 00000000000..e6aa2fb27ea
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/previous-diff-dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 6.5L13.293 7.20703L9.00101 2.97803L9 15L8 15L7.99899 2.97803L3.707 7.20703L3 6.5L8.50101 1L14 6.5Z" fill="#C5C5C5"/>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/previous-diff-inverse.svg b/src/vs/workbench/browser/parts/editor/media/previous-diff-inverse.svg
deleted file mode 100644
index db3d321841e..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/previous-diff-inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-1 -3 16 16" enable-background="new -1 -3 16 16"><polygon fill="#C5C5C5" points="13,4 6,4 9,1 6,1 2,5 6,9 9,9 6,6 13,6"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/previous-diff-light.svg b/src/vs/workbench/browser/parts/editor/media/previous-diff-light.svg
new file mode 100644
index 00000000000..3ccc6d2183f
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/previous-diff-light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 6.5L13.293 7.20703L9.00101 2.97803L9 15L8 15L7.99899 2.97803L3.707 7.20703L3 6.5L8.50101 1L14 6.5Z" fill="#424242"/>
+</svg>
diff --git a/src/vs/workbench/browser/parts/editor/media/previous-diff.svg b/src/vs/workbench/browser/parts/editor/media/previous-diff.svg
deleted file mode 100644
index 508d57b2f1e..00000000000
--- a/src/vs/workbench/browser/parts/editor/media/previous-diff.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-1 -3 16 16" enable-background="new -1 -3 16 16"><polygon fill="#656565" points="13,4 6,4 9,1 6,1 2,5 6,9 9,9 6,6 13,6"/></svg>
\ No newline at end of file