diff --git a/calendar/base/themes/common/calendar-itip-icons.svg b/calendar/base/themes/common/calendar-itip-icons.svg
index 75b4655b3b..ba482e47b3 100644
--- a/calendar/base/themes/common/calendar-itip-icons.svg
+++ b/calendar/base/themes/common/calendar-itip-icons.svg
@@ -1,121 +1,122 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 112 48" width="112" height="48">
-
-    <!-- definitions -->
-    <style>
-        .req {
-            fill: #ffcc00;
-            stroke: #000000;
-            stroke-width: 0.5;
-        }
-        .opt {
-            fill: #cccccc;
-            stroke: #000000;
-            stroke-width: 0.5;
-        }
-        .non {
-            fill: #ffffff;
-            stroke: #000000;
-            stroke-width: 0.5;
-        }
-        .status {
-            fill:#ffffff;
-            stroke:#ffffff;
-            stroke-width:0.5;
-        }
-    </style>
-    <clipPath id="cut-off-bottom">
-        <rect x="0" y="0" width="16" height="16" />
-    </clipPath>
-    <symbol id="chairsymbol" clip-path="url(#cut-off-bottom)">
-        <ellipse cx="6" cy="16" rx="5.5" ry="8" fill="#000000" />
-        <circle cx="6" cy="6.25" r="4" fill="#ffffff"/>
-        <ellipse cx="10" cy="16" rx="5.5" ry="8" fill="#000000" />
-        <circle cx="10" cy="6.25" r="4" fill="#ffffff"/>
-        <ellipse cx="8" cy="16" rx="6.5" ry="9" fill="#ffcc00" />
-        <circle cx="8" cy="4.5" r="4" fill="#ffcc00"/>
-        <line x1="0.5" y1="15.75" x2="15.5" y2="15.75" />
-    </symbol>
-    <symbol id="individual" clip-path="url(#cut-off-bottom)">
-        <ellipse cx="8" cy="16" rx="7.5" ry="8.5" />
-        <circle cx="8" cy="5" r="4.5"/>
-        <line x1="0.5" y1="15.75" x2="15.5" y2="15.75" />
-    </symbol>
-    <symbol id="group" clip-path="url(#cut-off-bottom)">
-        <ellipse cx="5.75" cy="16" rx="5.5" ry="8" />
-        <circle cx="5.75" cy="6.5" r="4"/>
-        <ellipse cx="7.5" cy="16" rx="6.0" ry="8.5" />
-        <circle cx="7.5" cy="5.5" r="4"/>
-        <ellipse cx="9.25" cy="16" rx="6.25" ry="9" />
-        <circle cx="9.25" cy="4.5" r="4"/>
-        <line x1="0.25" y1="15.75" x2="15.55" y2="15.75" />
-    </symbol>
-    <symbol id="resource">
-        <rect x="5.25" y="0.5" rx="1" ry="1" width="10.25" height="12" />
-        <rect x="0.25" y="7" rx="1" ry="1" width="13" height="8" />
-        <circle cx="4.25" cy="11" r="2.5" style="fill:#ffffff" />
-        <line x1="8.25" y1="9" x2="12" y2="9" />
-        <line x1="8.25" y1="11" x2="12" y2="11" />
-        <line x1="8.25" y1="13" x2="12" y2="13" />
-        <rect x="1.25" y="15" width="4" height="1" style="fill:#000000; stroke-width:0" />
-        <rect x="8" y="15" width="4" height="1" style="fill:#000000; stroke-width:0" />
-    </symbol>
-    <symbol id="room">
-        <rect x="4" y="0.5" rx="0.25" ry="0.25" width="3" height="2" />
-        <rect x="8.5" y="0.5" rx="0.25" ry="0.25" width="3" height="2" />
-        <rect x="0.25" y="4.5" rx="0.25" ry="0.25" width="2" height="3" />
-        <rect x="0.25" y="8.5" rx="0.25" ry="0.25" width="2" height="3" />
-        <rect x="3.5" y="4" rx="1" ry="1" width="8.75" height="8" />
-        <rect x="13.5" y="4.5" rx="0.25" ry="0.25" width="2" height="3" />
-        <rect x="13.5" y="8.5" rx="0.25" ry="0.25" width="2" height="3" />
-        <rect x="4" y="13.5" rx="0.25" ry="0.25" width="3" height="2" />
-        <rect x="8.5" y="13.5" rx="0.25" ry="0.25" width="3" height="2" />
-    </symbol>
-    <symbol id="unknown">
-        <path d="m 7.8339844,11.558594 -2.4902344,0 q -0.00977,-0.53711 -0.00977,-0.654297 0,-1.2109376 0.4003906,-1.9921876 Q 6.1347656,8.1308594 7.3359375,7.1542969 8.5371094,6.1777344 8.7714844,5.875 9.1328125,5.3964844 9.1328125,4.8203125 q 0,-0.8007813 -0.6445312,-1.3671875 -0.6347657,-0.5761719 -1.7187501,-0.5761719 -1.0449218,0 -1.7480468,0.5957032 -0.703125,0.5957031 -0.9667969,1.8164062 l -2.5195313,-0.3125 Q 1.6425781,3.2285156 3.0195313,2.0078125 4.40625,0.78710937 6.6523437,0.78710937 q 2.3632813,0 3.7597653,1.24023443 1.396485,1.2304687 1.396485,2.8710937 0,0.9082031 -0.517578,1.71875 Q 10.783203,7.4277344 9.1035156,8.8242188 8.234375,9.546875 8.0195313,9.9863281 7.8144531,10.425781 7.8339844,11.558594 Z M 5.34375,15.25 l 0,-2.744141 2.7441406,0 0,2.744141 -2.7441406,0 z" />
-    </symbol>
-    <symbol id="status" style="stroke-width:0.25;">
-        <circle cx="11.5" cy="11.5" r="4.5" style="fill:#000000; stroke:#ffffff" />
-        <circle cx="11.5" cy="11.5" r="4.25" style="stroke:#000000" />
-    </symbol>
-
-    <!-- status icons -->
-    <g id="accepted" class="status">
-        <use style="fill:#00a000;" xlink:href="#status" x="0" y="0" />
-        <rect x="9" y="11" width="5" height="1" />
-        <rect x="11" y="9" width="1" height="5" />
-    </g>
-    <g id="tentative" class="status">
-        <use style="fill:#0000ff;" xlink:href="#status" x="16" y="0" />
-        <path d="m 27.933594,13 -0.996094,0 q -0.0039,-0.214844 -0.0039,-0.261719 0,-0.484375 0.160156,-0.796875 0.160156,-0.3125 0.640625,-0.703125 0.480469,-0.390625 0.574219,-0.511719 0.144531,-0.191406 0.144531,-0.421875 0,-0.3203125 -0.257813,-0.546875 -0.253906,-0.2304687 -0.6875,-0.2304687 -0.417968,0 -0.699218,0.2382812 -0.28125,0.2382813 -0.386719,0.7265625 l -1.007813,-0.125 q 0.04297,-0.6992187 0.59375,-1.1875 0.554688,-0.4882812 1.453125,-0.4882812 0.945313,0 1.503907,0.4960937 0.558593,0.4921875 0.558593,1.1484375 0,0.363281 -0.207031,0.6875 -0.203125,0.324219 -0.875,0.882813 -0.347656,0.289062 -0.433594,0.464843 -0.08203,0.175782 -0.07422,0.628907 z M 26.9375,14.25 l 0,-1.097656 1.097656,0 0,1.097656 -1.097656,0 z" />
-    </g>
-    <g id="declined" class="status">
-        <use style="fill:#ee0000;" xlink:href="#status" x="0" y="16" />
-        <rect x="9.5" y="26.75" width="4.25" height="1.5" />
-    </g>
-    <use id="needs-action" style="stroke-width:0.5; fill:#f4f444;" xlink:href="#status" x="16" y="16" />
-    <g id="delegated" class="status">
-        <use style="fill:#444444;" xlink:href="#status" x="0" y="32" />
-        <rect x="9" y="43" width="2.5" height="1" />
-        <polygon points="11.5,41, 11.5,46, 14.5,43.5" />
-    </g>
-
-    <!-- role/partstat icons -->
-    <use id="chair" class="req" xlink:href="#chairsymbol" x="16" y="32" />
-    <use id="individual-reqparticipant" class="req" xlink:href="#individual" x="32" y="0" />
-    <use id="group-reqparticipant" class="req" xlink:href="#group" x="48" y="0" />
-    <use id="resource-reqparticipant" class="req" xlink:href="#resource" x="64" y="0" />
-    <use id="room-reqparticipant" class="req" xlink:href="#room" x="80" y="0" />
-    <use id="unknown-reqparticipant" class="req" xlink:href="#unknown" x="96" y="0" />
-    <use id="individual-optparticipant" class="opt" xlink:href="#individual" x="32" y="16" />
-    <use id="group-optparticipant" class="opt" xlink:href="#group" x="48" y="16" />
-    <use id="resource-optparticipant" class="opt" xlink:href="#resource" x="64" y="16" />
-    <use id="room-optparticipant" class="opt" xlink:href="#room" x="80" y="16" />
-    <use id="unknown-optparticipant" class="opt" xlink:href="#unknown" x="96" y="16" />
-    <use id="individual-nonparticipant" class="non" xlink:href="#individual" x="32" y="32" />
-    <use id="group-nonparticipant" class="non" xlink:href="#group" x="48" y="32" />
-    <use id="resource-nonparticipant" class="non" xlink:href="#resource" x="64" y="32" />
-    <use id="room-nonparticipant" class="non" xlink:href="#room" x="80" y="32" />
-    <use id="unknown-nonparticipant" class="non" xlink:href="#unknown" x="96" y="32" />
-</svg> 
\ No newline at end of file
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 112 48" width="112" height="48">
+
+    <!-- definitions -->
+    <style>
+        .req {
+            fill: #ffcc00;
+            stroke: #000000;
+            stroke-width: 0.5;
+        }
+        .opt {
+            fill: #cccccc;
+            stroke: #000000;
+            stroke-width: 0.5;
+        }
+        .non {
+            fill: #ffffff;
+            stroke: #000000;
+            stroke-width: 0.5;
+        }
+        .status {
+            fill:#ffffff;
+            stroke:#ffffff;
+            stroke-width:0.5;
+        }
+    </style>
+    <clipPath id="cut-off-bottom">
+        <rect x="0" y="0" width="16" height="16" />
+    </clipPath>
+    <symbol id="chairsymbol" clip-path="url(#cut-off-bottom)">
+        <ellipse cx="6" cy="16" rx="5.5" ry="8" fill="#000000" />
+        <circle cx="6" cy="6.25" r="4" fill="#ffffff"/>
+        <ellipse cx="10" cy="16" rx="5.5" ry="8" fill="#000000" />
+        <circle cx="10" cy="6.25" r="4" fill="#ffffff"/>
+        <ellipse cx="8" cy="16" rx="6.5" ry="9" fill="#ffcc00" />
+        <circle cx="8" cy="4.5" r="4" fill="#ffcc00"/>
+        <line x1="0.5" y1="15.75" x2="15.5" y2="15.75" />
+    </symbol>
+    <symbol id="individual" clip-path="url(#cut-off-bottom)">
+        <ellipse cx="8" cy="16" rx="7.5" ry="8.5" />
+        <circle cx="8" cy="5" r="4.5"/>
+        <line x1="0.5" y1="15.75" x2="15.5" y2="15.75" />
+    </symbol>
+    <symbol id="group" clip-path="url(#cut-off-bottom)">
+        <ellipse cx="5.75" cy="16" rx="5.5" ry="8" />
+        <circle cx="5.75" cy="6.5" r="4"/>
+        <ellipse cx="7.5" cy="16" rx="6.0" ry="8.5" />
+        <circle cx="7.5" cy="5.5" r="4"/>
+        <ellipse cx="9.25" cy="16" rx="6.25" ry="9" />
+        <circle cx="9.25" cy="4.5" r="4"/>
+        <line x1="0.25" y1="15.75" x2="15.55" y2="15.75" />
+    </symbol>
+    <symbol id="resource">
+        <rect x="5.25" y="0.5" rx="1" ry="1" width="10.25" height="12" />
+        <rect x="0.25" y="7" rx="1" ry="1" width="13" height="8" />
+        <circle cx="4.25" cy="11" r="2.5" style="fill:#ffffff" />
+        <line x1="8.25" y1="9" x2="12" y2="9" />
+        <line x1="8.25" y1="11" x2="12" y2="11" />
+        <line x1="8.25" y1="13" x2="12" y2="13" />
+        <rect x="1.25" y="15" width="4" height="1" style="fill:#000000; stroke-width:0" />
+        <rect x="8" y="15" width="4" height="1" style="fill:#000000; stroke-width:0" />
+    </symbol>
+    <symbol id="room">
+        <rect x="4" y="0.5" rx="0.25" ry="0.25" width="3" height="2" />
+        <rect x="8.5" y="0.5" rx="0.25" ry="0.25" width="3" height="2" />
+        <rect x="0.25" y="4.5" rx="0.25" ry="0.25" width="2" height="3" />
+        <rect x="0.25" y="8.5" rx="0.25" ry="0.25" width="2" height="3" />
+        <rect x="3.5" y="4" rx="1" ry="1" width="8.75" height="8" />
+        <rect x="13.5" y="4.5" rx="0.25" ry="0.25" width="2" height="3" />
+        <rect x="13.5" y="8.5" rx="0.25" ry="0.25" width="2" height="3" />
+        <rect x="4" y="13.5" rx="0.25" ry="0.25" width="3" height="2" />
+        <rect x="8.5" y="13.5" rx="0.25" ry="0.25" width="3" height="2" />
+    </symbol>
+    <symbol id="unknown">
+        <path d="m 7.8339844,11.558594 -2.4902344,0 q -0.00977,-0.53711 -0.00977,-0.654297 0,-1.2109376 0.4003906,-1.9921876 Q 6.1347656,8.1308594 7.3359375,7.1542969 8.5371094,6.1777344 8.7714844,5.875 9.1328125,5.3964844 9.1328125,4.8203125 q 0,-0.8007813 -0.6445312,-1.3671875 -0.6347657,-0.5761719 -1.7187501,-0.5761719 -1.0449218,0 -1.7480468,0.5957032 -0.703125,0.5957031 -0.9667969,1.8164062 l -2.5195313,-0.3125 Q 1.6425781,3.2285156 3.0195313,2.0078125 4.40625,0.78710937 6.6523437,0.78710937 q 2.3632813,0 3.7597653,1.24023443 1.396485,1.2304687 1.396485,2.8710937 0,0.9082031 -0.517578,1.71875 Q 10.783203,7.4277344 9.1035156,8.8242188 8.234375,9.546875 8.0195313,9.9863281 7.8144531,10.425781 7.8339844,11.558594 Z M 5.34375,15.25 l 0,-2.744141 2.7441406,0 0,2.744141 -2.7441406,0 z" />
+    </symbol>
+    <symbol id="status" style="stroke-width:0.25;">
+        <circle cx="11.5" cy="11.5" r="4.5" style="fill:#000000; stroke:#ffffff" />
+        <circle cx="11.5" cy="11.5" r="4.25" style="stroke:#000000" />
+    </symbol>
+
+    <!-- status icons -->
+    <g id="accepted" class="status">
+        <use style="fill:#00a000;" xlink:href="#status" x="0" y="0" />
+        <rect x="9" y="11" width="5" height="1" />
+        <rect x="11" y="9" width="1" height="5" />
+    </g>
+    <g id="tentative" class="status">
+        <use style="fill:#0000ff;" xlink:href="#status" x="16" y="0" />
+        <path d="m 27.933594,13 -0.996094,0 q -0.0039,-0.214844 -0.0039,-0.261719 0,-0.484375 0.160156,-0.796875 0.160156,-0.3125 0.640625,-0.703125 0.480469,-0.390625 0.574219,-0.511719 0.144531,-0.191406 0.144531,-0.421875 0,-0.3203125 -0.257813,-0.546875 -0.253906,-0.2304687 -0.6875,-0.2304687 -0.417968,0 -0.699218,0.2382812 -0.28125,0.2382813 -0.386719,0.7265625 l -1.007813,-0.125 q 0.04297,-0.6992187 0.59375,-1.1875 0.554688,-0.4882812 1.453125,-0.4882812 0.945313,0 1.503907,0.4960937 0.558593,0.4921875 0.558593,1.1484375 0,0.363281 -0.207031,0.6875 -0.203125,0.324219 -0.875,0.882813 -0.347656,0.289062 -0.433594,0.464843 -0.08203,0.175782 -0.07422,0.628907 z M 26.9375,14.25 l 0,-1.097656 1.097656,0 0,1.097656 -1.097656,0 z" />
+    </g>
+    <g id="declined" class="status">
+        <use style="fill:#ee0000;" xlink:href="#status" x="0" y="16" />
+        <rect x="9.5" y="26.75" width="4.25" height="1.5" />
+    </g>
+    <use id="needs-action" style="stroke-width:0.5; fill:#f4f444;" xlink:href="#status" x="16" y="16" />
+    <g id="delegated" class="status">
+        <use style="fill:#444444;" xlink:href="#status" x="0" y="32" />
+        <rect x="9" y="43" width="2.5" height="1" />
+        <polygon points="11.5,41, 11.5,46, 14.5,43.5" />
+    </g>
+
+    <!-- role/partstat icons -->
+    <use id="chair" class="req" xlink:href="#chairsymbol" x="16" y="32" />
+    <use id="individual-reqparticipant" class="req" xlink:href="#individual" x="32" y="0" />
+    <use id="group-reqparticipant" class="req" xlink:href="#group" x="48" y="0" />
+    <use id="resource-reqparticipant" class="req" xlink:href="#resource" x="64" y="0" />
+    <use id="room-reqparticipant" class="req" xlink:href="#room" x="80" y="0" />
+    <use id="unknown-reqparticipant" class="req" xlink:href="#unknown" x="96" y="0" />
+    <use id="individual-optparticipant" class="opt" xlink:href="#individual" x="32" y="16" />
+    <use id="group-optparticipant" class="opt" xlink:href="#group" x="48" y="16" />
+    <use id="resource-optparticipant" class="opt" xlink:href="#resource" x="64" y="16" />
+    <use id="room-optparticipant" class="opt" xlink:href="#room" x="80" y="16" />
+    <use id="unknown-optparticipant" class="opt" xlink:href="#unknown" x="96" y="16" />
+    <use id="individual-nonparticipant" class="non" xlink:href="#individual" x="32" y="32" />
+    <use id="group-nonparticipant" class="non" xlink:href="#group" x="48" y="32" />
+    <use id="resource-nonparticipant" class="non" xlink:href="#resource" x="64" y="32" />
+    <use id="room-nonparticipant" class="non" xlink:href="#room" x="80" y="32" />
+    <use id="unknown-nonparticipant" class="non" xlink:href="#unknown" x="96" y="32" />
+</svg>
diff --git a/calendar/base/themes/common/calendar-occurrence.svg b/calendar/base/themes/common/calendar-occurrence.svg
index d8885d9ed7..6a1de2d527 100644
--- a/calendar/base/themes/common/calendar-occurrence.svg
+++ b/calendar/base/themes/common/calendar-occurrence.svg
@@ -1,6 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 18 18">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 18 18">
   <style>
     path {
       display: none;
diff --git a/calendar/base/themes/common/icons/newevent.svg b/calendar/base/themes/common/icons/newevent.svg
index 81c59e258f..87a1e56434 100644
--- a/calendar/base/themes/common/icons/newevent.svg
+++ b/calendar/base/themes/common/icons/newevent.svg
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
   <path d="M15 8.758a4.474 4.474 0 0 0-2-.73V2.17c1.165.412 2 1.523 2 2.829v3.758zM8.758 15H4a3 3 0 0 1-3-3V5c0-1.306.835-2.417 2-2.83V12a1 1 0 0 0 1 1h4.027c.082.734.34 1.416.73 2zM6 2h4v2H6V2z"/>
   <rect x="4" width="1" height="4" rx=".5"/>
diff --git a/calendar/base/themes/common/widgets/images/drag-center.svg b/calendar/base/themes/common/widgets/images/drag-center.svg
index 2e0491801b..acb6deb807 100644
--- a/calendar/base/themes/common/widgets/images/drag-center.svg
+++ b/calendar/base/themes/common/widgets/images/drag-center.svg
@@ -1,11 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="36" height="15">
-  <line id="plusV_b" x1="31.5" y1="3" x2="31.5" y2="12" stroke="#ffffff" stroke-width="3" stroke-opacity="0.8" fill="none"/>
-  <line id="plusH_b" x1="27" y1="7.5" x2="36" y2="7.5" stroke="#ffffff" stroke-width="3" stroke-opacity="0.8" fill="none"/>
-  <line id="minus_b" x1="0" y1="7.5" x2="8" y2="7.5" stroke="#ffffff" stroke-width="3" stroke-opacity="0.8" fill="none"/>
-  <line id="minus" x1="1" y1="7.5" x2="7" y2="7.5" stroke="#aaaaaa" stroke-width="1" fill="none"/>
-  <line id="plusH" x1="28" y1="7.5" x2="35" y2="7.5" stroke="#aaaaaa" stroke-width="1" fill="none"/>
-  <line id="plusV" x1="31.5" y1="4" x2="31.5" y2="11" stroke="#aaaaaa" stroke-width="1" fill="none"/>
-  <circle id="outer" r="6.5" cy="7.5" cx="18" stroke="#ffffff" stroke-width="2" stroke-opacity="0.8" fill="none"/>
-  <circle id="inner" r="5.5" cy="7.5" cx="18" stroke="#4c4c4c" stroke-width="1.5" stroke-opacity="0.5" fill="none"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="15" stroke="#fff" fill="none">
+  <path stroke-width="3" stroke-opacity=".8" d="M31.5 3v9M27 7.5h9M0 7.5h8"/>
+  <path stroke="#aaa" d="M1 7.5h6M28 7.5h7M31.5 4v7"/>
+  <circle r="6.5" cy="7.5" cx="18" stroke-width="2" stroke-opacity=".8"/>
+  <circle r="5.5" cy="7.5" cx="18" stroke="#4c4c4c" stroke-width="1.5" stroke-opacity=".5"/>
 </svg>
diff --git a/mail/components/enterprisepolicies/content/policies-active.svg b/mail/components/enterprisepolicies/content/policies-active.svg
index 3ccb4ad79b..9ec258d4e0 100644
--- a/mail/components/enterprisepolicies/content/policies-active.svg
+++ b/mail/components/enterprisepolicies/content/policies-active.svg
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
-    <path fill="context-fill" fill-opacity="context-fill-opacity" d="m11 10c-.5522847 0-1-.44771525-1-1v-4h-7v8c0 .5522847.44771525 1 1 1h2c.55228475 0 1 .4477153 1 1s-.44771525 1-1 1h-3c-1.1045695 0-2-.8954305-2-2v-10c0-1.1045695.8954305-2 2-2h1.05c.23659623-1.16516199 1.26105919-2.00250628 2.45-2.00250628s2.21340377.83734429 2.45 2.00250628h1.05c1.1045695 0 2 .8954305 2 2v5c0 .55228475-.4477153 1-1 1zm-1-6v-1h-1.051c-.47526862.000097-.88494628-.33433375-.98-.8-.14293517-.69793844-.7570756-1.19905191-1.4695-1.19905191s-1.32656483.50111347-1.4695 1.19905191c-.09505372.46566625-.50473138.800097-.98.8h-1.05v1zm-3.5-2c.27614237 0 .5.22385763.5.5s-.22385763.5-.5.5-.5-.22385763-.5-.5.22385763-.5.5-.5zm-2 5c-.27614237 0-.5-.22385763-.5-.5s.22385763-.5.5-.5h4c.27614237 0 .5.22385763.5.5s-.22385763.5-.5.5zm0 2c-.27614237 0-.5-.22385763-.5-.5s.22385763-.5.5-.5h2c.27614237 0 .5.22385763.5.5s-.22385763.5-.5.5zm0 2c-.27614237 0-.5-.2238576-.5-.5s.22385763-.5.5-.5h3c.27614237 0 .5.2238576.5.5s-.22385763.5-.5.5zm5.16250363 4.9969649c-.17706448-.0000378-.34686306-.070407-.47204764-.1956294l-2.00303103-2.003031c-.25303103-.2619823-.24941233-.6784164.00813326-.935962s.67397967-.2611643.93596203-.0081333l1.44017931 1.4401793 4.21704794-6.02444961c.2127301-.29815587.6259441-.36927468.9261129-.15939456.3001689.20988012.3752209.62239779.1682098.92455241l-4.6737391 6.67677006c-.1126024.1627768-.29162177.2672048-.48873957.2850981-.01935032.0009766-.03873758.0009766-.0580879 0z"/>
+    <path fill="context-fill" fill-opacity="context-fill-opacity" d="M11 10a1 1 0 01-1-1V5H3v8a1 1 0 001 1h2a1 1 0 010 2H3a2 2 0 01-2-2V4c0-1.1.9-2 2-2h1.05a2.5 2.5 0 014.9 0H10a2 2 0 012 2v5a1 1 0 01-1 1zm-1-6V3H8.95a1 1 0 01-.98-.8 1.5 1.5 0 00-2.94 0 1 1 0 01-.98.8H3v1zM6.5 2a.5.5 0 110 1 .5.5 0 010-1zm-2 5a.5.5 0 010-1h4a.5.5 0 010 1zm0 2a.5.5 0 010-1h2a.5.5 0 010 1zm0 2a.5.5 0 110-1h3a.5.5 0 110 1zm5.16 5a.67.67 0 01-.47-.2l-2-2a.67.67 0 01.94-.95l1.44 1.44 4.22-6.02a.67.67 0 011.1.77L10.2 15.7a.67.67 0 01-.55.29z"/>
 </svg>
diff --git a/mail/components/enterprisepolicies/content/policies-documentation.svg b/mail/components/enterprisepolicies/content/policies-documentation.svg
index 28352434f0..a2817d3514 100644
--- a/mail/components/enterprisepolicies/content/policies-documentation.svg
+++ b/mail/components/enterprisepolicies/content/policies-documentation.svg
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
-    <path fill="context-fill" fill-opacity="context-fill-opacity" d="m11 7.00250628c-.5522847 0-1-.44771525-1-1v-1h-7v8.00000002c0 .5522847.44771525 1 1 1h2c.55228475 0 1 .4477152 1 1 0 .5522847-.44771525 1-1 1h-3c-1.1045695 0-2-.8954305-2-2v-10.00000002c0-1.1045695.8954305-2 2-2h1.05c.23659623-1.16516199 1.26105919-2.00250628 2.45-2.00250628s2.21340377.83734429 2.45 2.00250628h1.05c1.1045695 0 2 .8954305 2 2v2c0 .55228475-.4477153 1-1 1zm-1-3v-1h-1.051c-.47526862.000097-.88494628-.33433374-.98-.8-.14293517-.69793844-.7570756-1.19905191-1.4695-1.19905191s-1.32656483.50111347-1.4695 1.19905191c-.09505372.46566626-.50473138.800097-.98.8h-1.05v1zm-3.5-2c.27614237 0 .5.22385763.5.5 0 .27614238-.22385763.5-.5.5s-.5-.22385762-.5-.5c0-.27614237.22385763-.5.5-.5zm-2 5c-.27614237 0-.5-.22385762-.5-.5 0-.27614237.22385763-.5.5-.5h4c.27614237 0 .5.22385763.5.5 0 .27614238-.22385763.5-.5.5zm0 2c-.27614237 0-.5-.22385762-.5-.5 0-.27614237.22385763-.5.5-.5h2c.27614237 0 .5.22385763.5.5 0 .27614238-.22385763.5-.5.5zm0 2.00000002c-.27614237 0-.5-.2238576-.5-.5s.22385763-.5.5-.5h1c.27614237 0 .5.2238576.5.5s-.22385763.5-.5.5zm6.5 4.9974937c-2.2092 0-4-1.7908-4-4s1.7908-4 4-4 4 1.7908 4 4-1.7908 4-4 4zm.46-2c0-.254051-.205949-.46-.46-.46s-.46.205949-.46.46.205949.46.46.46.46-.205949.46-.46zm-1.06-3c0-.3056.2464-.6.6-.6s.6.2944.6.6c0 .1244-.0576.254-.1632.3896-.0796.1016-.1544.172-.228.24-.0308.0288-.0612.0572-.092.0876-.0062816.0061251-.0126828.0121262-.0192.018-.052.0468-.1864.168-.2792.3028-.1304.1896-.2184.434-.2184.762 0 .2209139.1790861.4.4.4s.4-.1790861.4-.4c0-.1724.0424-.258.0776-.3088.0204-.0296.0456-.0576.0788-.09.016-.0156.032-.03.0516-.048l.0012-.0008.0036-.0032c.02-.018.0456-.0416.07-.0664l.0344-.032c.1262825-.1138504.2434416-.2374293.3504-.3696.16-.2048.3324-.5056.3324-.8812 0-.6944-.5536-1.4-1.4-1.4s-1.4.7056-1.4 1.4c0 .2209139.1790861.4.4.4s.4-.1790861.4-.4z"/>
+    <path fill="context-fill" fill-opacity="context-fill-opacity" d="M11 7a1 1 0 01-1-1V5H3v8a1 1 0 001 1h2a1 1 0 110 2H3a2 2 0 01-2-2V4c0-1.1.9-2 2-2h1.05a2.5 2.5 0 014.9 0H10a2 2 0 012 2v2a1 1 0 01-1 1zm-1-3V3H8.95a1 1 0 01-.98-.8 1.5 1.5 0 00-2.94 0 1 1 0 01-.98.8H3v1zM6.5 2a.5.5 0 110 1 .5.5 0 010-1zm-2 5a.5.5 0 110-1h4a.5.5 0 010 1zm0 2a.5.5 0 110-1h2a.5.5 0 010 1zm0 2a.5.5 0 110-1h1a.5.5 0 110 1zm6.5 5a4 4 0 110-8 4 4 0 010 8zm.46-2a.46.46 0 10-.92 0 .46.46 0 00.92 0zm-1.06-3c0-.3.25-.6.6-.6s.6.3.6.6c0 .12-.06.25-.16.39-.08.1-.16.17-.23.24l-.1.09-.01.02a1.3 1.3 0 00-.5 1.06.4.4 0 10.8 0c0-.17.04-.26.08-.3a.61.61 0 01.08-.1l.05-.05.07-.07.04-.03c.12-.11.24-.24.35-.37.16-.2.33-.5.33-.88a1.4 1.4 0 00-2.8 0 .4.4 0 10.8 0z"/>
 </svg>
diff --git a/mail/components/enterprisepolicies/content/policies-error.svg b/mail/components/enterprisepolicies/content/policies-error.svg
index 58a24f12e9..fad8ddd632 100644
--- a/mail/components/enterprisepolicies/content/policies-error.svg
+++ b/mail/components/enterprisepolicies/content/policies-error.svg
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
-    <path fill="context-fill" fill-opacity="context-fill-opacity" d="m11 7.00250628c-.5522847 0-1-.44771525-1-1v-1h-7v8.00000002c0 .5522847.44771525 1 1 1h1c.55228475 0 1 .4477152 1 1 0 .5522847-.44771525 1-1 1h-2c-1.1045695 0-2-.8954305-2-2v-10.00000002c0-1.1045695.8954305-2 2-2h1.05c.23659623-1.16516199 1.26105919-2.00250628 2.45-2.00250628s2.21340377.83734429 2.45 2.00250628h1.05c1.1045695 0 2 .8954305 2 2v2c0 .55228475-.4477153 1-1 1zm-1-3v-1h-1.051c-.47526862.000097-.88494628-.33433374-.98-.8-.14293517-.69793844-.7570756-1.19905191-1.4695-1.19905191s-1.32656483.50111347-1.4695 1.19905191c-.09505372.46566626-.50473138.800097-.98.8h-1.05v1zm-3.5-2c.27614237 0 .5.22385763.5.5 0 .27614238-.22385763.5-.5.5s-.5-.22385762-.5-.5c0-.27614237.22385763-.5.5-.5zm-2 5c-.27614237 0-.5-.22385762-.5-.5 0-.27614237.22385763-.5.5-.5h4c.27614237 0 .5.22385763.5.5 0 .27614238-.22385763.5-.5.5zm0 2c-.27614237 0-.5-.22385762-.5-.5 0-.27614237.22385763-.5.5-.5h3c.27614237 0 .5.22385763.5.5 0 .27614238-.22385763.5-.5.5zm0 2.00000002c-.27614237 0-.5-.2238576-.5-.5s.22385763-.5.5-.5h2c.27614237 0 .5.2238576.5.5s-.22385763.5-.5.5zm10.4094737 3.3385315c.1818196.3660605.1556801.8011195-.0686611 1.1427768-.2243412.3416572-.6131685.5385659-1.0213389.5172232h-5.70000002c-.39222659-.0104155-.75207561-.2200879-.95454083-.5561802-.20246523-.3360923-.21960272-.7522174-.04545917-1.1038198l2.85-5.69999999c.19423612-.39115456.59327402-.63853153 1.03000002-.63853153.4367259 0 .8357638.24737697 1.03.63853153zm-4.45-3.78v1.73c.0381214.2884432.2840486.5040066.575.5040066s.5368786-.2155634.575-.5040066v-1.73c.0295426-.2235324-.0731401-.4439283-.2632845-.56510838-.1901445-.12118005-.4332866-.12118005-.623431 0-.1901445.12118008-.2928271.34157598-.2632845.56510838zm.57 4.13c.3755536 0 .68-.3044464.68-.68 0-.2750343-.1656767-.522987-.4197753-.6282381s-.5465787-.0470731-.7410573.1474055c-.1944787.1944786-.2526566.4869588-.1474055.7410573.1052511.2540986.3532038.4197753.6282381.4197753z"/>
+    <path fill="context-fill" fill-opacity="context-fill-opacity" d="M11 7a1 1 0 01-1-1V5H3v8a1 1 0 001 1h1a1 1 0 110 2H3a2 2 0 01-2-2V4c0-1.1.9-2 2-2h1.05a2.5 2.5 0 014.9 0H10a2 2 0 012 2v2a1 1 0 01-1 1zm-1-3V3H8.95a1 1 0 01-.98-.8 1.5 1.5 0 00-2.94 0 1 1 0 01-.98.8H3v1zM6.5 2a.5.5 0 110 1 .5.5 0 010-1zm-2 5a.5.5 0 110-1h4a.5.5 0 010 1zm0 2a.5.5 0 110-1h3a.5.5 0 010 1zm0 2a.5.5 0 110-1h2a.5.5 0 110 1zm10.4 3.34A1.15 1.15 0 0113.83 16h-5.7a1.15 1.15 0 01-1-1.66l2.85-5.7a1.15 1.15 0 012.06 0zm-4.44-3.78v1.73a.58.58 0 001.15 0v-1.73a.58.58 0 10-1.15 0zm.57 4.13a.68.68 0 100-1.36.68.68 0 000 1.36z"/>
 </svg>
diff --git a/mail/themes/addons/dark/icon.svg b/mail/themes/addons/dark/icon.svg
index b56babd230..c43145632b 100644
--- a/mail/themes/addons/dark/icon.svg
+++ b/mail/themes/addons/dark/icon.svg
@@ -1,11 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
   <path fill="#0c0c0d" d="M2 2h14v13H2z"/>
   <path fill="#323234" d="M16 2v13H2v15h28V2H16z"/>
   <rect x="1" y="1" width="30" height="30" rx="2" ry="2" fill="none" stroke="#08091a" stroke-opacity=".35" stroke-width="2"/>
   <circle cx="9.5" cy="22.5" r="6" fill="#474749" stroke="#08091a"/>
-  <path d="M12.5 22H7.707l2.146-2.146a.5.5 0 0 0-.707-.707l-3 3a.5.5 0 0 0 0 .708l3 3a.5.5 0 1 0 .707-.707L7.707 23H12.5a.5.5 0 0 0 0-1z" fill="#f9f9fa" fill-opacity=".8"/>
-  <path d="M20.5 20h4a.5.5 0 0 0 0-1h-4a.5.5 0 0 0 0 1zm4 2h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1zm0 3h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1z" fill="#f9f9fa" fill-opacity=".8"/>
+  <path d="M12.5 22H7.7l2.15-2.15a.5.5 0 00-.7-.7l-3 3a.5.5 0 000 .7l3 3a.5.5 0 10.7-.7L7.71 23h4.79a.5.5 0 000-1zM20.5 20h4a.5.5 0 000-1h-4a.5.5 0 000 1zm4 2h-4a.5.5 0 000 1h4a.5.5 0 000-1zm0 3h-4a.5.5 0 000 1h4a.5.5 0 000-1z" fill="#f9f9fa" fill-opacity=".8"/>
   <path fill="#0a84ff" d="M16 2h14v1H16z"/>
-  <path d="M26.354 8.646l-3.5-3.5a.5.5 0 0 0-.707 0l-3.5 3.5a.5.5 0 0 0 .707.707L20 8.707V11.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5V8.707l.646.646a.5.5 0 1 0 .707-.707zM24 11h-1V9h-1v2h-1V7.707l1.5-1.5 1.5 1.5z" fill="#f9f9fa" fill-opacity=".8"/>
+  <path d="M26.35 8.65l-3.5-3.5a.5.5 0 00-.7 0l-3.5 3.5a.5.5 0 00.7.7l.65-.64v2.79a.5.5 0 00.5.5h4a.5.5 0 00.5-.5V8.7l.65.65a.5.5 0 10.7-.7zM24 11h-1V9h-1v2h-1V7.7l1.5-1.5L24 7.7z" fill="#f9f9fa" fill-opacity=".8"/>
   <path fill="#08091a" d="M15 2v12H2v1h14V2h-1z"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/mail/themes/addons/light/icon.svg b/mail/themes/addons/light/icon.svg
index f6d3e78598..bd45f8528f 100644
--- a/mail/themes/addons/light/icon.svg
+++ b/mail/themes/addons/light/icon.svg
@@ -1,11 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
   <path fill="#e1e1e5" d="M2 2h14v13H2z"/>
   <path fill="#f9f9fa" d="M16 2v13H2v15h28V2H16z"/>
   <rect x="1" y="1" width="30" height="30" rx="2" ry="2" fill="none" stroke="#08091a" stroke-opacity=".35" stroke-width="2"/>
   <circle cx="9.5" cy="22.5" r="6" fill="#fff" stroke="#adadb3"/>
-  <path d="M12.5 22H7.707l2.146-2.146a.5.5 0 0 0-.707-.707l-3 3a.5.5 0 0 0 0 .708l3 3a.5.5 0 1 0 .707-.707L7.707 23H12.5a.5.5 0 0 0 0-1z" fill="#0c0c0d" fill-opacity=".8"/>
-  <path d="M20.5 20h4a.5.5 0 0 0 0-1h-4a.5.5 0 0 0 0 1zm4 2h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1zm0 3h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1z" fill="#0c0c0d" fill-opacity=".8"/>
+  <path d="M12.5 22H7.7l2.15-2.15a.5.5 0 00-.7-.7l-3 3a.5.5 0 000 .7l3 3a.5.5 0 10.7-.7L7.71 23h4.79a.5.5 0 000-1zM20.5 20h4a.5.5 0 000-1h-4a.5.5 0 000 1zm4 2h-4a.5.5 0 000 1h4a.5.5 0 000-1zm0 3h-4a.5.5 0 000 1h4a.5.5 0 000-1z" fill="#0c0c0d" fill-opacity=".8"/>
   <path fill="#0a84ff" d="M16 2h14v1H16z"/>
-  <path d="M26.354 8.646l-3.5-3.5a.5.5 0 0 0-.707 0l-3.5 3.5a.5.5 0 0 0 .707.707L20 8.707V11.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5V8.707l.646.646a.5.5 0 1 0 .707-.707zM24 11h-1V9h-1v2h-1V7.707l1.5-1.5 1.5 1.5z" fill="#0c0c0d" fill-opacity=".8"/>
+  <path d="M26.35 8.65l-3.5-3.5a.5.5 0 00-.7 0l-3.5 3.5a.5.5 0 00.7.7l.65-.64v2.79a.5.5 0 00.5.5h4a.5.5 0 00.5-.5V8.7l.65.65a.5.5 0 10.7-.7zM24 11h-1V9h-1v2h-1V7.7l1.5-1.5L24 7.7z" fill="#0c0c0d" fill-opacity=".8"/>
   <path fill="#08091a" fill-opacity=".25" d="M15 2v12H2v1h14V2h-1z"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/mail/themes/shared/mail/icons/cert-error.svg b/mail/themes/shared/mail/icons/cert-error.svg
index 9d23267bb0..134944525f 100644
--- a/mail/themes/shared/mail/icons/cert-error.svg
+++ b/mail/themes/shared/mail/icons/cert-error.svg
@@ -1,23 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="45"
-     height="45"
-     viewBox="0 0 45 45">
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="45" height="45" viewBox="0 0 45 45">
   <style>
     .icon-default {
       fill: #999;
     }
   </style>
-
   <defs>
     <rect id="shape-lock-clasp-outer" x="8" y="2" width="28" height="40" rx="14" ry="14" />
     <rect id="shape-lock-clasp-inner" x="14" y="8" width="16" height="28" rx="8" ry="8" />
     <rect id="shape-lock-base" x="4" y="18" width="36" height="24" rx="3" ry="3" />
-
     <mask id="mask-clasp-cutout">
       <rect width="48" height="48" fill="#000" />
       <use xlink:href="#shape-lock-clasp-outer" fill="#fff" />
@@ -26,17 +19,13 @@
       <line x1="4" y1="46" x2="41" y2="11" stroke="#000" stroke-width="5.5" />
       <rect x="4" y="18" width="36" height="26" rx="6" ry="6" />
     </mask>
-
     <mask id="mask-base-cutout">
       <rect width="45" height="45" fill="#000" />
       <use xlink:href="#shape-lock-base" fill="#fff" />
       <line x1="2.5" y1="41.5" x2="41" y2="5" stroke="#000" stroke-width="8.5" />
     </mask>
   </defs>
-
   <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" fill="#999" />
   <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)" fill="#999" />
-
   <line x1="2.5" y1="41.5" x2="41" y2="5" stroke="#d92d21" stroke-width="5.5" />
-
 </svg>
diff --git a/mail/themes/shared/openpgp/attach-active-18.svg b/mail/themes/shared/openpgp/attach-active-18.svg
index 11c93e963c..b0cac7a181 100644
--- a/mail/themes/shared/openpgp/attach-active-18.svg
+++ b/mail/themes/shared/openpgp/attach-active-18.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/attach-disabled-18.svg b/mail/themes/shared/openpgp/attach-disabled-18.svg
index b6a10acc31..c79db5695d 100644
--- a/mail/themes/shared/openpgp/attach-disabled-18.svg
+++ b/mail/themes/shared/openpgp/attach-disabled-18.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/attach-inactive-18.svg b/mail/themes/shared/openpgp/attach-inactive-18.svg
index 9214ef939b..910328b6f1 100644
--- a/mail/themes/shared/openpgp/attach-inactive-18.svg
+++ b/mail/themes/shared/openpgp/attach-inactive-18.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/decrypt-active-18.svg b/mail/themes/shared/openpgp/decrypt-active-18.svg
index 5be84c10e9..28b299d4dd 100644
--- a/mail/themes/shared/openpgp/decrypt-active-18.svg
+++ b/mail/themes/shared/openpgp/decrypt-active-18.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/decrypt-inactive-18.svg b/mail/themes/shared/openpgp/decrypt-inactive-18.svg
index c86b9ed089..38efd05ed3 100644
--- a/mail/themes/shared/openpgp/decrypt-inactive-18.svg
+++ b/mail/themes/shared/openpgp/decrypt-inactive-18.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/encrypt-disabled-18.svg b/mail/themes/shared/openpgp/encrypt-disabled-18.svg
index 31cc576579..944e981fe4 100644
--- a/mail/themes/shared/openpgp/encrypt-disabled-18.svg
+++ b/mail/themes/shared/openpgp/encrypt-disabled-18.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/encrypt-inactive-18.svg b/mail/themes/shared/openpgp/encrypt-inactive-18.svg
index 571a2ff1b2..2d226bdf78 100644
--- a/mail/themes/shared/openpgp/encrypt-inactive-18.svg
+++ b/mail/themes/shared/openpgp/encrypt-inactive-18.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/headerProtected-18.svg b/mail/themes/shared/openpgp/headerProtected-18.svg
index 239d37b8f7..fb98cd1123 100644
--- a/mail/themes/shared/openpgp/headerProtected-18.svg
+++ b/mail/themes/shared/openpgp/headerProtected-18.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/headerUnprotected-18.svg b/mail/themes/shared/openpgp/headerUnprotected-18.svg
index 46228e0e8d..44edce9ee3 100644
--- a/mail/themes/shared/openpgp/headerUnprotected-18.svg
+++ b/mail/themes/shared/openpgp/headerUnprotected-18.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/ok-sign.svg b/mail/themes/shared/openpgp/ok-sign.svg
index 46f333ca1c..147bb733b5 100644
--- a/mail/themes/shared/openpgp/ok-sign.svg
+++ b/mail/themes/shared/openpgp/ok-sign.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/password-error.svg b/mail/themes/shared/openpgp/password-error.svg
index 68a0dddd0d..5151efce54 100644
--- a/mail/themes/shared/openpgp/password-error.svg
+++ b/mail/themes/shared/openpgp/password-error.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
diff --git a/mail/themes/shared/openpgp/sign-active-18.svg b/mail/themes/shared/openpgp/sign-active-18.svg
index 3cc9f0ed3c..cb1a0abe12 100644
--- a/mail/themes/shared/openpgp/sign-active-18.svg
+++ b/mail/themes/shared/openpgp/sign-active-18.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/sign-disabled-18.svg b/mail/themes/shared/openpgp/sign-disabled-18.svg
index 61172ddf3a..d1a0433d0c 100644
--- a/mail/themes/shared/openpgp/sign-disabled-18.svg
+++ b/mail/themes/shared/openpgp/sign-disabled-18.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/mail/themes/shared/openpgp/sign-inactive-18.svg b/mail/themes/shared/openpgp/sign-inactive-18.svg
index bc8b5854aa..4a24ccdf0b 100644
--- a/mail/themes/shared/openpgp/sign-inactive-18.svg
+++ b/mail/themes/shared/openpgp/sign-inactive-18.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"