diff --git a/gnome-shell/upstream/data/gnome-shell-icons.gresource.xml b/gnome-shell/upstream/data/gnome-shell-icons.gresource.xml
index db65673b41..f15d0c0e81 100644
--- a/gnome-shell/upstream/data/gnome-shell-icons.gresource.xml
+++ b/gnome-shell/upstream/data/gnome-shell-icons.gresource.xml
@@ -37,6 +37,7 @@
     <file preprocess="xml-stripblanks">scalable/actions/shell-focus-top-bar-symbolic-rtl.svg</file>
     <file preprocess="xml-stripblanks">scalable/actions/shell-focus-windows-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/background-app-ghost-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/check-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-high-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-medium-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-off-symbolic.svg</file>
@@ -45,6 +46,7 @@
     <file preprocess="xml-stripblanks">scalable/status/keyboard-hide-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-layout-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-shift-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/keyboard-zwnj-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/message-indicator-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/no-notifications-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/screen-privacy-disabled-symbolic.svg</file>
diff --git a/gnome-shell/upstream/data/icons/hicolor/scalable/apps/org.gnome.Shell.CaptivePortal.svg b/gnome-shell/upstream/data/icons/hicolor/scalable/apps/org.gnome.Shell.CaptivePortal.svg
new file mode 100644
index 0000000000..3a05fcde6b
--- /dev/null
+++ b/gnome-shell/upstream/data/icons/hicolor/scalable/apps/org.gnome.Shell.CaptivePortal.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <linearGradient id="a" gradientTransform="matrix(0.409876 -0.0955931 0.0955931 0.409876 54.804951 57.342529)" gradientUnits="userSpaceOnUse" x1="-129.163696" x2="129.993073" y1="64.190842" y2="124.632477">
+        <stop offset="0" stop-color="#b6b6b9"/>
+        <stop offset="0.0880388" stop-color="#77767b"/>
+        <stop offset="0.404541" stop-color="#77767b"/>
+        <stop offset="0.5" stop-color="#aaaaad"/>
+        <stop offset="0.605913" stop-color="#5c5b5f"/>
+        <stop offset="0.897286" stop-color="#616064"/>
+        <stop offset="0.9648" stop-color="#c8c8c9"/>
+        <stop offset="1" stop-color="#77767b"/>
+    </linearGradient>
+    <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="24" x2="104.182137" y1="72" y2="72">
+        <stop offset="0" stop-color="#e66100"/>
+        <stop offset="0.0650497" stop-color="#e66100"/>
+        <stop offset="0.114985" stop-color="#e66100"/>
+        <stop offset="0.185686" stop-color="#e66100"/>
+        <stop offset="0.242855" stop-color="#e66100"/>
+        <stop offset="0.317234" stop-color="#e66100"/>
+        <stop offset="0.44832" stop-color="#e66100"/>
+        <stop offset="0.502445" stop-color="#ffb780"/>
+        <stop offset="0.563268" stop-color="#e66100"/>
+        <stop offset="0.719163" stop-color="#e66100"/>
+        <stop offset="0.796271" stop-color="#e66100"/>
+        <stop offset="0.857009" stop-color="#e66100"/>
+        <stop offset="1" stop-color="#e66100"/>
+    </linearGradient>
+    <linearGradient id="c" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#bb5e00"/>
+        <stop offset="0.0530386" stop-color="#ffa954"/>
+        <stop offset="0.117718" stop-color="#eb7400"/>
+        <stop offset="0.25693" stop-color="#9a4c00"/>
+        <stop offset="0.592964" stop-color="#ff9d40"/>
+        <stop offset="0.874885" stop-color="#d36900"/>
+        <stop offset="0.934563" stop-color="#ffc080"/>
+        <stop offset="1" stop-color="#ae5700"/>
+    </linearGradient>
+    <linearGradient id="d" x1="38.373528" x2="89.688972" xlink:href="#c" y1="56" y2="56"/>
+    <linearGradient id="e" x1="25.382807" x2="104" xlink:href="#c" y1="54.150375" y2="56"/>
+    <path d="m 110.65625 99.722656 l -37.371094 21.601563 c -5.785156 3.34375 -12.917968 3.351562 -18.714844 0.023437 l -36.867187 -21.164062 c -5.796875 -3.328125 -9.382813 -9.492188 -9.414063 -16.175782 l -0.179687 -39.480468 c -0.03125 -6.683594 3.5 -12.878906 9.269531 -16.257813 l 36.679688 -21.488281 c 5.769531 -3.378906 12.898437 -3.429688 18.714844 -0.132812 l 37.554687 21.273437 c 5.8125 3.292969 9.417969 9.441406 9.445313 16.121094 l 0.183593 39.480469 c 0.027344 6.675781 -3.519531 12.859374 -9.300781 16.199218 z m 0 0" fill="url(#a)"/>
+    <path d="m 110.65625 95.722656 l -37.371094 21.601563 c -5.785156 3.34375 -12.917968 3.351562 -18.714844 0.023437 l -36.867187 -21.164062 c -5.796875 -3.328125 -9.382813 -9.492188 -9.414063 -16.175782 l -0.179687 -39.480468 c -0.03125 -6.683594 3.5 -12.878906 9.269531 -16.257813 l 36.679688 -21.488281 c 5.769531 -3.378906 12.898437 -3.429688 18.714844 -0.132812 l 37.554687 21.273437 c 5.8125 3.292969 9.417969 9.441406 9.445313 16.121094 l 0.183593 39.480469 c 0.027344 6.675781 -3.519531 12.859374 -9.300781 16.199218 z m 0 0" fill="#f6f5f4"/>
+    <path d="m 64.195312 74.0625 c -4.949218 0.003906 -8.964843 4.015625 -8.964843 8.96875 s 4.015625 8.96875 8.964843 8.96875 c 4.957032 0 8.972657 -4.015625 8.96875 -8.96875 c 0 -4.953125 -4.015624 -8.96875 -8.96875 -8.96875 z m 0 0" fill="url(#b)"/>
+    <path d="m 64.03125 53.421875 c -8.753906 0 -17.507812 3.324219 -24.15625 9.972656 c -2.003906 2 -2.003906 5.246094 0 7.25 c 2 2 5.246094 2 7.25 0 c 9.378906 -9.382812 24.433594 -9.386719 33.816406 -0.003906 c 2 2 5.246094 2.003906 7.246094 0.003906 c 2.003906 -2.003906 2.003906 -5.25 0 -7.25 c -6.648438 -6.648437 -15.402344 -9.972656 -24.15625 -9.972656 z m 0 0" fill="url(#d)"/>
+    <path d="m 64.03125 32.925781 c -14 -0.003906 -27.996094 5.324219 -38.648438 15.976563 c -2.003906 2 -2.003906 5.246094 0 7.246094 c 2 2.003906 5.246094 2 7.246094 0 c 17.386719 -17.386719 45.417969 -17.386719 62.804688 0 c 2 2 5.246094 2 7.246094 0 c 2.003906 -2 2.003906 -5.246094 0 -7.246094 c -10.648438 -10.652344 -24.648438 -15.980469 -38.648438 -15.976563 z m 0 0" fill="url(#e)"/>
+    <path d="m 64.03125 30.921875 c -14 0 -27.996094 5.328125 -38.648438 15.980469 c -2.003906 2 -2.003906 5.246094 0 7.246094 c 2 2.003906 5.246094 2 7.246094 0 c 17.386719 -17.386719 45.417969 -17.386719 62.804688 0 c 2 2 5.246094 2 7.246094 0 c 2.003906 -2 2.003906 -5.246094 0 -7.246094 c -10.648438 -10.652344 -24.648438 -15.980469 -38.648438 -15.980469 z m 0 20.5 c -8.753906 0 -17.507812 3.324219 -24.15625 9.972656 c -2.003906 2 -2.003906 5.246094 0 7.246094 c 2 2.003906 5.246094 2.003906 7.25 0 c 9.378906 -9.378906 24.433594 -9.382813 33.816406 0 c 2 2 5.246094 2.003906 7.246094 0 c 2.003906 -2 2.003906 -5.246094 0 -7.246094 c -6.648438 -6.648437 -15.402344 -9.972656 -24.15625 -9.972656 z m 0.164062 20.640625 c -4.949218 0.003906 -8.964843 4.015625 -8.964843 8.96875 s 4.015625 8.96875 8.964843 8.96875 c 4.957032 0 8.972657 -4.015625 8.96875 -8.96875 c 0 -4.953125 -4.015624 -8.96875 -8.96875 -8.96875 z m 0 0" fill="#ffa348"/>
+</svg>
diff --git a/gnome-shell/upstream/data/icons/hicolor/symbolic/apps/org.gnome.Shell.CaptivePortal-symbolic.svg b/gnome-shell/upstream/data/icons/hicolor/symbolic/apps/org.gnome.Shell.CaptivePortal-symbolic.svg
new file mode 100644
index 0000000000..4c3a49db6a
--- /dev/null
+++ b/gnome-shell/upstream/data/icons/hicolor/symbolic/apps/org.gnome.Shell.CaptivePortal-symbolic.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#5e5c64">
+        <path d="m 3.199219 7.960938 c -0.394531 0.398437 -0.394531 1.042968 0 1.441406 c 0.398437 0.394531 1.042969 0.398437 1.441406 0 c 1.867187 -1.867188 4.859375 -1.867188 6.726563 0 c 0.398437 0.398437 1.042968 0.398437 1.441406 0 c 0.398437 -0.398438 0.398437 -1.042969 0 -1.441406 c -2.644532 -2.644532 -6.964844 -2.644532 -9.609375 0 z m 0 0"/>
+        <path d="m 0.320312 5.078125 c -0.398437 0.398437 -0.398437 1.042969 0 1.441406 c 0.394532 0.398438 1.039063 0.398438 1.4375 0 c 3.457032 -3.457031 9.035157 -3.457031 12.492188 0 c 0.398438 0.398438 1.042969 0.398438 1.441406 0 c 0.398438 -0.398437 0.398438 -1.042969 0 -1.441406 c -4.238281 -4.238281 -11.136718 -4.234375 -15.371094 0 z m 0 0"/>
+        <path d="m 10 12 c 0 1.105469 -0.894531 2 -2 2 s -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 s 2 0.894531 2 2 z m 0 0"/>
+    </g>
+</svg>
diff --git a/gnome-shell/upstream/data/icons/meson.build b/gnome-shell/upstream/data/icons/meson.build
index eff6e4b530..277df017b2 100644
--- a/gnome-shell/upstream/data/icons/meson.build
+++ b/gnome-shell/upstream/data/icons/meson.build
@@ -1 +1,9 @@
-install_subdir('hicolor', install_dir: icondir)
+excluded_icons=[]
+if not have_portal_helper
+  excluded_icons += [
+    'scalable/apps/org.gnome.Shell.CaptivePortal.svg',
+    'symbolic/apps/org.gnome.Shell.CaptivePortal-symbolic.svg',
+  ]
+endif
+install_subdir('hicolor',
+  install_dir: icondir, exclude_files: excluded_icons)
diff --git a/gnome-shell/upstream/data/icons/scalable/status/check-symbolic.svg b/gnome-shell/upstream/data/icons/scalable/status/check-symbolic.svg
new file mode 100644
index 0000000000..27c620d499
--- /dev/null
+++ b/gnome-shell/upstream/data/icons/scalable/status/check-symbolic.svg
@@ -0,0 +1 @@
+<svg height="14" width="14" xmlns="http://www.w3.org/2000/svg"><g style="display:inline;opacity:1"><path style="color:#000;display:inline;fill:#bebebe;fill-opacity:1;stroke-linecap:round;-inkscape-stroke:none" d="M414.145 341.9a1.25 1.25 0 0 0-1.766.092l-5.68 6.305-2.881-2.909a1.25 1.25 0 0 0-1.766 1.77l4.743 4.768 7.442-8.262a1.25 1.25 0 0 0-.092-1.764z" transform="translate(-401 -339)"/></g></svg>
\ No newline at end of file
diff --git a/gnome-shell/upstream/data/icons/scalable/status/keyboard-zwnj-symbolic.svg b/gnome-shell/upstream/data/icons/scalable/status/keyboard-zwnj-symbolic.svg
new file mode 100644
index 0000000000..7204f474c1
--- /dev/null
+++ b/gnome-shell/upstream/data/icons/scalable/status/keyboard-zwnj-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
+</svg>