diff --git a/panels/common/cc-permission-infobar.ui b/panels/common/cc-permission-infobar.ui
index 851fcd040430a0c8c1d8aa8ffe4d833dae46824c..6aab220cdcc249d558bdcbad3c4b2b77423008d0 100644
--- a/panels/common/cc-permission-infobar.ui
+++ b/panels/common/cc-permission-infobar.ui
@@ -17,7 +17,7 @@
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkImage">
-                    <property name="icon-name">system-lock-screen-symbolic</property>
+                    <property name="icon-name">org.gnome.Settings-lock-symbolic</property>
                   </object>
                 </child>
                 <child>
diff --git a/shell/cc-panel-list.ui b/shell/cc-panel-list.ui
index b0c380b4bd51889a898046ead6ddd3b55c43d4a0..d60347bf4d6749d5f482e4170ed0ab085abc603c 100644
--- a/shell/cc-panel-list.ui
+++ b/shell/cc-panel-list.ui
@@ -30,7 +30,7 @@
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkImage">
-                            <property name="icon_name">preferences-system-privacy-symbolic</property>
+                            <property name="icon_name">org.gnome.Settings-privacy-symbolic</property>
                           </object>
                         </child>
                         <child>
diff --git a/shell/gnome-control-center.gresource.xml b/shell/gnome-control-center.gresource.xml
index ec1feae1e4e8edd426ff88d2d384585945ee0434..654808dbddd8f541b268ae19be416ac8dda5973b 100644
--- a/shell/gnome-control-center.gresource.xml
+++ b/shell/gnome-control-center.gresource.xml
@@ -10,7 +10,8 @@
 
   <!-- Panel icons -->
   <gresource prefix="/org/gnome/Settings">
-    <file preprocess="xml-stripblanks">icons/multitasking-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">icons/org.gnome.Settings-lock-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">icons/org.gnome.Settings-privacy-symbolic.svg</file>
     <file>style.css</file>
   </gresource>
 </gresources>
diff --git a/shell/icons/multitasking-symbolic.svg b/shell/icons/multitasking-symbolic.svg
deleted file mode 100644
index 7959ddbfcfe88fca82dc395d1b92de0c99e8e45a..0000000000000000000000000000000000000000
--- a/shell/icons/multitasking-symbolic.svg
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   width="16.00004"
-   viewBox="0 0 16.00004 16"
-   version="1.1"
-   id="svg7384"
-   height="16">
-  <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>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386">
-    <linearGradient
-       osb:paint="solid"
-       id="linearGradient7212">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7214" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(-699.99996,-400.00765)"
-     style="display:inline"
-     id="layer1">
-    <path
-       d="m 703,401 v 1 1 h -3 v 1 9 h 3 v 2 h 10 v -2 h 3 v -10 h -3 v -2 z m 2,2 h 6 v 1 9 h -6 z m -3,2 h 1 v 6 h -1 z m 11,0 h 1 v 6 h -1 z"
-       id="rect8510"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;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;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  </g>
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer21" />
-  <g
-     transform="translate(-941.00016,-33.00765)"
-     style="display:inline"
-     id="layer9" />
-  <g
-     transform="translate(-941.00016,-33.00765)"
-     style="display:inline"
-     id="g7628" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer19" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer13" />
-  <g
-     transform="translate(-699.99996,-400.00765)"
-     style="display:inline"
-     id="layer11" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer14" />
-  <g
-     transform="translate(-699.99996,-400.00765)"
-     style="display:inline"
-     id="g6387" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer18" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer17" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer16" />
-  <g
-     transform="translate(-699.99996,-400.00765)"
-     style="display:inline"
-     id="layer10" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer15" />
-  <g
-     transform="translate(-699.99996,-400.00765)"
-     id="layer12" />
-  <g
-     transform="translate(-699.99996,-600.00765)"
-     id="layer20" />
-</svg>
diff --git a/shell/icons/org.gnome.Settings-lock-symbolic.svg b/shell/icons/org.gnome.Settings-lock-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e12554e15b2b3aad7616abaad4f56f4c804167dd
--- /dev/null
+++ b/shell/icons/org.gnome.Settings-lock-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 8 1 c -2.199219 0 -4 1.800781 -4 4 v 2 c -1.109375 0 -2 0.890625 -2 2 v 5 c 0 0.554688 0.445312 1 1 1 h 10 c 0.554688 0 1 -0.445312 1 -1 v -5 c 0 -1.109375 -0.890625 -2 -2 -2 v -2 c 0 -2.199219 -1.800781 -4 -4 -4 z m 0 2 c 1.125 0 2 0.875 2 2 v 2 h -4 v -2 c 0 -1.125 0.875 -2 2 -2 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/shell/icons/org.gnome.Settings-privacy-symbolic.svg b/shell/icons/org.gnome.Settings-privacy-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c83ed58b39b4205dc7ee0825588fe59e01a1fc38
--- /dev/null
+++ b/shell/icons/org.gnome.Settings-privacy-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 8 0 c 0.554688 0 1 0.445312 1 1 v 6.5 s 0 0.5 0.5 0.5 s 0.5 -0.5 0.5 -0.5 v -4.5 c 0 -0.554688 0.445312 -1 1 -1 s 1 0.445312 1 1 v 8.5 c 0 0.5 0.5 0.5 0.5 0.5 l 1.792969 -1.707031 c 0.1875 -0.195313 0.445312 -0.300781 0.71875 -0.304688 c 1.082031 0.085938 1.144531 1.269531 0.695312 1.71875 l -3 3 c -0.707031 0.792969 -1.757812 1.289063 -2.707031 1.292969 h -6 c -3 0 -3 -3 -3 -3 v -8 c 0 -0.554688 0.445312 -1 1 -1 s 1 0.445312 1 1 v 3.5 s 0 0.5 0.5 0.5 s 0.5 -0.5 0.5 -0.5 v -6.5 c 0 -0.554688 0.445312 -1 1 -1 s 1 0.445312 1 1 v 5.5 s 0 0.5 0.5 0.5 s 0.5 -0.5 0.5 -0.5 v -6.5 c 0 -0.554688 0.445312 -1 1 -1 z m 0 0" fill="#2e3436"/>
+</svg>