diff --git a/icons/mail-archive-symbolic.svg b/icons/mail-archive-symbolic.svg
index bcdacb0f..1a0be0dc 100644
--- a/icons/mail-archive-symbolic.svg
+++ b/icons/mail-archive-symbolic.svg
@@ -1,57 +1,63 @@
 <?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16px"
+   viewBox="0 0 16 16"
+   width="16px"
    version="1.1"
-   width="16"
-   height="16"
-   id="svg7384"
+   id="svg8"
    sodipodi:docname="mail-archive-symbolic.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1191"
-     inkscape:window-height="650"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="3.5254237"
-     inkscape:cy="7.4576271"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg7384" />
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
-     id="defs9" />
-  <metadata
-     id="metadata90">
-    <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>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     inkscape:connector-curvature="0"
-     style="display:inline;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;enable-background:new"
-     d="M 4,1 C 3,1 3,2 3,2 H 13 C 13,2 13,1 12,1 Z M 3,3 C 2.02773,3 2,4 2,4 H 14 C 14,4 14,3 13,3 Z M 2,5 A 1.0001,1.0001 0 0 0 1,6 v 9 a 1.0001,1.0001 0 0 0 1,1 h 12 a 1.0001,1.0001 0 0 0 1,-1 V 6 A 1.0001,1.0001 0 0 0 14,5 Z m 2.60156,2 h 6.79883 L 8,9.71875 Z M 3,8.277344 l 5,4.001953 5,-4 V 14 H 3 Z"
-     id="path8812-7" />
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="5.9296875"
+     inkscape:cx="20.068511"
+     inkscape:cy="20.827404"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g6" />
+  <g
+     fill="#2e3436"
+     id="g6">
+    <path
+       d="M 1.800781,4.965531 C 1.542969,5.016312 1.316406,5.172562 1.167969,5.391312 0.863281,5.85225 0.984375,6.473344 1.445312,6.778031 l 5.167969,3.445313 c 0.835938,0.558594 1.9375,0.558594 2.773438,0 L 14.554688,6.778031 C 15.015625,6.473344 15.136719,5.85225 14.832031,5.391312 14.527344,4.930375 13.90625,4.809281 13.445312,5.113969 L 8.277344,8.559281 c -0.171875,0.113281 -0.382813,0.113281 -0.554688,0 L 2.554688,5.113969 C 2.332031,4.965531 2.0625,4.91475 1.800781,4.965531 Z m 0,0"
+       id="path2"
+       style="stroke-width:1" />
+    <path
+       d="m 3,3.946 c -1.644531,0 -3,1.355469 -3,3 v 6 c 0,1.644531 1.355469,3 3,3 h 10 c 1.644531,0 3,-1.355469 3,-3 v -6 c 0,-1.644531 -1.355469,-3 -3,-3 z m 0,2 h 10 c 0.570312,0 1,0.429688 1,1 v 6 c 0,0.570312 -0.429688,1 -1,1 H 3 c -0.570312,0 -1,-0.429688 -1,-1 v -6 c 0,-0.570312 0.429688,-1 1,-1 z m 0,0"
+       id="path4"
+       style="stroke-width:1" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke-width:0.925071"
+       id="rect591"
+       width="10.646218"
+       height="1.1976285"
+       x="2.6768909"
+       y="1.895"
+       ry="0.59881425" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke-width:0.810551"
+       id="rect591-3"
+       width="8.17346"
+       height="1.1976285"
+       x="3.91327"
+       y="0"
+       ry="0.59881425" />
+  </g>
 </svg>
diff --git a/icons/mail-forward-symbolic-rtl.svg b/icons/mail-forward-symbolic-rtl.svg
deleted file mode 100644
index 2eefb004..00000000
--- a/icons/mail-forward-symbolic-rtl.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   height="16"
-   width="16">
-  <metadata
-     id="metadata14">
-    <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="defs12" />
-  <g
-     id="g6"
-     fill="#2e3436"
-     font-weight="400">
-    <path
-       id="path2"
-       overflow="visible"
-       white-space="normal"
-       font-family="sans-serif"
-       color="#000"
-       style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M4 6v2h4.994s.791.014 1.553.395c.761.38 1.447.938 1.447 2.605v2h2v-2c0-2.333-1.314-3.775-2.553-4.395C10.203 5.986 8.994 6 8.994 6z" />
-    <path
-       id="path4"
-       overflow="visible"
-       font-family="Bitstream Vera Sans"
-       color="#bebebe"
-       style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M7 3.022v1c0 .257-.13.529-.313.719l-2.28 2.281 2.28 2.281c.183.19.313.462.313.72v1H6c-.31 0-.552-.091-.75-.282L1.594 7.022 5.25 3.303c.198-.19.44-.28.75-.28z" />
-  </g>
-</svg>
diff --git a/icons/mail-forward-symbolic.svg b/icons/mail-forward-symbolic.svg
deleted file mode 100644
index e16cefed..00000000
--- a/icons/mail-forward-symbolic.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   height="16"
-   width="16">
-  <metadata
-     id="metadata14">
-    <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="defs12" />
-  <g
-     id="g6"
-     fill="#2e3436"
-     font-weight="400">
-    <path
-       id="path2"
-       overflow="visible"
-       white-space="normal"
-       font-family="sans-serif"
-       color="#000"
-       style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M7.006 6s-1.209-.014-2.447.605C3.32 7.225 2.006 8.667 2.006 11v2h2v-2c0-1.667.686-2.225 1.447-2.605A4.045 4.045 0 0 1 7.006 8H12V6z" />
-    <path
-       id="path4"
-       overflow="visible"
-       font-family="Bitstream Vera Sans"
-       color="#bebebe"
-       style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M9 3.022v1c0 .257.13.529.313.719l2.28 2.281-2.28 2.281c-.183.19-.313.462-.313.72v1h1c.31 0 .552-.091.75-.282l3.656-3.719-3.656-3.719c-.198-.19-.44-.28-.75-.28z" />
-  </g>
-</svg>
diff --git a/icons/mail-reply-all-symbolic-rtl.svg b/icons/mail-reply-all-symbolic-rtl.svg
deleted file mode 100644
index 0ef6d89d..00000000
--- a/icons/mail-reply-all-symbolic-rtl.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg10"
-   version="1.1"
-   height="16"
-   width="16"
-   sodipodi:docname="mail-reply-all-symbolic-rtl.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="863"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="22.627417"
-     inkscape:cx="6.3171439"
-     inkscape:cy="3.1999712"
-     inkscape:window-x="0"
-     inkscape:window-y="400"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg10">
-    <inkscape:grid
-       type="xygrid"
-       id="grid819" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata16">
-    <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="defs14" />
-  <g
-     style="font-weight:400;fill:#bebebe;fill-opacity:1"
-     id="g8"
-     font-weight="400"
-     transform="matrix(-1,0,0,1,15.994,0)">
-    <path
-       id="path2"
-       overflow="visible"
-       style="color:#000000;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#bebebe;fill-opacity:1;marker:none"
-       d="m 7,6 v 2 h 2.994 c 0,0 0.791,0.014 1.553,0.395 0.761,0.38 1.447,0.938 1.447,2.605 v 2 h 2 V 11 C 14.994,8.667 13.68,7.225 12.441,6.605 11.203,5.986 9.994,6 9.994,6 Z"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path4"
-       overflow="visible"
-       style="color:#bebebe;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-transform:none;overflow:visible;fill:#bebebe;fill-opacity:1;marker:none"
-       d="m 6,3.022 v 1 C 6,4.279 5.87,4.551 5.687,4.741 l -2.28,2.281 2.28,2.281 C 5.87,9.493 6,9.765 6,10.023 v 1 H 5 c -0.31,0 -0.552,-0.091 -0.75,-0.282 L 0.594,7.022 4.25,3.303 C 4.448,3.113 4.69,3.023 5,3.023 Z"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path6"
-       overflow="visible"
-       style="color:#bebebe;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-transform:none;overflow:visible;fill:#bebebe;fill-opacity:1;marker:none"
-       d="m 10,3.022 v 1 C 10,4.279 9.87,4.551 9.687,4.741 l -2.28,2.281 2.28,2.281 C 9.87,9.493 10,9.765 10,10.023 v 1 H 9 c -0.31,0 -0.552,-0.091 -0.75,-0.282 L 4.594,7.022 8.25,3.303 C 8.448,3.113 8.69,3.023 9,3.023 Z"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/icons/mail-reply-all-symbolic.svg b/icons/mail-reply-all-symbolic.svg
deleted file mode 100644
index 77100c95..00000000
--- a/icons/mail-reply-all-symbolic.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg10"
-   version="1.1"
-   height="16"
-   width="16"
-   sodipodi:docname="mail-reply-all-symbolic.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="863"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="22.627417"
-     inkscape:cx="6.3171439"
-     inkscape:cy="3.1999712"
-     inkscape:window-x="0"
-     inkscape:window-y="400"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg10" />
-  <metadata
-     id="metadata16">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs14" />
-  <g
-     style="fill:#bebebe;fill-opacity:1"
-     id="g8"
-     font-weight="400"
-     fill="#2e3436">
-    <path
-       id="path2"
-       overflow="visible"
-       style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M7 6v2h2.994s.791.014 1.553.395c.761.38 1.447.938 1.447 2.605v2h2v-2c0-2.333-1.314-3.775-2.553-4.395C11.203 5.986 9.994 6 9.994 6z"
-       white-space="normal"
-       font-family="sans-serif"
-       color="#000" />
-    <path
-       id="path4"
-       overflow="visible"
-       style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M6 3.022v1c0 .257-.13.529-.313.719l-2.28 2.281 2.28 2.281c.183.19.313.462.313.72v1H5c-.31 0-.552-.091-.75-.282L.594 7.022 4.25 3.303c.198-.19.44-.28.75-.28z"
-       font-family="Bitstream Vera Sans"
-       color="#bebebe" />
-    <path
-       id="path6"
-       overflow="visible"
-       style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M10 3.022v1c0 .257-.13.529-.313.719l-2.28 2.281 2.28 2.281c.183.19.313.462.313.72v1H9c-.31 0-.552-.091-.75-.282L4.594 7.022 8.25 3.303c.198-.19.44-.28.75-.28z"
-       font-family="Bitstream Vera Sans"
-       color="#bebebe" />
-  </g>
-</svg>
diff --git a/icons/mail-reply-sender-symbolic-rtl.svg b/icons/mail-reply-sender-symbolic-rtl.svg
deleted file mode 100644
index e9285728..00000000
--- a/icons/mail-reply-sender-symbolic-rtl.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   height="16"
-   width="16">
-  <metadata
-     id="metadata14">
-    <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="defs12" />
-  <g
-     style="font-weight:400;fill:#2e3436"
-     transform="matrix(-1,0,0,1,15.994,0)"
-     id="g6"
-     font-weight="400">
-    <path
-       id="path2"
-       overflow="visible"
-       style="color:#000000;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#bebebe;fill-opacity:1;marker:none"
-       d="m 4,6 v 2 h 4.994 c 0,0 0.791,0.014 1.553,0.395 0.761,0.38 1.447,0.938 1.447,2.605 v 2 h 2 V 11 C 13.994,8.667 12.68,7.225 11.441,6.605 10.203,5.986 8.994,6 8.994,6 Z" />
-    <path
-       id="path4"
-       overflow="visible"
-       style="color:#bebebe;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-transform:none;overflow:visible;fill:#bebebe;fill-opacity:1;marker:none"
-       d="m 7,3.022 v 1 C 7,4.279 6.87,4.551 6.687,4.741 l -2.28,2.281 2.28,2.281 C 6.87,9.493 7,9.765 7,10.023 v 1 H 6 c -0.31,0 -0.552,-0.091 -0.75,-0.282 L 1.594,7.022 5.25,3.303 C 5.448,3.113 5.69,3.023 6,3.023 Z" />
-  </g>
-</svg>
diff --git a/icons/mail-reply-sender-symbolic.svg b/icons/mail-reply-sender-symbolic.svg
deleted file mode 100644
index 2eefb004..00000000
--- a/icons/mail-reply-sender-symbolic.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   height="16"
-   width="16">
-  <metadata
-     id="metadata14">
-    <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="defs12" />
-  <g
-     id="g6"
-     fill="#2e3436"
-     font-weight="400">
-    <path
-       id="path2"
-       overflow="visible"
-       white-space="normal"
-       font-family="sans-serif"
-       color="#000"
-       style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M4 6v2h4.994s.791.014 1.553.395c.761.38 1.447.938 1.447 2.605v2h2v-2c0-2.333-1.314-3.775-2.553-4.395C10.203 5.986 8.994 6 8.994 6z" />
-    <path
-       id="path4"
-       overflow="visible"
-       font-family="Bitstream Vera Sans"
-       color="#bebebe"
-       style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none;fill:#bebebe;fill-opacity:1"
-       d="M7 3.022v1c0 .257-.13.529-.313.719l-2.28 2.281 2.28 2.281c.183.19.313.462.313.72v1H6c-.31 0-.552-.091-.75-.282L1.594 7.022 5.25 3.303c.198-.19.44-.28.75-.28z" />
-  </g>
-</svg>
diff --git a/icons/marker-symbolic.svg b/icons/marker-symbolic.svg
deleted file mode 100644
index 25d29aea..00000000
--- a/icons/marker-symbolic.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="marker-symbolic.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-0.81355932"
-     inkscape:cy="7.4576271"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g886" />
-  <metadata
-     id="metadata14">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <g
-     transform="translate(-0.3644049,-10.680142)"
-     id="g886">
-    <path
-       id="path851"
-       d="m 7.8644079,13.937654 4.4999971,3.742591 4e-6,1 H 3.3644089 l -4e-6,-1 z m -4.500003,5.742488 9.0000001,1e-6 3e-6,6.999999 H 3.3644069 Z"
-       style="display:inline;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;enable-background:new"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
-    <path
-       style="display:inline;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-       d="m 5.3644049,10.680245 5.0000001,3 -10e-7,3 H 5.3644049 Z"
-       id="path853"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
diff --git a/icons/meson.build b/icons/meson.build
index ecb26be3..c6648f8e 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -16,17 +16,10 @@ icon_files = files(
   'format-unordered-list-symbolic-rtl.svg',
   'mail-drafts-symbolic.svg',
   'mail-drafts-symbolic-rtl.svg',
-  'mail-forward-symbolic.svg',
-  'mail-forward-symbolic-rtl.svg',
   'mail-inbox-symbolic.svg',
   'mail-outbox-symbolic.svg',
-  'mail-reply-all-symbolic.svg',
-  'mail-reply-all-symbolic-rtl.svg',
-  'mail-reply-sender-symbolic.svg',
-  'mail-reply-sender-symbolic-rtl.svg',
   'mail-sent-symbolic.svg',
   'mail-sent-symbolic-rtl.svg',
-  'marker-symbolic.svg',
   'tag-symbolic.svg',
   'tag-symbolic-rtl.svg',
 )
diff --git a/ui/components-conversation-actions.ui b/ui/components-conversation-actions.ui
index 5471d284..f823dfcf 100644
--- a/ui/components-conversation-actions.ui
+++ b/ui/components-conversation-actions.ui
@@ -90,7 +90,7 @@
             <child>
               <object class="GtkImage" id="mark_message_image">
                 <property name="visible">True</property>
-                <property name="icon_name">marker-symbolic</property>
+                <property name="icon_name">checkbox-checked-symbolic</property>
               </object>
             </child>
           </object>