From d373e10a4490a1767da2be710fea7bec6718773c Mon Sep 17 00:00:00 2001
From: Sam Hewitt <snwh@gnome.org>
Date: Fri, 19 Jan 2024 14:22:29 -0330
Subject: [PATCH] switchMonitor: New assets for switcher items

- include new assets in the symbolic source
- update existing screenshot assets with new display design

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6013
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3128>
---
 data/gnome-shell-icons.gresource.xml          |   7 +
 .../screenshot-ui-display-symbolic.svg        |   2 +-
 .../shell-display-built-in-only-symbolic.svg  |   5 +
 .../shell-display-extend-all-symbolic.svg     |   7 +
 .../shell-display-external-only-symbolic.svg  |   5 +
 .../actions/shell-display-mirror-symbolic.svg |   4 +
 data/org.gnome.Shell-symbolic.Source.svg      | 229 +++++++++++++++---
 js/ui/switchMonitor.js                        |  10 +-
 8 files changed, 233 insertions(+), 36 deletions(-)
 create mode 100644 data/icons/scalable/actions/shell-display-built-in-only-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-display-extend-all-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-display-external-only-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-display-mirror-symbolic.svg

diff --git a/data/gnome-shell-icons.gresource.xml b/data/gnome-shell-icons.gresource.xml
index 46d4b3577..fe6353340 100644
--- a/data/gnome-shell-icons.gresource.xml
+++ b/data/gnome-shell-icons.gresource.xml
@@ -22,6 +22,10 @@
     <file preprocess="xml-stripblanks">scalable/actions/screenshot-ui-show-pointer-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/actions/screenshot-ui-window-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/actions/screenshot-recorded-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/actions/shell-display-built-in-only-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/actions/shell-display-extend-all-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/actions/shell-display-external-only-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/actions/shell-display-mirror-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/actions/shell-focus-app-grid-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/actions/shell-focus-dash-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/actions/shell-focus-dash-symbolic-rtl.svg</file>
@@ -49,3 +53,6 @@
     <file preprocess="xml-stripblanks">scalable/status/switch-off-symbolic.svg</file>
   </gresource>
 </gresources>
+
+
+
diff --git a/data/icons/scalable/actions/screenshot-ui-display-symbolic.svg b/data/icons/scalable/actions/screenshot-ui-display-symbolic.svg
index b8b3f4a20..80406132c 100644
--- a/data/icons/scalable/actions/screenshot-ui-display-symbolic.svg
+++ b/data/icons/scalable/actions/screenshot-ui-display-symbolic.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 4 4 c -1.660156 0 -3 1.339844 -3 3 v 14 c 0 1.660156 1.339844 3 3 3 h 10 v 3 h -3 c -1.09375 -0.003906 -2 0.90625 -2 2 h 14 c 0 -1.09375 -0.910156 -2 -2 -2 h -3 v -3 h 10 c 1.660156 0 3 -1.339844 3 -3 v -14 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 2 h 24 c 0.554688 0 1 0.445312 1 1 v 14 c 0 0.554688 -0.445312 1 -1 1 h -24 c -0.554688 0 -1 -0.445312 -1 -1 v -14 c 0 -0.554688 0.445312 -1 1 -1 z m 0 0" fill="#241f31"/>
+    <path d="m 5 3 c -2.265625 0 -4.09375 1.847656 -4.09375 4.074219 v 13.828125 c 0 2.230468 1.828125 4.074218 4.09375 4.074218 h 5.894531 v 2.46875 c 0 1.410157 1.132813 2.542969 2.542969 2.542969 h 5.414062 c 1.40625 0 2.542969 -1.132812 2.542969 -2.542969 v -2.46875 h 5.390625 c 2.265625 0 4.097656 -1.84375 4.097656 -4.074218 v -13.828125 c 0 -2.226563 -1.832031 -4.074219 -4.097656 -4.074219 z m 0 1.976562 h 21.785156 c 1.15625 0 2.074219 0.910157 2.074219 2.097657 v 13.828125 c 0 1.191406 -0.917969 2.097656 -2.074219 2.097656 h -21.785156 c -1.15625 0 -2.074219 -0.90625 -2.074219 -2.097656 v -13.828125 c 0 -1.1875 0.917969 -2.097657 2.074219 -2.097657 z m 7.890625 20 h 6.5 v 2.46875 c 0 0.304688 -0.238281 0.542969 -0.539063 0.542969 h -5.414062 c -0.304688 0 -0.546875 -0.238281 -0.546875 -0.542969 z m 0 0" fill="#241f31"/>
 </svg>
diff --git a/data/icons/scalable/actions/shell-display-built-in-only-symbolic.svg b/data/icons/scalable/actions/shell-display-built-in-only-symbolic.svg
new file mode 100644
index 000000000..72688e310
--- /dev/null
+++ b/data/icons/scalable/actions/shell-display-built-in-only-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 12.105469 1 c -2.265625 0 -4.097657 1.847656 -4.097657 4.078125 v 9.832031 c 0 2.230469 1.832032 4.078125 4.097657 4.078125 h 3.894531 v 1.46875 c 0 1.40625 1.132812 2.542969 2.542969 2.542969 h 3.414062 c 1.410157 0 2.546875 -1.136719 2.546875 -2.542969 v -1.46875 h 3.390625 c 2.265625 0 4.097657 -1.847656 4.097657 -4.078125 v -9.832031 c 0 -2.230469 -1.832032 -4.078125 -4.097657 -4.078125 z m 0 1.980469 h 15.789062 c 1.15625 0 2.078125 0.90625 2.078125 2.097656 v 9.832031 c 0 1.191406 -0.921875 2.097656 -2.078125 2.097656 h -15.789062 c -1.15625 0 -2.078125 -0.90625 -2.078125 -2.097656 v -9.832031 c 0 -1.191406 0.921875 -2.097656 2.078125 -2.097656 z m 5.894531 16.007812 h 4.5 v 1.46875 c 0 0.300781 -0.242188 0.542969 -0.542969 0.542969 h -3.414062 c -0.300781 0 -0.542969 -0.242188 -0.542969 -0.542969 z m 0 0" fill="#242032" fill-opacity="0.2"/>
+    <path d="m 4 21 c -1.644531 0 -3 1.355469 -3 3 v 5.585938 l -0.707031 0.707031 c -0.2851565 0.285156 -0.371094 0.714843 -0.214844 1.089843 c 0.152344 0.375 0.515625 0.617188 0.921875 0.617188 h 14 c 0.40625 0 0.769531 -0.242188 0.921875 -0.617188 c 0.15625 -0.375 0.070313 -0.804687 -0.214844 -1.089843 l -0.707031 -0.707031 v -5.585938 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 8 c 0.570312 0 1 0.429688 1 1 v 5 h -10 v -5 c 0 -0.570312 0.429688 -1 1 -1 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/data/icons/scalable/actions/shell-display-extend-all-symbolic.svg b/data/icons/scalable/actions/shell-display-extend-all-symbolic.svg
new file mode 100644
index 000000000..e72ec7e7a
--- /dev/null
+++ b/data/icons/scalable/actions/shell-display-extend-all-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#241f31">
+        <path d="m 4 21 c -1.644531 0 -3 1.355469 -3 3 v 5.585938 l -0.707031 0.707031 c -0.2851565 0.285156 -0.371094 0.714843 -0.214844 1.089843 c 0.152344 0.375 0.515625 0.617188 0.921875 0.617188 h 14 c 0.40625 0 0.769531 -0.242188 0.921875 -0.617188 c 0.15625 -0.375 0.070313 -0.804687 -0.214844 -1.089843 l -0.707031 -0.707031 v -5.585938 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 8 c 0.570312 0 1 0.429688 1 1 v 5 h -10 v -5 c 0 -0.570312 0.429688 -1 1 -1 z m 0 0"/>
+        <path d="m 12.105469 1.007812 c -2.261719 0 -4.09375 1.847657 -4.09375 4.078126 v 9.828124 c 0 2.230469 1.832031 4.074219 4.09375 4.074219 h 3.894531 v 1.46875 c 0 1.410157 1.132812 2.542969 2.542969 2.542969 h 3.414062 c 1.410157 0 2.542969 -1.132812 2.542969 -2.542969 v -1.46875 h 3.394531 c 2.261719 0 4.09375 -1.84375 4.09375 -4.074219 v -9.828124 c 0 -2.230469 -1.832031 -4.078126 -4.09375 -4.078126 z m 0 1.980469 h 15.789062 c 1.152344 0 2.074219 0.90625 2.074219 2.097657 v 9.828124 c 0 1.191407 -0.921875 2.09375 -2.074219 2.09375 h -15.789062 c -1.152344 0 -2.074219 -0.902343 -2.074219 -2.09375 v -9.828124 c 0 -1.191407 0.921875 -2.097657 2.074219 -2.097657 z m 5.894531 16 h 4.5 v 1.46875 c 0 0.300781 -0.242188 0.542969 -0.542969 0.542969 h -3.414062 c -0.300781 0 -0.542969 -0.242188 -0.542969 -0.542969 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/shell-display-external-only-symbolic.svg b/data/icons/scalable/actions/shell-display-external-only-symbolic.svg
new file mode 100644
index 000000000..7e15ce149
--- /dev/null
+++ b/data/icons/scalable/actions/shell-display-external-only-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 12 1 c -2.265625 0 -4.09375 1.847656 -4.09375 4.074219 v 9.832031 c 0 2.226562 1.828125 4.074219 4.09375 4.074219 h 3.894531 v 1.46875 c 0 1.40625 1.132813 2.539062 2.542969 2.539062 h 3.414062 c 1.40625 0 2.542969 -1.132812 2.542969 -2.539062 v -1.46875 h 3.390625 c 2.265625 0 4.097656 -1.847657 4.097656 -4.074219 v -9.832031 c 0 -2.226563 -1.832031 -4.074219 -4.097656 -4.074219 z m 0 1.980469 h 15.785156 c 1.15625 0 2.078125 0.90625 2.078125 2.09375 v 9.832031 c 0 1.1875 -0.921875 2.09375 -2.078125 2.09375 h -15.785156 c -1.15625 0 -2.074219 -0.90625 -2.074219 -2.09375 v -9.832031 c 0 -1.1875 0.917969 -2.09375 2.074219 -2.09375 z m 5.894531 16 h 4.5 v 1.46875 c 0 0.300781 -0.242187 0.539062 -0.542969 0.539062 h -3.414062 c -0.304688 0 -0.542969 -0.238281 -0.542969 -0.539062 z m 0 0" fill="#241f31"/>
+    <path d="m 4 21 c -1.644531 0 -3 1.355469 -3 3 v 5.585938 l -0.707031 0.707031 c -0.2851565 0.285156 -0.371094 0.714843 -0.214844 1.089843 c 0.152344 0.375 0.515625 0.617188 0.921875 0.617188 h 14 c 0.40625 0 0.769531 -0.242188 0.921875 -0.617188 c 0.15625 -0.375 0.070313 -0.804687 -0.214844 -1.089843 l -0.707031 -0.707031 v -5.585938 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 8 c 0.570312 0 1 0.429688 1 1 v 5 h -10 v -5 c 0 -0.570312 0.429688 -1 1 -1 z m 0 0" fill="#242032" fill-opacity="0.2"/>
+</svg>
diff --git a/data/icons/scalable/actions/shell-display-mirror-symbolic.svg b/data/icons/scalable/actions/shell-display-mirror-symbolic.svg
new file mode 100644
index 000000000..bfc6a054c
--- /dev/null
+++ b/data/icons/scalable/actions/shell-display-mirror-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 7 4.945312 c -2.199219 0 -4 1.800782 -4 4 l -0.003906 11.054688 c 0 2.199219 1.800781 4 4 4 h 2.003906 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -2.003906 c -1.125 0 -2 -0.875 -2 -2 l 0.003906 -11.054688 c 0 -1.125 0.875 -2 2 -2 h 18 c 1.125 0 2 0.875 2 2 l -0.003906 11.054688 c 0 1.125 -0.871094 2 -2 2 h -1.996094 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 h 1.996094 c 2.199218 0 4 -1.800781 4 -4 l 0.003906 -11.054688 c 0 -2.199218 -1.800781 -4 -4 -4 z m 9 14.0625 c -0.484375 0 -0.972656 0.214844 -1.265625 0.644532 l -3.523437 5.136718 c -0.609376 0.890626 0.085937 2.210938 1.164062 2.210938 h 7.257812 c 1.078126 0 1.773438 -1.320312 1.164063 -2.210938 l -3.53125 -5.136718 c -0.296875 -0.429688 -0.78125 -0.644532 -1.265625 -0.644532 z m 0 2.332032 l 2.515625 3.660156 h -5.023437 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/data/org.gnome.Shell-symbolic.Source.svg b/data/org.gnome.Shell-symbolic.Source.svg
index 44ec234e0..345e3a267 100644
--- a/data/org.gnome.Shell-symbolic.Source.svg
+++ b/data/org.gnome.Shell-symbolic.Source.svg
@@ -14,19 +14,116 @@
    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="defs4" /><sodipodi:namedview
+     id="defs4"><inkscape:path-effect
+       effect="join_type"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="4"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect59"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,1.6535329,0,1 @ F,0,1,1,0,1.6535329,0,1 @ F,0,1,1,0,1.6535329,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect61"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="3.7816264"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect63"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="4"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect65"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="4"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect67"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="4"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect69"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="4"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect83"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="4.0423292"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect85"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="4"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /><inkscape:path-effect
+       effect="join_type"
+       id="path-effect69-3"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="round"
+       line_width="1.9999956"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" /></defs><sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="46"
-     inkscape:cy="369.5"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="80.875338"
+     inkscape:cy="361.95028"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
-     showgrid="true"
+     showgrid="false"
      units="px"
      inkscape:window-width="2560"
      inkscape:window-height="1531"
@@ -61,7 +158,7 @@
        spacingy="1"
        spacingx="1"
        units="px"
-       visible="true" /></sodipodi:namedview><g
+       visible="false" /></sodipodi:namedview><g
      inkscape:label="status"
      inkscape:groupmode="layer"
      id="layer1"
@@ -238,7 +335,7 @@
          y="184"
          style="font-size:16px;fill:#241f31;fill-opacity:1">actions</tspan></text><g
        id="g13439"
-       transform="matrix(-1,0,0,1,111.99998,-144)"
+       transform="matrix(-1,0,0,1,111.99998,-84)"
        inkscape:label="overview next right forward"><title
          id="title15446">carousel-arrow-next</title><path
          style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
@@ -252,7 +349,7 @@
          style="fill:none;stroke-width:0.999999" /></g><g
        id="g29998"
        inkscape:label="mouse pointer dwell click"
-       transform="translate(28,-244)"><title
+       transform="translate(28,-184)"><title
          id="title39373">pointer-secondary-click</title><path
          d="m 16,640 v 19.77148 l -4.24414,-4.14258 c -0.612408,1.21538 -1.173049,2.46023 -1.819709,3.6561 -1.141947,1.47628 -3.975266,0.38901 -3.846009,-1.47361 0.09413,-0.82252 0.594755,-1.52142 0.899969,-2.2776 l 0.896608,-1.92051 H 2.617188 Z m -1.5,3.72656 -8.359375,8.38672 h 4.101563 c -0.885072,1.9032 -1.781799,3.80152 -2.659622,5.70774 -0.0349,0.56609 1.149057,0.98883 1.282093,0.29797 l 2.455699,-5.01348 3.179687,3.10351 z"
          id="path5851"
@@ -265,7 +362,7 @@
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.781;marker:none;enable-background:new" /></g><g
        id="g29992"
        inkscape:label="mouse pointer dwell click"
-       transform="translate(-28,-244)"><title
+       transform="translate(-28,-184)"><title
          id="title39371">pointer-primary-click</title><rect
          width="20"
          height="20"
@@ -278,7 +375,7 @@
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g14643"
        inkscape:label="mouse pointer dwell click drag"
-       transform="translate(0,-244)"><title
+       transform="translate(0,-184)"><title
          id="title39369">pointer-drag</title><rect
          width="20"
          height="20"
@@ -291,7 +388,7 @@
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g30454"
        inkscape:label="mouse pointer dwell click double"
-       transform="translate(0,-244)"><title
+       transform="translate(0,-184)"><title
          id="title39367">pointer-double-click</title><rect
          width="20"
          height="20"
@@ -316,20 +413,91 @@
          d="m 135.5,462 a 3.515,3.515 0 0 0 -3.5,3.5 c 0,1.385 0.822,2.593 2,3.158 V 472 h 2 v -3.037 A 3.521,3.521 0 0 0 138.963,466 H 141 v -2 h -2.342 a 3.516,3.516 0 0 0 -3.158,-2 z m 25,0 a 3.516,3.516 0 0 0 -3.158,2 H 155 v 2 h 2.037 A 3.521,3.521 0 0 0 160,468.963 V 472 h 2 v -3.342 a 3.516,3.516 0 0 0 2,-3.158 c 0,-1.921 -1.579,-3.5 -3.5,-3.5 z m -25,2 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z m 7.5,0 v 2 h 4 v -2 z m 6,0 v 2 h 4 v -2 z m 11.5,0 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z M 134,474 v 4 h 2 v -4 z m 26,0 v 4 h 2 v -4 z m -26,6 v 3.342 a 3.516,3.516 0 0 0 -2,3.158 c 0,1.921 1.579,3.5 3.5,3.5 a 3.516,3.516 0 0 0 3.158,-2 H 141 v -2 h -2.037 A 3.521,3.521 0 0 0 136,483.037 V 480 Z m 26,0 v 3.037 A 3.521,3.521 0 0 0 157.037,486 H 155 v 2 h 2.342 a 3.516,3.516 0 0 0 3.158,2 c 1.921,0 3.5,-1.579 3.5,-3.5 a 3.516,3.516 0 0 0 -2,-3.158 V 480 Z m -24.5,5 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z m 25,0 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z m -17.5,1 v 2 h 4 v -2 z m 6,0 v 2 h 4 v -2 z"
          id="path2-3"
          style="fill:#241f31;fill-opacity:1" /></g><g
-       id="g4349"
-       transform="translate(-92,-148)"
+       id="g22"
        inkscape:label="screenshooter capture display screen "><title
-         id="title4343">screenshot-ui-display</title><rect
-         width="31.999998"
-         height="31.999998"
-         x="-491.99994"
-         y="-163.99998"
-         id="rect4345"
-         transform="matrix(0,-1,-1,0,0,0)"
-         style="fill:none;stroke-width:1" /><path
-         id="path9443"
-         d="m 136,464 c -1.662,0 -3,1.338 -3,3 v 14 c 0,1.662 1.338,3 3,3 h 10 v 2.99805 h -3.00195 c -1.0901,-7e-5 -1.99805,0.90995 -1.99805,2 H 142.99805 153 155 C 155,487.908 154.09,487.00007 153,487 h -2.99805 v -3 H 160 c 1.662,0 3,-1.338 3,-3 v -14 c 0,-1.662 -1.338,-3 -3,-3 z m 0,2 h 24 c 0.554,0 1,0.446 1,1 v 14 c 0,0.554 -0.446,1 -1,1 h -24 c -0.554,0 -1,-0.446 -1,-1 v -14 c 0,-0.554 0.446,-1 1,-1 z"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         id="title22">screenshot-ui-display</title><g
+         id="g4349"
+         transform="translate(-92,-148)"
+         inkscape:label="screenshooter capture display screen "><title
+           id="title4343">screenshot-ui-display</title><rect
+           width="31.999998"
+           height="31.999998"
+           x="-491.99994"
+           y="-163.99998"
+           id="rect4345"
+           transform="matrix(0,-1,-1,0,0,0)"
+           style="fill:none;stroke-width:1" /></g><path
+         id="path22-6"
+         style="color:#000000;display:inline;fill:#241f31;fill-opacity:1;stroke-width:1.01058;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         d="m 45,315 c -2.263717,0 -4.095702,1.84635 -4.095702,4.07617 v 13.82812 c 0,2.22982 1.831985,4.07422 4.095702,4.07422 h 5.892581 v 2.46875 c 0,1.40837 1.134592,2.54297 2.542968,2.54297 h 5.414062 c 1.408371,0 2.542968,-1.1346 2.542968,-2.54297 v -2.46875 h 5.392579 c 2.263716,0 4.095702,-1.8444 4.095702,-4.07422 V 319.07617 C 70.88086,316.84635 69.048874,315 66.785158,315 Z m 0,1.97851 h 21.785158 c 1.155876,0 2.076169,0.90787 2.076169,2.09766 v 13.82812 c 0,1.18978 -0.920293,2.09571 -2.076169,2.09571 H 45 c -1.155875,0 -2.076171,-0.90593 -2.076171,-2.09571 v -13.82812 c 0,-1.18979 0.920296,-2.09766 2.076171,-2.09766 z m 7.892578,20 h 6.5 v 2.46875 c 0,0.30143 -0.241543,0.54297 -0.542967,0.54297 h -5.414062 c -0.301429,0 -0.542971,-0.24154 -0.542971,-0.54297 z"
+         sodipodi:nodetypes="sssscsssscssssssssssssssccssssc" /></g><g
+       id="g47"
+       inkscape:label="display mirror"
+       transform="matrix(0.5,0,0,0.5,-40,4.7402)"
+       style="display:inline;stroke-width:2"><title
+         id="title47">shell-display-mirror</title><rect
+         style="display:inline;fill:none;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
+         id="rect47"
+         width="64"
+         height="64"
+         x="80"
+         y="694.51965" /><path
+         style="color:#000000;fill:#241f31;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+         d="m 172.96094,706.89258 c -4.65133,0 -8.46193,3.81209 -8.46289,8.46289 l -0.004,23.38476 c -9.7e-4,4.65185 3.80961,8.46289 8.46094,8.46289 h 4.23633 a 2.11549,2.11549 0 0 0 2.11523,-2.11523 2.11549,2.11549 0 0 0 -2.11523,-2.11523 h -4.23633 c -2.38055,0 -4.23096,-1.85047 -4.23047,-4.23047 l 0.006,-23.38672 c 4.9e-4,-2.38108 1.84992,-4.23242 4.23047,-4.23242 h 38.07812 c 2.38055,0 4.23292,1.8524 4.23242,4.23242 l -0.006,23.38476 c -4.9e-4,2.38107 -1.84991,4.23243 -4.23046,4.23243 h -4.22657 a 2.11549,2.11549 0 0 0 -2.11523,2.11523 2.11549,2.11549 0 0 0 2.11523,2.11523 h 4.22657 c 4.65132,0 8.45997,-3.81014 8.46093,-8.46093 l 0.006,-23.38672 c 9.7e-4,-4.65185 -3.81156,-8.46289 -8.46289,-8.46289 z M 192,736.63867 c -1.02704,4.5e-4 -2.05429,0.45695 -2.67969,1.36914 l -7.44922,10.86524 c -1.29025,1.88193 0.18114,4.67578 2.46289,4.67578 h 15.34961 c 2.28197,0 3.75296,-2.79481 2.46094,-4.67578 l -7.46484,-10.86719 c -0.6262,-0.91164 -1.65265,-1.36764 -2.67969,-1.36719 z m 0.002,4.93945 5.31641,7.74024 h -10.62305 z"
+         id="path47"
+         transform="matrix(0.9454066,0,0,0.9454066,-69.518062,36.109126)" /></g><g
+       id="g54"
+       inkscape:label="display extend all join displays"
+       transform="matrix(0.5,0,0,0.5,0,4.7402)"
+       style="display:inline;fill:#241f31;fill-opacity:1;stroke-width:2"><title
+         id="title48">shell-display-extend-all</title><rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
+         id="rect48"
+         width="64"
+         height="64"
+         x="80"
+         y="694.51965" /><path
+         id="path48"
+         style="color:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         d="m 88,736.5196 c -3.289397,0 -6,2.7106 -6,6 v 11.17187 l -1.414062,1.41407 A 2.0002,2.0002 0 0 0 82,758.5196 h 28 a 2.0002,2.0002 0 0 0 1.41406,-3.41406 L 110,753.69147 V 742.5196 c 0,-3.2894 -2.7106,-6 -6,-6 z m 0,4 h 16 c 1.14259,0 2,0.85741 2,2 v 10 H 86 v -10 c 0,-1.14259 0.857415,-2 2,-2 z" /><path
+         id="path50"
+         style="color:#000000;stroke-width:2.02116;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         d="m 104.21484,696.53913 c -4.527432,0 -8.191402,3.69271 -8.191402,8.15234 v 19.65625 c 0,4.45963 3.66397,8.14844 8.191402,8.14844 H 112 v 2.9375 c 0,2.81674 2.26919,5.08594 5.08594,5.08594 h 6.82812 c 2.81675,0 5.08594,-2.2692 5.08594,-5.08594 v -2.9375 h 6.78516 c 4.52743,0 8.1914,-3.68881 8.1914,-8.14844 v -19.65625 c 0,-4.45963 -3.66397,-8.15234 -8.1914,-8.15234 z m 0,3.95703 h 31.57032 c 2.31175,0 4.15234,1.81574 4.15234,4.19531 v 19.65625 c 0,2.37956 -1.84059,4.19141 -4.15234,4.19141 h -31.57032 c -2.31175,0 -4.15234,-1.81185 -4.15234,-4.19141 v -19.65625 c 0,-2.37957 1.84059,-4.19531 4.15234,-4.19531 z m 11.78516,32 h 9 v 2.9375 c 0,0.60285 -0.48309,1.08594 -1.08594,1.08594 h -6.82812 c -0.60286,0 -1.08594,-0.48309 -1.08594,-1.08594 z" /><g
+         id="g23" /></g><g
+       id="g78"
+       inkscape:label="display extend all join displays"
+       transform="matrix(0.5,0,0,0.5,40,4.7402)"
+       style="display:inline;fill:#241f31;fill-opacity:1;stroke-width:2"><title
+         id="title75">shell-display-external-only</title><path
+         id="path22-61"
+         style="color:#000000;display:inline;fill:#241f31;fill-opacity:1;stroke-width:2.02116;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         d="m 104,696.5196 c -4.52744,0 -8.1914,3.69272 -8.1914,8.15234 v 19.65626 c 0,4.45962 3.66396,8.14844 8.1914,8.14844 h 7.78516 v 2.9375 c 0,2.81672 2.26918,5.08592 5.08594,5.08592 h 6.82812 c 2.81674,0 5.08594,-2.26918 5.08594,-5.08592 v -2.9375 h 6.78516 c 4.52744,0 8.1914,-3.68882 8.1914,-8.14844 v -19.65626 c 0,-4.45962 -3.66396,-8.15234 -8.1914,-8.15234 z m 0,3.95704 h 31.57032 c 2.31176,0 4.15234,1.81574 4.15234,4.1953 v 19.65626 c 0,2.37954 -1.84058,4.1914 -4.15234,4.1914 H 104 c -2.31174,0 -4.15234,-1.81186 -4.15234,-4.1914 v -19.65626 c 0,-2.37956 1.8406,-4.1953 4.15234,-4.1953 z m 11.78516,32 h 9 v 2.9375 c 0,0.60284 -0.48308,1.08592 -1.08594,1.08592 h -6.82812 c -0.60286,0 -1.08594,-0.48308 -1.08594,-1.08592 z" /><rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
+         id="rect75"
+         width="64"
+         height="64"
+         x="80"
+         y="694.51965" /><path
+         id="path48-7"
+         style="color:#000000;fill:#242032;fill-opacity:0.2;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         d="m 88,736.5196 c -3.289399,0 -6,2.7106 -6,6 v 11.17187 l -1.414062,1.41407 A 2.0002,2.0002 0 0 0 82,758.5196 h 28 a 2.0002,2.0002 0 0 0 1.41406,-3.41406 L 110,753.69147 V 742.5196 c 0,-3.2894 -2.7106,-6 -6,-6 z m 0,4 h 16 c 1.14259,0 2,0.85741 2,2 v 10 H 86 v -10 c 0,-1.14259 0.857408,-2 2,-2 z" /></g><g
+       id="g88"
+       inkscape:label="display extend all join displays"
+       transform="matrix(0.5,0,0,0.5,80,4.7402)"
+       style="display:inline;stroke-width:2"><title
+         id="title85">shell-display-built-in-only</title><path
+         id="path22-61-8"
+         style="color:#000000;display:inline;fill:#242032;fill-opacity:0.2;stroke-width:2.022;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+         d="m 104.20783,696.5196 c -4.529457,0 -8.195045,3.69436 -8.195045,8.15596 v 19.665 c 0,4.4616 3.665588,8.15206 8.195045,8.15206 h 7.78862 v 2.9388 c 0,2.81797 2.27019,5.08818 5.0882,5.08818 h 6.83115 c 2.81798,0 5.08819,-2.27019 5.08819,-5.08818 v -2.9388 h 6.78819 c 4.52944,0 8.19504,-3.69046 8.19504,-8.15206 v -19.665 c 0,-4.4616 -3.6656,-8.15596 -8.19504,-8.15596 z m 0,3.9588 h 31.58435 c 2.31278,0 4.15417,1.81654 4.15417,4.19716 v 19.665 c 0,2.38059 -1.84139,4.19326 -4.15417,4.19326 h -31.58435 c -2.31277,0 -4.15419,-1.81267 -4.15419,-4.19326 v -19.665 c 0,-2.38062 1.84142,-4.19716 4.15419,-4.19716 z m 11.7904,32.01422 h 9.00399 v 2.9388 c 0,0.60311 -0.48329,1.0864 -1.08642,1.0864 h -6.83115 c -0.60313,0 -1.08642,-0.48329 -1.08642,-1.0864 z" /><path
+         id="path48-9"
+         style="color:#000000;display:inline;fill:#241f31;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         d="m 88,736.5196 c -3.2894,0 -6,2.7106 -6,6 v 11.17186 l -1.41406,1.41408 A 2.0002,2.0002 0 0 0 82,758.5196 h 28 a 2.0002,2.0002 0 0 0 1.41406,-3.41406 L 110,753.69146 V 742.5196 c 0,-3.2894 -2.7106,-6 -6,-6 z m 0,4 h 16 c 1.14258,0 2,0.8574 2,2 v 10 H 86 v -10 c 0,-1.1426 0.8574,-2 2,-2 z" /><rect
+         style="display:inline;fill:none;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
+         id="rect85"
+         width="64"
+         height="64"
+         x="80"
+         y="694.51965" /></g><g
        id="g4445"
        transform="translate(-52,-148)"
        inkscape:label="screenshooter capture windows"><title
@@ -361,7 +529,7 @@
          style="fill:none;stroke-width:1" /></g><g
        id="g42429"
        inkscape:label="screenshooter capture display screen "
-       transform="translate(-80,-235.53331)"><title
+       transform="translate(-80,-175.53331)"><title
          id="title42423">screenshot-ui-show-pointer</title><rect
          transform="scale(-1,1)"
          y="663.53333"
@@ -373,7 +541,7 @@
          d="m 82.95312,664.60753 2.41797,13.21094 3.23828,-2.39844 2.05469,2.64844 c 1.03125,1.43359 3.14844,-0.21094 2.01172,-1.5625 l -2.01562,-2.59375 2.98437,-2.17579 z m 0,0"
          fill="#2e3436"
          id="path2-35" /></g><g
-       transform="matrix(-1,0,0,1,196.0059,-35)"
+       transform="matrix(-1,0,0,1,196.0059,25)"
        inkscape:label="menu item check radio"
        id="g4179-7-8"><title
          id="title146367">ornament-dot-unchecked</title><rect
@@ -388,7 +556,7 @@
          style="fill:#2e3435;fill-opacity:0.2" /></g><g
        id="g13"
        inkscape:label="window close exit"
-       transform="translate(-64,60)"><title
+       transform="translate(-64,120)"><title
          id="title13">preview-close</title><g
          id="g14227"
          transform="translate(-71.999987,-167.99997)"
@@ -405,7 +573,7 @@
          d="m 71,302 a 1,1 0 0 0 -0.707031,0.29297 1,1 0 0 0 0,1.41406 L 74.585938,308 l -4.292969,4.29297 a 1,1 0 0 0 0,1.41406 1,1 0 0 0 1.414062,0 L 76,309.41406 l 4.292969,4.29297 a 1,1 0 0 0 1.414062,0 1,1 0 0 0 0,-1.41406 L 77.414062,308 l 4.292969,-4.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 81,302 1,1 0 0 0 80.292969,302.29297 L 76,306.58594 71.707031,302.29297 A 1,1 0 0 0 71,302 Z"
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g691"
-       transform="translate(-3.999992,-144)"
+       transform="translate(-3.999992,-84)"
        inkscape:label="overview previous left backward"><title
          id="title685">carousel-arrow-previous</title><path
          style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
@@ -571,7 +739,7 @@
          style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
          d="m 157.75,476 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
          sodipodi:nodetypes="sssssssss" /></g><g
-       transform="matrix(-1,0,0,1,216.0059,-35)"
+       transform="matrix(-1,0,0,1,216.0059,25)"
        inkscape:label="menu item check radio"
        id="g12"><title
          id="title10">ornament-check</title><rect
@@ -585,7 +753,8 @@
          fill="#2e3436"
          id="path1-3" /></g><g
        id="g21"
-       inkscape:label="menu item check radio"><title
+       inkscape:label="menu item check radio"
+       transform="translate(0,60)"><title
          id="title21">ornament-dot-checked</title><path
          id="path9555"
          d="m 8.006,457 c 1.65555,0 3,1.34444 3,3 0,1.65555 -1.34445,3 -3,3 -1.65555,0 -3,-1.34445 -3,-3 0,-1.65556 1.34445,-3 3,-3 z"
diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js
index 42f580736..36a41111b 100644
--- a/js/ui/switchMonitor.js
+++ b/js/ui/switchMonitor.js
@@ -15,7 +15,7 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
         let items = [];
 
         items.push({
-            icon: 'view-mirror-symbolic',
+            icon: 'shell-display-mirror-symbolic',
             /* Translators: this is for display mirroring i.e. cloning.
              * Try to keep it under around 15 characters.
              */
@@ -24,7 +24,7 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
         });
 
         items.push({
-            icon: 'video-joined-displays-symbolic',
+            icon: 'shell-display-extend-all-symbolic',
             /* Translators: this is for the desktop spanning displays.
              * Try to keep it under around 15 characters.
              */
@@ -34,15 +34,15 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
 
         if (global.backend.get_monitor_manager().has_builtin_panel) {
             items.push({
-                icon: 'video-single-display-symbolic',
-                /* Translators: this is for using only an external display.
+                icon: 'shell-display-external-only-symbolic',
+                /* Translators: this is for using only external displays.
                  * Try to keep it under around 15 characters.
                  */
                 label: _('External Only'),
                 configType: Meta.MonitorSwitchConfigType.EXTERNAL,
             });
             items.push({
-                icon: 'computer-symbolic',
+                icon: 'shell-display-built-in-only-symbolic',
                 /* Translators: this is for using only the laptop display.
                  * Try to keep it under around 15 characters.
                  */