From bd78dd96a0146221efca082738af2ddd16f190ab Mon Sep 17 00:00:00 2001
From: Preston Bezos <preston@highfidelity.io>
Date: Mon, 17 Jun 2019 11:05:47 -0700
Subject: [PATCH] replaced icons with icons that are on the whole pixel so as
 not to cause blur

---
 .../inputDeviceButton/InputDeviceButton.qml   |  7 +++--
 .../inputDeviceButton/images/mic-clip-i.svg   | 12 ++++----
 .../inputDeviceButton/images/mic-gate-i.svg   | 14 +++++-----
 .../inputDeviceButton/images/mic-mute-a.svg   | 15 ----------
 .../inputDeviceButton/images/mic-mute-i.svg   | 17 +++++------
 .../inputDeviceButton/images/mic-ptt-a.svg    | 17 -----------
 .../inputDeviceButton/images/mic-ptt-i.svg    | 25 ++++++++---------
 .../images/mic-ptt-mute-i.svg                 | 18 ++++++++++++
 .../inputDeviceButton/images/mic-unmute-a.svg | 15 ----------
 .../images/mic-unmute-i-old.svg               |  9 ------
 .../inputDeviceButton/images/mic-unmute-i.svg |  2 +-
 .../simplifiedUI/topBar/SimplifiedTopBar.qml  | 10 +------
 .../topBar/images/desktopMode.svg             |  7 +++--
 .../topBar/images/outputDeviceLoud.svg        | 21 +++++++-------
 .../topBar/images/outputDeviceMuted.svg       | 21 +++++++-------
 .../simplifiedUI/topBar/images/settings.svg   | 28 +++++++++----------
 .../simplifiedUI/topBar/images/vrMode.svg     | 12 ++++----
 17 files changed, 101 insertions(+), 149 deletions(-)
 delete mode 100644 interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg
 delete mode 100644 interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg
 create mode 100644 interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-mute-i.svg
 delete mode 100644 interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg
 delete mode 100644 interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i-old.svg

diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
index 751b3775a7..45c7b3ad5e 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
@@ -33,6 +33,7 @@ Rectangle {
     readonly property string unmutedIcon: "images/mic-unmute-i.svg"
     readonly property string mutedIcon: "images/mic-mute-i.svg"
     readonly property string pushToTalkIcon: "images/mic-ptt-i.svg"
+    readonly property string pushToTalkMutedIcon: "images/mic-ptt-mute-i.svg"
     readonly property string clippingIcon: "images/mic-clip-i.svg"
     readonly property string gatedIcon: "images/mic-gate-i.svg"
     
@@ -114,7 +115,7 @@ Rectangle {
             Image {
                 id: image
                 visible: false
-                source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
+                source: (pushToTalk) ? (pushingToTalk ? pushToTalkIcon : pushToTalkMutedIcon) : muted ? mutedIcon :
                     clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon
                 anchors.fill: parent
             }
@@ -125,7 +126,7 @@ Rectangle {
                 id: imageOverlay
                 anchors { fill: image }
                 source: image
-                color: pushToTalk ? (pushingToTalk ? colors.unmutedColor : colors.mutedColor) : colors.icon
+                color: pushToTalk ? (pushingToTalk ? colors.icon : colors.mutedColor) : colors.icon
             }
 
             OpacityMask {
@@ -169,7 +170,7 @@ Rectangle {
             Image {
                 id: maskImage
                 visible: false
-                source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
+                source: (pushToTalk) ? (pushingToTalk ? pushToTalkIcon : pushToTalkMutedIcon) : muted ? mutedIcon :
                     clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon
                 anchors.top: parent.top
                 anchors.left: parent.left
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg
index cc2c347d6f..f16b9e1a56 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 79.98 110.81" style="enable-background:new 0 0 79.98 110.81;" xml:space="preserve">
+	 viewBox="0 0 16 22" style="enable-background:new 0 0 16 22;" xml:space="preserve">
 <g>
 	<g>
-		<path d="M39.99,50.72c4.92,0,8.94-4.02,8.94-8.94V8.94c0-4.91-4.02-8.94-8.94-8.94c-4.91,0-8.94,4.02-8.94,8.94v32.84
-			C31.05,46.7,35.07,50.72,39.99,50.72z M39.99,73.3c4.94,0,8.94-4,8.94-8.94s-4-8.94-8.94-8.94s-8.94,4-8.94,8.94
-			S35.05,73.3,39.99,73.3z M73.98,39.27c-3.31,0-6,2.69-6,6v5.28c0,16.74-12.56,30.36-27.99,30.36S12,67.29,12,50.55v-5.28
-			c0-3.31-2.69-6-6-6s-6,2.69-6,6v5.28c0,21.2,14.78,38.81,33.99,41.88v6.38H20.76c-3.31,0-6,2.69-6,6s2.69,6,6,6h38.46
-			c3.31,0,6-2.69,6-6s-2.69-6-6-6H45.99v-6.38c19.22-3.08,33.99-20.68,33.99-41.88v-5.28C79.98,41.96,77.3,39.27,73.98,39.27z"/>
+		<path d="M8,10.07c0.98,0,1.79-0.8,1.79-1.77V1.77C9.79,0.8,8.98,0,8,0C7.02,0,6.21,0.8,6.21,1.77v6.52
+			C6.21,9.27,7.02,10.07,8,10.07z M8,14.55c0.99,0,1.79-0.79,1.79-1.77S8.99,11,8,11s-1.79,0.79-1.79,1.77S7.01,14.55,8,14.55z
+			 M14.8,7.8c-0.66,0-1.2,0.53-1.2,1.19v1.05c0,3.32-2.51,6.03-5.6,6.03s-5.6-2.7-5.6-6.03V8.99c0-0.66-0.54-1.19-1.2-1.19
+			S0,8.33,0,8.99v1.05c0,4.21,2.96,7.71,6.8,8.31v1.27H4.15c-0.66,0-1.2,0.53-1.2,1.19c0,0.66,0.54,1.19,1.2,1.19h7.69
+			c0.66,0,1.2-0.53,1.2-1.19c0-0.66-0.54-1.19-1.2-1.19H9.2v-1.27c3.84-0.61,6.8-4.11,6.8-8.31V8.99C16,8.33,15.46,7.8,14.8,7.8z"/>
 	</g>
 </g>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg
index f36461fdd8..56e0e1df57 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 79.98 110.81" style="enable-background:new 0 0 79.98 110.81;" xml:space="preserve">
-<path d="M73.98,39.27c-3.31,0-6,2.69-6,6v5.28c0,16.74-12.56,30.36-27.99,30.36S12,67.29,12,50.55v-5.28c0-3.31-2.69-6-6-6
-	s-6,2.69-6,6v5.28c0,21.2,14.78,38.81,33.99,41.88v6.38H20.76c-3.31,0-6,2.69-6,6s2.69,6,6,6h38.46c3.31,0,6-2.69,6-6s-2.69-6-6-6
-	H45.99v-6.38c19.22-3.08,33.99-20.68,33.99-41.88v-5.28C79.98,41.96,77.3,39.27,73.98,39.27z M39.99,45.59c4.94,0,8.94-4,8.94-8.94
-	s-4-8.94-8.94-8.94s-8.94,4-8.94,8.94S35.05,45.59,39.99,45.59z M39.99,17.88c4.94,0,8.94-4,8.94-8.94S44.93,0,39.99,0
-	s-8.94,4-8.94,8.94S35.05,17.88,39.99,17.88z M39.99,73.3c4.94,0,8.94-4,8.94-8.94s-4-8.94-8.94-8.94s-8.94,4-8.94,8.94
-	S35.05,73.3,39.99,73.3z"/>
+	 viewBox="0 0 16 22" style="enable-background:new 0 0 16 22;" xml:space="preserve">
+<path d="M14.8,7.8c-0.66,0-1.2,0.53-1.2,1.19v1.05c0,3.32-2.51,6.03-5.6,6.03s-5.6-2.7-5.6-6.03V8.99c0-0.66-0.54-1.19-1.2-1.19
+	S0,8.33,0,8.99v1.05c0,4.21,2.96,7.71,6.8,8.31v1.27H4.15c-0.66,0-1.2,0.53-1.2,1.19c0,0.66,0.54,1.19,1.2,1.19h7.69
+	c0.66,0,1.2-0.53,1.2-1.19c0-0.66-0.54-1.19-1.2-1.19H9.2v-1.27c3.84-0.61,6.8-4.11,6.8-8.31V8.99C16,8.33,15.46,7.8,14.8,7.8z
+	 M8,9.05c0.99,0,1.79-0.79,1.79-1.77S8.99,5.5,8,5.5S6.21,6.3,6.21,7.28S7.01,9.05,8,9.05z M8,3.55c0.99,0,1.79-0.79,1.79-1.77
+	S8.99,0,8,0S6.21,0.79,6.21,1.77S7.01,3.55,8,3.55z M8,14.55c0.99,0,1.79-0.79,1.79-1.77S8.99,11,8,11s-1.79,0.79-1.79,1.77
+	S7.01,14.55,8,14.55z"/>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg
deleted file mode 100644
index 09fe385499..0000000000
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 148 148" style="enable-background:new 0 0 148 148;" xml:space="preserve">
-<path d="M23.63,94h4.25l40.39-40.39V38.99c0-4.64-5.91-6.97-9.37-3.68L41.16,52.48C40.13,53.45,38.73,54,37.28,54H23.63
-	c-3.03,0-5.49,2.33-5.49,5.21v29.58C18.15,91.66,20.6,94,23.63,94z M114.35,36.09l1.35-1.35c2.34-2.34,2.34-6.14,0-8.48
-	c-2.34-2.34-6.14-2.34-8.48,0l-87,87c-2.34,2.34-2.34,6.14,0,8.48c1.17,1.17,2.71,1.76,4.24,1.76c1.54,0,3.07-0.59,4.24-1.76
-	l19.45-19.45l10.75,10.4c3.46,3.28,9.37,0.96,9.37-3.68V82.17l16.92-16.92c2.12,2.38,3.35,5.49,3.35,8.75
-	c0,4.67-2.52,9.04-6.57,11.38c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47
-	C91.68,87.85,95.54,81.16,95.54,74c0-5.14-1.99-10.02-5.4-13.7l7.37-7.37c5.25,5.7,8.19,13.13,8.19,21.07
-	c0,11.09-5.97,21.44-15.58,27c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47
-	c11.77-6.81,19.08-19.48,19.08-33.06c0-9.82-3.67-19.01-10.23-26.02l6.94-6.94c8.59,8.78,13.45,20.55,13.45,32.96
-	c0,16.77-9.03,32.41-23.56,40.83c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47
-	c16.69-9.66,27.05-27.63,27.05-46.89C129.85,59.72,124.25,46.18,114.35,36.09z"/>
-</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg
index 658f129817..a00b7f9a9c 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 98.99 110.81" style="enable-background:new 0 0 98.99 110.81;" xml:space="preserve">
-<path d="M69.82,53.14V37.72l27.41-27.41c2.34-2.34,2.34-6.14,0-8.48s-6.14-2.34-8.48,0l-87,87c-2.34,2.34-2.34,6.14,0,8.48
-	c1.17,1.17,2.71,1.76,4.24,1.76s3.07-0.59,4.24-1.76L24.3,83.25c5.45,4.75,12.09,7.99,19.38,9.16v6.4H30.4c-3.31,0-6,2.69-6,6
-	s2.69,6,6,6h38.46c3.31,0,6-2.69,6-6s-2.69-6-6-6H55.67v-6.38c19.22-3.07,33.99-20.68,33.99-41.88v-5.28c0-3.31-2.69-6-6-6
-	s-6,2.69-6,6v5.28c0,0.12,0,0.25,0,0.37C77.5,65.26,68.12,77.24,55.67,80.2v-7.82C63.85,69.8,69.82,62.14,69.82,53.14z M43.67,80.19
-	c-4.01-0.95-7.7-2.85-10.87-5.45l5.2-5.2c1.71,1.23,3.62,2.18,5.67,2.83V80.19z M49.67,0L49.67,0C38.59,0,29.52,9.07,29.52,20.15
-	v29.31l38.2-38.2C64.42,4.61,57.57,0,49.67,0z M22.26,56.72c-0.38-2-0.58-4.06-0.58-6.18v-5.28c0-3.31-2.69-6-6-6s-6,2.69-6,6v5.28
-	c0,5.6,1.04,10.95,2.92,15.85L22.26,56.72z"/>
+	 viewBox="0 0 20 22" style="enable-background:new 0 0 20 22;" xml:space="preserve">
+<path d="M14.11,10.55V7.49l5.54-5.44c0.47-0.46,0.47-1.22,0-1.68c-0.47-0.46-1.24-0.46-1.71,0L0.35,17.64
+	c-0.47,0.46-0.47,1.22,0,1.68c0.24,0.23,0.55,0.35,0.86,0.35s0.62-0.12,0.86-0.35l2.84-2.79c1.1,0.94,2.44,1.59,3.92,1.82v1.27H6.14
+	c-0.67,0-1.21,0.53-1.21,1.19c0,0.66,0.54,1.19,1.21,1.19h7.77c0.67,0,1.21-0.53,1.21-1.19c0-0.66-0.54-1.19-1.21-1.19h-2.66v-1.27
+	c3.88-0.61,6.87-4.11,6.87-8.31V8.99c0-0.66-0.54-1.19-1.21-1.19c-0.67,0-1.21,0.53-1.21,1.19v1.05c0,0.02,0,0.05,0,0.07
+	c-0.03,2.85-1.93,5.23-4.44,5.81v-1.55C12.9,13.86,14.11,12.34,14.11,10.55z M8.82,15.92c-0.81-0.19-1.56-0.57-2.2-1.08l1.05-1.03
+	c0.35,0.24,0.73,0.43,1.15,0.56V15.92z M10.04,0L10.04,0C7.8,0,5.97,1.8,5.97,4v5.82l7.72-7.58C13.02,0.92,11.63,0,10.04,0z
+	 M4.5,11.26c-0.08-0.4-0.12-0.81-0.12-1.23V8.99c0-0.66-0.54-1.19-1.21-1.19S1.96,8.33,1.96,8.99v1.05c0,1.11,0.21,2.17,0.59,3.15
+	L4.5,11.26z"/>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg
deleted file mode 100644
index 3ce7c0ca51..0000000000
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Art" width="27.121" height="40.121" version="1.1" viewBox="0 0 27.121 40.121" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <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>mic-ptt-a</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <defs>
-  <style>.cls-1{fill-rule:evenodd;}</style>
- </defs>
- <title>mic-ptt-a</title>
- <path class="cls-1" d="m23.1 5.2112-1.85 1.85a13.19 13.19 0 0 0-9.82-4.46 13.35 13.35 0 0 0-9.58 4.2l-1.85-1.84a15.66 15.66 0 0 1 23.1 0.25zm-6.13 6.13 1.85-1.85a9.62 9.62 0 0 0-14.53-0.25l1.84 1.88a7.34 7.34 0 0 1 5.3-2.44 6.85 6.85 0 0 1 5.54 2.66zm-5.39-0.22a3.58 3.58 0 0 1 1.51 0.3 3.68 3.68 0 0 1 1.26 0.88 3.88 3.88 0 0 1 0.84 1.3 3.94 3.94 0 0 1 0.29 1.52v5.07a1.91 1.91 0 0 1 0.48-0.05 3.93 3.93 0 0 1 2.62 1.05 3.38 3.38 0 0 1 1.5-0.32 3.27 3.27 0 0 1 2.77 1.36 2.75 2.75 0 0 1 0.85-0.1 3.35 3.35 0 0 1 1.33 0.25 3.18 3.18 0 0 1 1.12 0.76 3.23 3.23 0 0 1 0.73 1.13 3.32 3.32 0 0 1 0.24 1.32v3.31a12.27 12.27 0 0 1-0.43 3.41l-1.36 5.65a2.67 2.67 0 0 1-1 1.55 2.89 2.89 0 0 1-1.75 0.61h-11a4.47 4.47 0 0 1-1.76-0.43 3.88 3.88 0 0 1-1.36-1.12l-5.78-7.75a3.72 3.72 0 0 1-0.8-2.35 3.64 3.64 0 0 1 0.28-1.5 3.75 3.75 0 0 1 0.84-1.27 3.9 3.9 0 0 1 2.77-1.18 4.5 4.5 0 0 1 2 0.54v-10.06a4.06 4.06 0 0 1 1.13-2.78 3.74 3.74 0 0 1 1.25-0.83 3.85 3.85 0 0 1 1.43-0.27zm0 2a1.89 1.89 0 0 0-0.74 0.12 2 2 0 0 0-1.06 1 1.92 1.92 0 0 0-0.15 0.74v15.35l-2.32-3.06a2 2 0 0 0-0.7-0.59 1.88 1.88 0 0 0-0.9-0.2 1.85 1.85 0 0 0-0.74 0.15 2 2 0 0 0-0.63 0.43 2 2 0 0 0-0.4 0.63 1.9 1.9 0 0 0-0.13 0.74 2 2 0 0 0 0.38 1.17l5.86 7.79a1.79 1.79 0 0 0 0.68 0.57 1.74 1.74 0 0 0 0.85 0.16h11a1.23 1.23 0 0 0 0.59-0.15 0.88 0.88 0 0 0 0.24-0.23 0.71 0.71 0 0 0 0.13-0.31l1.37-5.6a12 12 0 0 0 0.37-3v-3.28a1.7 1.7 0 0 0-0.43-1.07 1.31 1.31 0 0 0-0.47-0.37 1.35 1.35 0 0 0-0.59-0.11 1.46 1.46 0 0 0-0.55 0.11 1.23 1.23 0 0 0-0.46 0.32 1.64 1.64 0 0 0-0.43 1.07h-0.48v-1a1.52 1.52 0 0 0-0.12-0.66 1.61 1.61 0 0 0-0.37-0.56 1.63 1.63 0 0 0-1.22-0.54 2 2 0 0 0-1.23 0.54 1.77 1.77 0 0 0-0.36 0.53 1.57 1.57 0 0 0-0.11 0.64v1h-0.49v-1.33a2.22 2.22 0 0 0-0.58-1.44 1.71 1.71 0 0 0-0.62-0.44 1.88 1.88 0 0 0-0.79-0.12 2 2 0 0 0-0.74 0.13 1.85 1.85 0 0 0-0.63 0.41 2 2 0 0 0-0.53 1.36v1.5h-0.57v-10.4a2 2 0 0 0-0.54-1.44 1.75 1.75 0 0 0-0.63-0.44 1.73 1.73 0 0 0-0.76-0.12z" fill-rule="evenodd"/>
-</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg
index 6f7e606982..7dd65c96a0 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 72.2 112.75" style="enable-background:new 0 0 72.2 112.75;" xml:space="preserve">
-<path d="M3.58,18.63c1.67,0.97,3.81,0.4,4.78-1.27C12.06,10.97,18.94,7,26.32,7c7.38,0,14.26,3.97,17.96,10.36
-	c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47c1.67-0.97,2.24-3.11,1.28-4.78C45.39,5.31,36.19,0,26.33,0
-	S7.27,5.31,2.32,13.85C1.34,15.52,1.91,17.66,3.58,18.63z M66.38,62.7c-2.15,0-4.13,1.2-5.16,3.13c-0.04,0.07-0.4,0.7-1.17,0.7
-	c-0.96,0-1.26-1.21-1.32-1.49c-0.25-3.02-2.78-5.37-5.81-5.37c-2.18,0-4.17,1.22-5.22,3.27c0,0.01-0.29,0.57-1.11,0.57
-	c-1.03,0-1.26-0.87-1.3-1.38c-0.18-3.08-2.74-5.5-5.82-5.5c-2.17,0-4.16,1.21-5.2,3.21c0,0.01-0.34,0.65-1.15,0.65
-	c-0.71,0-1.29-0.58-1.29-1.29V32.55c0-2.88-2.16-5.35-4.91-5.61c-1.55-0.15-3.04,0.34-4.19,1.39c-1.13,1.03-1.78,2.5-1.78,4.03v45.1
-	c0,0.6-0.33,1.09-0.88,1.32s-1.13,0.11-1.56-0.31L9.43,69.4c-2.04-2.04-5.31-2.26-7.44-0.49c-1.2,1-1.91,2.4-1.98,3.94
-	c-0.07,1.49,0.48,2.95,1.51,4.03l16,21.13c1.92,3.08,10.24,10.26,12.47,11.31c4.16,2.25,8.85,3.43,13.58,3.43
-	c5.82,0,11.43-1.75,16.15-5.01C67.42,103,72.2,94.4,72.2,85.31V68.54C72.23,65.32,69.61,62.7,66.38,62.7z M26.32,11.99
-	c-5.38,0-10.4,2.89-13.1,7.55c-0.97,1.67-0.4,3.81,1.28,4.78c1.67,0.97,3.81,0.4,4.78-1.28c1.45-2.51,4.15-4.06,7.04-4.06
-	s5.59,1.56,7.04,4.06c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47c1.67-0.97,2.24-3.11,1.28-4.78
-	C36.72,14.88,31.7,11.99,26.32,11.99z"/>
+	 viewBox="0 0 14 22" style="enable-background:new 0 0 14 22;" xml:space="preserve">
+<path d="M0.69,3.64c0.32,0.19,0.74,0.08,0.93-0.25C2.34,2.14,3.67,1.37,5.1,1.37s2.77,0.77,3.48,2.02c0.13,0.22,0.35,0.34,0.59,0.34
+	c0.12,0,0.23-0.03,0.34-0.09C9.84,3.45,9.95,3.03,9.76,2.7C8.8,1.04,7.02,0,5.11,0s-3.7,1.04-4.66,2.7
+	C0.26,3.03,0.37,3.45,0.69,3.64z M12.87,12.23c-0.42,0-0.8,0.23-1,0.61c-0.01,0.01-0.08,0.14-0.23,0.14c-0.19,0-0.24-0.24-0.26-0.29
+	c-0.05-0.59-0.54-1.05-1.13-1.05c-0.42,0-0.81,0.24-1.01,0.64c0,0-0.06,0.11-0.22,0.11c-0.2,0-0.24-0.17-0.25-0.27
+	c-0.03-0.6-0.53-1.07-1.13-1.07c-0.42,0-0.81,0.24-1.01,0.63c0,0-0.07,0.13-0.22,0.13c-0.14,0-0.25-0.11-0.25-0.25v-5.2
+	c0-0.56-0.42-1.04-0.95-1.09c-0.3-0.03-0.59,0.07-0.81,0.27c-0.22,0.2-0.35,0.49-0.35,0.79v8.8c0,0.12-0.06,0.21-0.17,0.26
+	c-0.11,0.04-0.22,0.02-0.3-0.06l-1.76-1.77c-0.4-0.4-1.03-0.44-1.44-0.1c-0.23,0.2-0.37,0.47-0.38,0.77
+	c-0.01,0.29,0.09,0.58,0.29,0.79l3.1,4.12c0.37,0.6,1.99,2,2.42,2.21C6.62,21.77,7.53,22,8.45,22c1.13,0,2.22-0.34,3.13-0.98
+	c1.49-0.92,2.42-2.6,2.42-4.38v-3.27C14.01,12.75,13.5,12.23,12.87,12.23z M5.1,2.34c-1.04,0-2.02,0.56-2.54,1.47
+	C2.37,4.14,2.49,4.56,2.81,4.75C3.13,4.93,3.55,4.82,3.74,4.5C4.02,4.01,4.54,3.7,5.1,3.7s1.08,0.3,1.37,0.79
+	c0.13,0.22,0.35,0.34,0.59,0.34c0.12,0,0.23-0.03,0.34-0.09c0.32-0.19,0.43-0.61,0.25-0.93C7.12,2.9,6.15,2.34,5.1,2.34z"/>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-mute-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-mute-i.svg
new file mode 100644
index 0000000000..fef3e533b4
--- /dev/null
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-mute-i.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 22" style="enable-background:new 0 0 16 22;" xml:space="preserve">
+<path d="M7.95,10.03c-0.38,0-0.73,0.21-0.91,0.56c-0.01,0.02-0.07,0.12-0.2,0.12c-0.13,0-0.23-0.1-0.23-0.23V5.77
+	c0-0.51-0.38-0.95-0.87-0.99C5.47,4.75,5.2,4.83,5,5.02C4.8,5.2,4.69,5.46,4.69,5.73v7.99c0,0.01,0,0.02-0.01,0.04l3.64-3.65
+	C8.21,10.06,8.08,10.03,7.95,10.03z M1.62,3.3c0.29,0.17,0.67,0.07,0.84-0.22c0.65-1.13,1.87-1.84,3.17-1.84s2.52,0.7,3.17,1.84
+	c0.11,0.2,0.32,0.31,0.53,0.31c0.11,0,0.21-0.03,0.31-0.08c0.29-0.17,0.4-0.55,0.23-0.85C9,0.94,7.37,0,5.63,0
+	C3.89,0,2.27,0.94,1.39,2.45C1.22,2.75,1.32,3.13,1.62,3.3z M15.69,6.26c-0.41-0.41-1.08-0.41-1.5,0L0.31,20.19
+	c-0.41,0.41-0.41,1.09,0,1.5C0.52,21.9,0.79,22,1.06,22s0.54-0.1,0.75-0.31l3.26-3.27c0.49,0.44,1,0.85,1.21,0.95
+	c0.73,0.4,1.56,0.61,2.4,0.61c1.03,0,2.02-0.31,2.85-0.89c1.36-0.84,2.2-2.36,2.2-3.97v-2.97c0-0.57-0.46-1.04-1.03-1.04
+	c-0.16,0-0.32,0.04-0.46,0.12l3.45-3.47C16.1,7.34,16.1,6.67,15.69,6.26z M11.72,11.74l0.06-0.06
+	C11.77,11.7,11.75,11.72,11.72,11.74z M2.79,15.65l1.68-1.68c-0.08,0.01-0.15-0.01-0.21-0.07l-1.6-1.61
+	c-0.36-0.36-0.94-0.4-1.31-0.09C1.13,12.38,1,12.63,0.99,12.9c-0.01,0.26,0.08,0.52,0.27,0.71L2.79,15.65z M6.87,4.08
+	c0.11,0.2,0.32,0.31,0.53,0.31c0.11,0,0.21-0.03,0.31-0.08c0.29-0.17,0.4-0.55,0.23-0.85C7.47,2.64,6.58,2.12,5.63,2.12
+	S3.79,2.64,3.32,3.46c-0.17,0.3-0.07,0.67,0.23,0.85c0.29,0.17,0.67,0.07,0.84-0.23c0.26-0.44,0.73-0.72,1.24-0.72
+	S6.62,3.64,6.87,4.08z"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg
deleted file mode 100644
index 8c8fe36955..0000000000
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 148 148" style="enable-background:new 0 0 148 148;" xml:space="preserve">
-<path d="M58.9,35.07L41.16,52.24c-1.03,0.98-2.43,1.53-3.88,1.53H23.63c-3.03,0-5.49,2.33-5.49,5.21v29.58
-	c0,2.88,2.46,5.21,5.49,5.21h13.64c1.46,0,2.85,0.55,3.88,1.53l17.74,17.17c3.46,3.28,9.37,0.96,9.37-3.68V38.76
-	C68.27,34.11,62.36,31.79,58.9,35.07z M95.54,74c0-7.16-3.85-13.85-10.06-17.44c-1.67-0.97-3.81-0.4-4.78,1.27
-	c-0.97,1.67-0.4,3.81,1.27,4.78c4.05,2.35,6.57,6.71,6.57,11.38s-2.52,9.04-6.57,11.38c-1.67,0.97-2.24,3.11-1.28,4.78
-	c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47C91.68,87.85,95.54,81.16,95.54,74z M102.81,27.12
-	c-1.67-0.97-3.81-0.4-4.78,1.27c-0.97,1.67-0.4,3.81,1.27,4.78c14.53,8.41,23.55,24.06,23.55,40.82c0,16.77-9.03,32.42-23.56,40.83
-	c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47c16.69-9.66,27.05-27.63,27.05-46.89
-	C129.85,54.74,119.49,36.78,102.81,27.12z M112.7,74c0-13.58-7.31-26.25-19.07-33.06c-1.67-0.97-3.81-0.4-4.78,1.27
-	c-0.97,1.67-0.4,3.81,1.27,4.78c9.61,5.57,15.58,15.91,15.58,27c0,11.09-5.97,21.44-15.58,27c-1.67,0.97-2.24,3.11-1.28,4.78
-	c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47C105.39,100.25,112.7,87.58,112.7,74z"/>
-</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i-old.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i-old.svg
deleted file mode 100644
index 77a0f30ed6..0000000000
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i-old.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 79.89 110.8" style="enable-background:new 0 0 79.89 110.8;" xml:space="preserve">
-<path d="M73.99,39.26c-3.31,0-6,2.69-6,6v5.28c0,14.51-9.43,26.66-21.99,29.65v-7.82c8.18-2.57,14.15-10.24,14.15-19.23V20.15
-	C60.15,9.07,51.08,0,40,0S19.85,9.07,19.85,20.15v32.99c0,9,5.98,16.66,14.15,19.23v7.82C21.43,77.2,12,65.05,12,50.54v-5.28
-	c0-3.31-2.69-6-6-6s-6,2.69-6,6v5.28c0,21.2,14.78,38.81,33.99,41.88v6.38H20.72c-3.31,0-6,2.69-6,6s2.69,6,6,6h38.46
-	c3.31,0,6-2.69,6-6s-2.69-6-6-6H45.99v-6.38c19.22-3.08,33.99-20.68,33.99-41.88v-5.28C79.99,41.95,77.3,39.26,73.99,39.26z"/>
-</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg
index c7858f9ef4..dd8bfa087f 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 16 22" style="enable-background:new 0 0 16 22;" xml:space="preserve">
 <path d="M14.8,7.8c-0.66,0-1.2,0.53-1.2,1.19v1.05c0,2.88-1.89,5.29-4.4,5.89v-1.55c1.64-0.51,2.83-2.03,2.83-3.82V4
 	c0-2.2-1.81-4-4.03-4S3.97,1.8,3.97,4v6.55c0,1.79,1.2,3.31,2.83,3.82v1.55c-2.51-0.59-4.4-3.01-4.4-5.89V8.99
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index 549d6337ac..c093b26437 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -47,12 +47,6 @@ Rectangle {
 
         onSkeletonModelURLChanged: {
             root.updatePreviewUrl();
-
-            if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) &&
-                topBarInventoryModel.count > 0) {
-                Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
-                MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
-            }
         }
     }
 
@@ -101,8 +95,7 @@ Rectangle {
                 inventoryFullyReceived = true;
 
                 // If we have an avatar in our inventory AND we haven't already auto-selected an avatar...
-                if ((!Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false) ||
-                    MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) && topBarInventoryModel.count > 0) {
+                if (!Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false) && topBarInventoryModel.count > 0) {
                     Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
                     MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
                 }
@@ -422,7 +415,6 @@ Rectangle {
             anchors.centerIn: parent
             width: 22
             height: 22
-            fillMode: Image.PreserveAspectFit
             visible: false
         }
 
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/desktopMode.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/desktopMode.svg
index de344c2c82..dfb1a1a662 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/desktopMode.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/images/desktopMode.svg
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 99 86.32" style="enable-background:new 0 0 99 86.32;" xml:space="preserve">
-<path d="M92,0H7C3.15,0,0,3.15,0,7v47.87c0,3.85,3.15,7,7,7h36.5v12.45H31.11c-3.31,0-6,2.69-6,6s2.69,6,6,6h36.78
-	c3.31,0,6-2.69,6-6s-2.69-6-6-6H55.5V61.87H92c3.85,0,7-3.15,7-7V7C99,3.15,95.85,0,92,0z"/>
+	 viewBox="0 0 25 22" style="enable-background:new 0 0 25 22;" xml:space="preserve">
+<path d="M23.24,0H1.77C0.79,0,0,0.8,0,1.78v12.2c0,0.98,0.79,1.78,1.77,1.78h9.22v3.17H7.85c-0.83,0-1.52,0.69-1.52,1.53
+	S7.02,22,7.85,22h9.29c0.83,0,1.52-0.69,1.52-1.53s-0.68-1.53-1.52-1.53h-3.13v-3.17h9.22c0.97,0,1.77-0.8,1.77-1.78V1.78
+	C25.02,0.8,24.22,0,23.24,0z"/>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg
index 3133b320f3..798ce62ccd 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 111.7 94.7" style="enable-background:new 0 0 111.7 94.7;" xml:space="preserve">
-<path d="M40.76,8.42L23.02,25.59c-1.03,0.98-2.43,1.53-3.88,1.53H5.49C2.46,27.12,0,29.45,0,32.33v29.58c0,2.88,2.46,5.21,5.49,5.21
-	h13.64c1.46,0,2.85,0.55,3.88,1.53l17.74,17.17c3.46,3.28,9.37,0.96,9.37-3.68V12.11C50.13,7.46,44.22,5.14,40.76,8.42z M77.4,47.35
-	c0-7.16-3.85-13.85-10.06-17.44c-1.67-0.97-3.81-0.4-4.78,1.27c-0.97,1.67-0.4,3.81,1.27,4.78c4.05,2.35,6.57,6.71,6.57,11.38
-	s-2.52,9.04-6.57,11.38c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47
-	C73.54,61.2,77.4,54.51,77.4,47.35z M84.67,0.47C83-0.5,80.86,0.07,79.89,1.74s-0.4,3.81,1.27,4.78
-	c14.53,8.41,23.55,24.06,23.55,40.82c0,16.77-9.03,32.42-23.56,40.83c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75
-	c0.6,0,1.2-0.15,1.75-0.47c16.69-9.66,27.05-27.63,27.05-46.89C111.71,28.09,101.35,10.13,84.67,0.47z M94.56,47.35
-	c0-13.58-7.31-26.25-19.07-33.06c-1.67-0.97-3.81-0.4-4.78,1.27c-0.97,1.67-0.4,3.81,1.27,4.78c9.61,5.57,15.58,15.91,15.58,27
-	s-5.97,21.44-15.58,27c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47
-	C87.25,73.6,94.56,60.93,94.56,47.35z"/>
+	 viewBox="0 0 26 22" style="enable-background:new 0 0 26 22;" xml:space="preserve">
+<path d="M9.49,1.96L5.36,5.95C5.12,6.17,4.79,6.3,4.46,6.3H1.28C0.57,6.3,0,6.84,0,7.51v6.87c0,0.67,0.57,1.21,1.28,1.21h3.17
+	c0.34,0,0.66,0.13,0.9,0.36l4.13,3.99c0.81,0.76,2.18,0.22,2.18-0.85V2.81C11.67,1.73,10.29,1.19,9.49,1.96z M18.02,11
+	c0-1.66-0.9-3.22-2.34-4.05c-0.39-0.23-0.89-0.09-1.11,0.3c-0.23,0.39-0.09,0.89,0.3,1.11C15.8,8.9,16.39,9.91,16.39,11
+	s-0.59,2.1-1.53,2.64c-0.39,0.23-0.52,0.72-0.3,1.11c0.15,0.26,0.42,0.41,0.71,0.41c0.14,0,0.28-0.03,0.41-0.11
+	C17.12,14.22,18.02,12.66,18.02,11z M19.71,0.11c-0.39-0.23-0.89-0.09-1.11,0.3c-0.23,0.39-0.09,0.89,0.3,1.11
+	c3.38,1.95,5.48,5.59,5.48,9.48c0,3.9-2.1,7.53-5.48,9.49c-0.39,0.23-0.52,0.72-0.3,1.11C18.74,21.85,19.01,22,19.3,22
+	c0.14,0,0.28-0.03,0.41-0.11C23.59,19.65,26,15.47,26,11C26,6.53,23.59,2.35,19.71,0.11z M22.01,11c0-3.15-1.7-6.1-4.44-7.68
+	c-0.39-0.23-0.89-0.09-1.11,0.3C16.23,4,16.37,4.5,16.75,4.73c2.24,1.29,3.63,3.7,3.63,6.27s-1.39,4.98-3.63,6.27
+	c-0.39,0.23-0.52,0.72-0.3,1.11c0.15,0.26,0.42,0.41,0.71,0.41c0.14,0,0.28-0.03,0.41-0.11C20.31,17.1,22.01,14.16,22.01,11z"/>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceMuted.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceMuted.svg
index 38c670d8ad..9b7e3ad613 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceMuted.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceMuted.svg
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 111.71 99" style="enable-background:new 0 0 111.71 99;" xml:space="preserve">
-<path d="M5.49,69.49h4.25L50.13,29.1V14.48c0-4.64-5.91-6.97-9.37-3.68L23.02,27.97c-1.03,0.97-2.43,1.52-3.88,1.52H5.49
-	C2.46,29.49,0,31.83,0,34.7v29.58C0.01,67.15,2.46,69.49,5.49,69.49z M96.21,11.58l1.35-1.35c2.34-2.34,2.34-6.14,0-8.48
-	s-6.14-2.34-8.48,0l-87,87c-2.34,2.34-2.34,6.14,0,8.48C3.25,98.4,4.79,99,6.32,99c1.54,0,3.07-0.59,4.24-1.76l19.45-19.45
-	l10.75,10.4c3.46,3.28,9.37,0.96,9.37-3.68V57.66l16.92-16.92c2.12,2.38,3.35,5.49,3.35,8.75c0,4.67-2.52,9.04-6.57,11.38
-	c-1.67,0.97-2.24,3.11-1.28,4.78c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47c6.21-3.59,10.07-10.28,10.07-17.44
-	c0-5.14-1.99-10.02-5.4-13.7l7.37-7.37c5.25,5.7,8.19,13.13,8.19,21.07c0,11.09-5.97,21.44-15.58,27c-1.67,0.97-2.24,3.11-1.28,4.78
-	c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47c11.77-6.81,19.08-19.48,19.08-33.06c0-9.82-3.67-19.01-10.23-26.02
-	l6.94-6.94c8.59,8.78,13.45,20.55,13.45,32.96c0,16.77-9.03,32.41-23.56,40.83c-1.67,0.97-2.24,3.11-1.28,4.78
-	c0.65,1.12,1.82,1.75,3.03,1.75c0.6,0,1.2-0.15,1.75-0.47c16.69-9.66,27.05-27.63,27.05-46.89
-	C111.71,35.22,106.11,21.67,96.21,11.58z"/>
+	 viewBox="0 0 25 22" style="enable-background:new 0 0 25 22;" xml:space="preserve">
+<path d="M1.23,15.44h0.95l9.04-8.98V3.22c0-1.03-1.32-1.55-2.1-0.82L5.15,6.22C4.92,6.43,4.61,6.55,4.28,6.55H1.23
+	C0.55,6.55,0,7.07,0,7.71v6.57C0,14.92,0.55,15.44,1.23,15.44z M21.53,2.57l0.3-0.3c0.52-0.52,0.52-1.36,0-1.88s-1.37-0.52-1.9,0
+	L0.47,19.72c-0.52,0.52-0.52,1.36,0,1.88C0.73,21.87,1.07,22,1.41,22c0.34,0,0.69-0.13,0.95-0.39l4.35-4.32l2.41,2.31
+	c0.77,0.73,2.1,0.21,2.1-0.82v-5.97l3.79-3.76c0.47,0.53,0.75,1.22,0.75,1.94c0,1.04-0.56,2.01-1.47,2.53
+	c-0.37,0.22-0.5,0.69-0.29,1.06c0.15,0.25,0.41,0.39,0.68,0.39c0.13,0,0.27-0.03,0.39-0.1c1.39-0.8,2.25-2.28,2.25-3.88
+	c0-1.14-0.45-2.23-1.21-3.04l1.65-1.64C18.94,7.58,19.6,9.23,19.6,11c0,2.46-1.34,4.76-3.49,6c-0.37,0.22-0.5,0.69-0.29,1.06
+	c0.15,0.25,0.41,0.39,0.68,0.39c0.13,0,0.27-0.03,0.39-0.1c2.63-1.51,4.27-4.33,4.27-7.35c0-2.18-0.82-4.22-2.29-5.78l1.55-1.54
+	c1.92,1.95,3.01,4.57,3.01,7.32c0,3.73-2.02,7.2-5.27,9.07c-0.37,0.22-0.5,0.69-0.29,1.06c0.15,0.25,0.41,0.39,0.68,0.39
+	c0.13,0,0.27-0.03,0.39-0.1C22.68,19.27,25,15.28,25,11C25,7.83,23.75,4.82,21.53,2.57z"/>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/settings.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/settings.svg
index 7d0594837f..910ef353e1 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/settings.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/images/settings.svg
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 98.97 98.97" style="enable-background:new 0 0 98.97 98.97;" xml:space="preserve">
-<path id="settings_filled_1_" d="M98.97,49.48L98.97,49.48c0-3.41-2.55-6.27-5.93-6.67L81.6,41.46c-0.01,0-0.02-0.01-0.03-0.02
-	c-0.78-3.12-2.02-6.14-3.72-8.97c-0.01-0.01-0.01-0.02,0-0.03l7.14-9.04c2.11-2.67,1.89-6.5-0.52-8.91l0,0
-	c-2.41-2.41-6.24-2.63-8.91-0.52l-9.04,7.14c-0.01,0.01-0.02,0.01-0.03,0c-2.83-1.7-5.85-2.94-8.97-3.71
-	c-0.01,0-0.02-0.01-0.02-0.03L56.15,5.93C55.75,2.55,52.88,0,49.48,0l0,0c-3.41,0-6.27,2.55-6.67,5.93l-1.35,11.44
-	c0,0.01-0.01,0.02-0.02,0.03c-3.12,0.78-6.14,2.02-8.97,3.72c-0.01,0.01-0.02,0.01-0.03,0l-9.04-7.14c-2.67-2.11-6.5-1.89-8.91,0.52
-	l0,0c-2.41,2.41-2.63,6.24-0.52,8.91l7.14,9.04c0.01,0.01,0.01,0.02,0,0.03c-1.7,2.83-2.94,5.85-3.71,8.97
-	c0,0.01-0.01,0.02-0.03,0.02L5.93,42.82C2.55,43.22,0,46.09,0,49.49l0,0c0,3.41,2.55,6.27,5.93,6.67l11.44,1.35
-	c0.01,0,0.02,0.01,0.03,0.02c0.78,3.12,2.02,6.14,3.72,8.97c0.01,0.01,0.01,0.02,0,0.03l-7.14,9.04c-2.11,2.67-1.89,6.5,0.52,8.91
-	l0,0c2.41,2.41,6.24,2.63,8.91,0.52l9.04-7.14c0.01-0.01,0.02-0.01,0.03,0c2.83,1.7,5.85,2.94,8.97,3.71c0.01,0,0.02,0.01,0.02,0.03
-	l1.35,11.44c0.4,3.38,3.27,5.93,6.67,5.93l0,0c3.41,0,6.27-2.55,6.67-5.93l1.35-11.44c0-0.01,0.01-0.02,0.02-0.03
-	c3.12-0.78,6.14-2.02,8.97-3.72c0.01-0.01,0.02-0.01,0.03,0l9.04,7.14c2.67,2.11,6.5,1.89,8.91-0.52l0,0
-	c2.41-2.41,2.63-6.24,0.52-8.91l-7.14-9.04c-0.01-0.01-0.01-0.02,0-0.03c1.7-2.83,2.94-5.85,3.71-8.97c0-0.01,0.01-0.02,0.03-0.02
-	l11.44-1.35C96.42,55.75,98.97,52.88,98.97,49.48z M62.89,59.79c-6.84,8.81-20,8.81-26.84,0c-4.66-6-4.66-14.61,0-20.62
-	c6.84-8.81,20-8.81,26.84,0C67.55,45.17,67.55,53.78,62.89,59.79z"/>
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+<path id="settings_filled_1_" d="M22,11L22,11c0-0.76-0.57-1.39-1.32-1.48l-2.54-0.3c0,0,0,0-0.01,0c-0.17-0.69-0.45-1.36-0.83-1.99
+	c0,0,0,0,0-0.01l1.59-2.01c0.47-0.59,0.42-1.44-0.12-1.98l0,0c-0.54-0.54-1.39-0.58-1.98-0.12l-2.01,1.59c0,0,0,0-0.01,0
+	c-0.63-0.38-1.3-0.65-1.99-0.82c0,0,0,0,0-0.01l-0.3-2.54C12.39,0.57,11.75,0,11,0l0,0c-0.76,0-1.39,0.57-1.48,1.32l-0.3,2.54
+	c0,0,0,0,0,0.01C8.52,4.04,7.85,4.32,7.22,4.69c0,0,0,0-0.01,0L5.2,3.11C4.61,2.64,3.76,2.69,3.22,3.22l0,0
+	C2.69,3.76,2.64,4.61,3.11,5.2l1.59,2.01c0,0,0,0,0,0.01c-0.38,0.63-0.65,1.3-0.82,1.99c0,0,0,0-0.01,0l-2.54,0.3
+	C0.57,9.61,0,10.25,0,11l0,0c0,0.76,0.57,1.39,1.32,1.48l2.54,0.3c0,0,0,0,0.01,0c0.17,0.69,0.45,1.36,0.83,1.99c0,0,0,0,0,0.01
+	L3.11,16.8c-0.47,0.59-0.42,1.44,0.12,1.98l0,0c0.54,0.54,1.39,0.58,1.98,0.12l2.01-1.59c0,0,0,0,0.01,0
+	c0.63,0.38,1.3,0.65,1.99,0.82c0,0,0,0,0,0.01l0.3,2.54C9.61,21.43,10.25,22,11,22l0,0c0.76,0,1.39-0.57,1.48-1.32l0.3-2.54
+	c0,0,0,0,0-0.01c0.69-0.17,1.36-0.45,1.99-0.83c0,0,0,0,0.01,0l2.01,1.59c0.59,0.47,1.44,0.42,1.98-0.12l0,0
+	c0.54-0.54,0.58-1.39,0.12-1.98l-1.59-2.01c0,0,0,0,0-0.01c0.38-0.63,0.65-1.3,0.82-1.99c0,0,0,0,0.01,0l2.54-0.3
+	C21.43,12.39,22,11.75,22,11z M13.98,13.29c-1.52,1.96-4.45,1.96-5.97,0c-1.04-1.33-1.04-3.25,0-4.58c1.52-1.96,4.45-1.96,5.97,0
+	C15.02,10.04,15.02,11.95,13.98,13.29z"/>
 </svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/vrMode.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/vrMode.svg
index 1339473beb..f19989c0b1 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/vrMode.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/images/vrMode.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 123.76 64.27" style="enable-background:new 0 0 123.76 64.27;" xml:space="preserve">
-<path d="M100.1,0H23.64C10.58,0,0,10.59,0,23.64v14.91c0,14.21,11.52,25.72,25.72,25.72h18.52c4.65,0,9.1-1.85,12.39-5.13l3.42-3.42
-	c1.01-1.01,2.64-1.01,3.65,0l3.42,3.41c3.29,3.29,7.74,5.13,12.39,5.13h20.6c13.06,0,23.65-10.59,23.65-23.65V23.65
-	C123.74,10.59,113.15,0,100.1,0z M51.31,39.11c-1.55,3.47-4.35,6.28-7.83,7.83c-15.3,6.81-30.12-8.01-23.31-23.31
-	c1.54-3.47,4.35-6.28,7.83-7.83C43.3,8.99,58.12,23.81,51.31,39.11z M103.57,39.11c-1.55,3.47-4.35,6.28-7.83,7.83
-	c-15.3,6.81-30.12-8-23.31-23.31c1.54-3.47,4.35-6.28,7.83-7.83C95.56,8.99,110.38,23.81,103.57,39.11z"/>
+	 viewBox="0 0 42 22" style="enable-background:new 0 0 42 22;" xml:space="preserve">
+<path d="M33.97,0H8.02C3.59,0,0,3.63,0,8.09v5.1C0,18.06,3.91,22,8.73,22h6.29c1.58,0,3.09-0.63,4.2-1.76l1.16-1.17
+	c0.34-0.35,0.9-0.35,1.24,0l1.16,1.17c1.12,1.13,2.63,1.76,4.2,1.76h6.99c4.43,0,8.03-3.63,8.03-8.1V8.1C41.99,3.63,38.4,0,33.97,0z
+	 M17.41,13.39c-0.53,1.19-1.48,2.15-2.66,2.68C9.56,18.4,4.53,13.33,6.85,8.09C7.37,6.9,8.32,5.94,9.5,5.41
+	C14.69,3.08,19.72,8.15,17.41,13.39z M35.15,13.39c-0.53,1.19-1.48,2.15-2.66,2.68c-5.19,2.33-10.22-2.74-7.91-7.98
+	c0.52-1.19,1.48-2.15,2.66-2.68C32.43,3.08,37.46,8.15,35.15,13.39z"/>
 </svg>