diff --git a/data/icons/emblem-git-modified-symbolic.svg b/data/icons/emblem-git-modified-symbolic.svg
new file mode 100644
index 000000000..2bf8ed4ae
--- /dev/null
+++ b/data/icons/emblem-git-modified-symbolic.svg
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 97 97"
+   xml:space="preserve"><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs9"><linearGradient
+     id="linearGradient7916"><stop
+       offset="0"
+       style="stop-color:#ffffff;stop-opacity:1"
+       id="stop7918" /><stop
+       offset="1"
+       style="stop-color:#ffffff;stop-opacity:0"
+       id="stop7920" /></linearGradient><linearGradient
+     xlink:href="#linearGradient7916"
+     id="linearGradient3275"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.38677519,-0.37090819,0.38677519,0.37090819,13.389911,7.8135059)"
+     x1="28.449389"
+     y1="20.584223"
+     x2="16.331276"
+     y2="32.702335" /><linearGradient
+     xlink:href="#linearGradient7916"
+     id="linearGradient3278"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.38677519,-0.37090819,0.38677519,0.37090819,13.779805,7.6263552)"
+     x1="36.010902"
+     y1="13.022708"
+     x2="16.331276"
+     y2="32.702335" /><linearGradient
+     id="linearGradient4011"><stop
+       offset="0"
+       style="stop-color:#ffffff;stop-opacity:1"
+       id="stop4013" /><stop
+       offset="0.507761"
+       style="stop-color:#ffffff;stop-opacity:0.23529412"
+       id="stop4015" /><stop
+       offset="0.83456558"
+       style="stop-color:#ffffff;stop-opacity:0.15686275"
+       id="stop4017" /><stop
+       offset="1"
+       style="stop-color:#ffffff;stop-opacity:0.39215687"
+       id="stop4019" /></linearGradient><linearGradient
+     xlink:href="#linearGradient4011"
+     id="linearGradient4198"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(-100.74024,-18.616038)"
+     x1="71.204407"
+     y1="6.2375584"
+     x2="71.204407"
+     y2="44.340794" /><linearGradient
+     xlink:href="#linearGradient3242-3"
+     id="linearGradient3281-8"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.72766006,0,0,0.69855753,35.063736,7.0022665)"
+     x1="-2.9734659"
+     y1="-23.989908"
+     x2="-2.9734659"
+     y2="36.678432" /><linearGradient
+     id="linearGradient3242-3"><stop
+       offset="0"
+       style="stop-color:#f8b17e;stop-opacity:1"
+       id="stop3244-0" /><stop
+       offset="0.31209752"
+       style="stop-color:#e35d4f;stop-opacity:1"
+       id="stop3246-4" /><stop
+       offset="0.57054454"
+       style="stop-color:#c6262e;stop-opacity:1"
+       id="stop3248-2" /><stop
+       offset="1"
+       style="stop-color:#690b54;stop-opacity:1"
+       id="stop3250-5" /></linearGradient><linearGradient
+     gradientTransform="matrix(0.3685738,0,0,0.3685738,-0.84577,-0.84576985)"
+     gradientUnits="userSpaceOnUse"
+     xlink:href="#linearGradient2490"
+     id="linearGradient3031"
+     y2="3.0816143"
+     x2="18.379412"
+     y1="44.980297"
+     x1="18.379412" /><radialGradient
+     gradientTransform="matrix(0,0.8796593,-1.1611346,0,12.632931,-21.08413)"
+     gradientUnits="userSpaceOnUse"
+     xlink:href="#linearGradient3242"
+     id="radialGradient3029"
+     fy="3.9900031"
+     fx="23.895569"
+     r="20.397499"
+     cy="3.9900031"
+     cx="23.895569" /><linearGradient
+     id="linearGradient2490"><stop
+       offset="0"
+       style="stop-color:#791235;stop-opacity:1"
+       id="stop2492" /><stop
+       offset="1"
+       style="stop-color:#dd3b27;stop-opacity:1"
+       id="stop2494" /></linearGradient><linearGradient
+     id="linearGradient3242"><stop
+       offset="0"
+       style="stop-color:#f8b17e;stop-opacity:1"
+       id="stop3244" /><stop
+       offset="0.26238"
+       style="stop-color:#e35d4f;stop-opacity:1"
+       id="stop3246" /><stop
+       offset="0.66093999"
+       style="stop-color:#c6262e;stop-opacity:1"
+       id="stop3248" /><stop
+       offset="1"
+       style="stop-color:#690b54;stop-opacity:1"
+       id="stop3250" /></linearGradient><linearGradient
+     gradientTransform="matrix(0.35135136,0,0,0.35135136,-17.203671,-0.90930025)"
+     gradientUnits="userSpaceOnUse"
+     xlink:href="#linearGradient4011"
+     id="linearGradient3280"
+     y2="44.340794"
+     x2="71.204407"
+     y1="6.2375584"
+     x1="71.204407" /><linearGradient
+     xlink:href="#linearGradient4011"
+     id="linearGradient3058"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.35135136,0,0,0.35135136,-53.140513,6.3780256)"
+     x1="71.204407"
+     y1="6.2375584"
+     x2="71.204407"
+     y2="44.340794" /><radialGradient
+     xlink:href="#linearGradient3242"
+     id="radialGradient3061"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0,0.93853188,-1.2388454,0,12.942997,-23.030631)"
+     cx="23.895569"
+     cy="3.9900031"
+     fx="23.895569"
+     fy="3.9900031"
+     r="20.397499" /><linearGradient
+     id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"><stop
+       id="stop3750-1-0-7-6-6-1-3-9-3"
+       style="stop-color:#919caf;stop-opacity:1"
+       offset="0" /><stop
+       id="stop3752-3-7-4-0-32-8-923-0-7"
+       style="stop-color:#68758e;stop-opacity:1"
+       offset="0.26238" /><stop
+       id="stop3754-1-8-5-2-7-6-7-1-9"
+       style="stop-color:#485a6c;stop-opacity:1"
+       offset="0.704952" /><stop
+       id="stop3756-1-6-2-6-6-1-96-6-0"
+       style="stop-color:#444c5c;stop-opacity:1"
+       offset="1" /></linearGradient><radialGradient
+     r="12.671875"
+     fy="9.9571075"
+     fx="6.2001843"
+     cy="9.9571075"
+     cx="6.7304144"
+     gradientTransform="matrix(0,9.4975523,-11.65996,0,155.96351,-94.992997)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3119"
+     xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5" /><filter
+     id="filter7554-7"
+     color-interpolation-filters="sRGB"><feBlend
+       mode="darken"
+       in2="BackgroundImage"
+       id="feBlend7556-6" /></filter><filter
+     id="filter7554"
+     color-interpolation-filters="sRGB"><feBlend
+       mode="darken"
+       in2="BackgroundImage"
+       id="feBlend7556" /></filter></defs>
+
+<path
+   class="warning"
+   id="rect902"
+   style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f9c440;fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;marker:none"
+   d="M 8 0 C 7.4887619 0 6.9776746 0.19615351 6.5859375 0.58789062 L 5.4414062 1.734375 L 6.8535156 3.1464844 A 1.5 1.5 0 0 1 7.5 3 A 1.5 1.5 0 0 1 9 4.5 A 1.5 1.5 0 0 1 8.8535156 5.1464844 L 10.853516 7.1464844 A 1.5 1.5 0 0 1 11.5 7 A 1.5 1.5 0 0 1 13 8.5 A 1.5 1.5 0 0 1 11.5 10 A 1.5 1.5 0 0 1 10 8.5 A 1.5 1.5 0 0 1 10.146484 7.8535156 L 8.1464844 5.8535156 A 1.5 1.5 0 0 1 8 5.9121094 L 8 10.085938 A 1.5 1.5 0 0 1 9 11.5 A 1.5 1.5 0 0 1 7.5 13 A 1.5 1.5 0 0 1 6 11.5 A 1.5 1.5 0 0 1 7 10.087891 L 7 5.9140625 A 1.5 1.5 0 0 1 6 4.5 A 1.5 1.5 0 0 1 6.1464844 3.8535156 L 4.734375 2.4414062 L 0.58789062 6.5859375 C -0.1955836 7.3694117 -0.1955836 8.6305883 0.58789062 9.4140625 L 6.5859375 15.412109 C 7.3694117 16.195584 8.6305883 16.195584 9.4140625 15.412109 L 15.412109 9.4140625 C 16.195584 8.6305883 16.195584 7.3694117 15.412109 6.5859375 L 9.4140625 0.58789062 C 9.0223254 0.19615351 8.5112381 0 8 0 z " /></svg>
diff --git a/data/icons/emblem-git-new-symbolic.svg b/data/icons/emblem-git-new-symbolic.svg
new file mode 100644
index 000000000..6347d13d1
--- /dev/null
+++ b/data/icons/emblem-git-new-symbolic.svg
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 97 97"
+   xml:space="preserve"><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs9"><linearGradient
+     id="linearGradient7916"><stop
+       offset="0"
+       style="stop-color:#ffffff;stop-opacity:1"
+       id="stop7918" /><stop
+       offset="1"
+       style="stop-color:#ffffff;stop-opacity:0"
+       id="stop7920" /></linearGradient><linearGradient
+     xlink:href="#linearGradient7916"
+     id="linearGradient3275"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.38677519,-0.37090819,0.38677519,0.37090819,13.389911,7.8135059)"
+     x1="28.449389"
+     y1="20.584223"
+     x2="16.331276"
+     y2="32.702335" /><linearGradient
+     xlink:href="#linearGradient7916"
+     id="linearGradient3278"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.38677519,-0.37090819,0.38677519,0.37090819,13.779805,7.6263552)"
+     x1="36.010902"
+     y1="13.022708"
+     x2="16.331276"
+     y2="32.702335" /><linearGradient
+     id="linearGradient4011"><stop
+       offset="0"
+       style="stop-color:#ffffff;stop-opacity:1"
+       id="stop4013" /><stop
+       offset="0.507761"
+       style="stop-color:#ffffff;stop-opacity:0.23529412"
+       id="stop4015" /><stop
+       offset="0.83456558"
+       style="stop-color:#ffffff;stop-opacity:0.15686275"
+       id="stop4017" /><stop
+       offset="1"
+       style="stop-color:#ffffff;stop-opacity:0.39215687"
+       id="stop4019" /></linearGradient><linearGradient
+     xlink:href="#linearGradient4011"
+     id="linearGradient4198"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(-100.74024,-18.616038)"
+     x1="71.204407"
+     y1="6.2375584"
+     x2="71.204407"
+     y2="44.340794" /><linearGradient
+     xlink:href="#linearGradient3242-3"
+     id="linearGradient3281-8"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.72766006,0,0,0.69855753,35.063736,7.0022665)"
+     x1="-2.9734659"
+     y1="-23.989908"
+     x2="-2.9734659"
+     y2="36.678432" /><linearGradient
+     id="linearGradient3242-3"><stop
+       offset="0"
+       style="stop-color:#f8b17e;stop-opacity:1"
+       id="stop3244-0" /><stop
+       offset="0.31209752"
+       style="stop-color:#e35d4f;stop-opacity:1"
+       id="stop3246-4" /><stop
+       offset="0.57054454"
+       style="stop-color:#c6262e;stop-opacity:1"
+       id="stop3248-2" /><stop
+       offset="1"
+       style="stop-color:#690b54;stop-opacity:1"
+       id="stop3250-5" /></linearGradient><linearGradient
+     gradientTransform="matrix(0.3685738,0,0,0.3685738,-0.84577,-0.84576985)"
+     gradientUnits="userSpaceOnUse"
+     xlink:href="#linearGradient2490"
+     id="linearGradient3031"
+     y2="3.0816143"
+     x2="18.379412"
+     y1="44.980297"
+     x1="18.379412" /><radialGradient
+     gradientTransform="matrix(0,0.8796593,-1.1611346,0,12.632931,-21.08413)"
+     gradientUnits="userSpaceOnUse"
+     xlink:href="#linearGradient3242"
+     id="radialGradient3029"
+     fy="3.9900031"
+     fx="23.895569"
+     r="20.397499"
+     cy="3.9900031"
+     cx="23.895569" /><linearGradient
+     id="linearGradient2490"><stop
+       offset="0"
+       style="stop-color:#791235;stop-opacity:1"
+       id="stop2492" /><stop
+       offset="1"
+       style="stop-color:#dd3b27;stop-opacity:1"
+       id="stop2494" /></linearGradient><linearGradient
+     id="linearGradient3242"><stop
+       offset="0"
+       style="stop-color:#f8b17e;stop-opacity:1"
+       id="stop3244" /><stop
+       offset="0.26238"
+       style="stop-color:#e35d4f;stop-opacity:1"
+       id="stop3246" /><stop
+       offset="0.66093999"
+       style="stop-color:#c6262e;stop-opacity:1"
+       id="stop3248" /><stop
+       offset="1"
+       style="stop-color:#690b54;stop-opacity:1"
+       id="stop3250" /></linearGradient><linearGradient
+     gradientTransform="matrix(0.35135136,0,0,0.35135136,-17.203671,-0.90930025)"
+     gradientUnits="userSpaceOnUse"
+     xlink:href="#linearGradient4011"
+     id="linearGradient3280"
+     y2="44.340794"
+     x2="71.204407"
+     y1="6.2375584"
+     x1="71.204407" /><linearGradient
+     xlink:href="#linearGradient4011"
+     id="linearGradient3058"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.35135136,0,0,0.35135136,-53.140513,6.3780256)"
+     x1="71.204407"
+     y1="6.2375584"
+     x2="71.204407"
+     y2="44.340794" /><radialGradient
+     xlink:href="#linearGradient3242"
+     id="radialGradient3061"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0,0.93853188,-1.2388454,0,12.942997,-23.030631)"
+     cx="23.895569"
+     cy="3.9900031"
+     fx="23.895569"
+     fy="3.9900031"
+     r="20.397499" /><linearGradient
+     id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"><stop
+       id="stop3750-1-0-7-6-6-1-3-9-3"
+       style="stop-color:#919caf;stop-opacity:1"
+       offset="0" /><stop
+       id="stop3752-3-7-4-0-32-8-923-0-7"
+       style="stop-color:#68758e;stop-opacity:1"
+       offset="0.26238" /><stop
+       id="stop3754-1-8-5-2-7-6-7-1-9"
+       style="stop-color:#485a6c;stop-opacity:1"
+       offset="0.704952" /><stop
+       id="stop3756-1-6-2-6-6-1-96-6-0"
+       style="stop-color:#444c5c;stop-opacity:1"
+       offset="1" /></linearGradient><radialGradient
+     r="12.671875"
+     fy="9.9571075"
+     fx="6.2001843"
+     cy="9.9571075"
+     cx="6.7304144"
+     gradientTransform="matrix(0,9.4975523,-11.65996,0,155.96351,-94.992997)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3119"
+     xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5" /><filter
+     id="filter7554-7"
+     color-interpolation-filters="sRGB"><feBlend
+       mode="darken"
+       in2="BackgroundImage"
+       id="feBlend7556-6" /></filter><filter
+     id="filter7554"
+     color-interpolation-filters="sRGB"><feBlend
+       mode="darken"
+       in2="BackgroundImage"
+       id="feBlend7556" /></filter></defs>
+
+<path
+   class="success"
+   id="rect902"
+   style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#68b723;fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;marker:none"
+   d="M 8 0 C 7.4887619 0 6.9776746 0.19615351 6.5859375 0.58789062 L 5.4414062 1.734375 L 6.8535156 3.1464844 A 1.5 1.5 0 0 1 7.5 3 A 1.5 1.5 0 0 1 9 4.5 A 1.5 1.5 0 0 1 8.8535156 5.1464844 L 10.853516 7.1464844 A 1.5 1.5 0 0 1 11.5 7 A 1.5 1.5 0 0 1 13 8.5 A 1.5 1.5 0 0 1 11.5 10 A 1.5 1.5 0 0 1 10 8.5 A 1.5 1.5 0 0 1 10.146484 7.8535156 L 8.1464844 5.8535156 A 1.5 1.5 0 0 1 8 5.9121094 L 8 10.085938 A 1.5 1.5 0 0 1 9 11.5 A 1.5 1.5 0 0 1 7.5 13 A 1.5 1.5 0 0 1 6 11.5 A 1.5 1.5 0 0 1 7 10.087891 L 7 5.9140625 A 1.5 1.5 0 0 1 6 4.5 A 1.5 1.5 0 0 1 6.1464844 3.8535156 L 4.734375 2.4414062 L 0.58789062 6.5859375 C -0.1955836 7.3694117 -0.1955836 8.6305883 0.58789062 9.4140625 L 6.5859375 15.412109 C 7.3694117 16.195584 8.6305883 16.195584 9.4140625 15.412109 L 15.412109 9.4140625 C 16.195584 8.6305883 16.195584 7.3694117 15.412109 6.5859375 L 9.4140625 0.58789062 C 9.0223254 0.19615351 8.5112381 0 8 0 z " /></svg>
diff --git a/data/io.elementary.code.gresource.xml b/data/io.elementary.code.gresource.xml
index 0167807d9..36858a0c4 100644
--- a/data/io.elementary.code.gresource.xml
+++ b/data/io.elementary.code.gresource.xml
@@ -31,5 +31,7 @@
   </gresource>
   <gresource prefix="/io/elementary/code/icons">
     <file alias="scalable/actions/filter-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/filter-symbolic.svg</file>
+    <file alias="scalable/emblems/emblem-git-modified-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/emblem-git-modified-symbolic.svg</file>
+    <file alias="scalable/emblems/emblem-git-new-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/emblem-git-new-symbolic.svg</file>
   </gresource>
 </gresources>
diff --git a/src/FolderManager/ProjectFolderItem.vala b/src/FolderManager/ProjectFolderItem.vala
index 24945d67c..9998db6be 100644
--- a/src/FolderManager/ProjectFolderItem.vala
+++ b/src/FolderManager/ProjectFolderItem.vala
@@ -51,8 +51,8 @@ namespace Scratch.FolderManager {
         }
 
         static construct {
-            added_icon = new ThemedIcon ("user-available");
-            modified_icon = new ThemedIcon ("user-away");
+            added_icon = new ThemedIcon ("emblem-git-new-symbolic");
+            modified_icon = new ThemedIcon ("emblem-git-modified-symbolic");
         }
 
         private void branch_or_name_changed () {