From 49a8964c4e60a26b447f8118d642775e7749816c Mon Sep 17 00:00:00 2001
From: Faye Li <si.fi.faye.li@gmial.com>
Date: Wed, 25 Jan 2017 14:43:39 -0800
Subject: [PATCH 1/2] reference new users icon art

---
 .../resources/icons/tablet-icons/users-i.svg  | 30 +++++++++++++++++++
 scripts/system/users.js                       |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 interface/resources/icons/tablet-icons/users-i.svg

diff --git a/interface/resources/icons/tablet-icons/users-i.svg b/interface/resources/icons/tablet-icons/users-i.svg
new file mode 100644
index 0000000000..aa34dd35f9
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/users-i.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="Layer_2">
+</g>
+<g id="Layer_1">
+	<g>
+		<path class="st0" d="M22.6,14.8c-0.1-0.9-0.1-1.8,0.1-2.6h-8.6c-0.9,0-1.7,0.8-1.7,1.8s0.8,1.8,1.7,1.8h8.7
+			C22.7,15.4,22.7,15.1,22.6,14.8z"/>
+		<path class="st0" d="M26.5,22.3c-0.6-0.5-1.1-1-1.6-1.6H14.1c-0.9,0-1.7,0.8-1.7,1.8c0,1,0.8,1.8,1.7,1.8h8.2
+			c0.3-0.2,0.6-0.3,0.9-0.4c1.2-0.8,2.5-1.2,3.9-1.3C26.9,22.6,26.7,22.5,26.5,22.3z"/>
+		<path class="st0" d="M17.9,30.3c0.1-0.3,0.1-0.5,0.2-0.7h-4c-0.9,0-1.7,0.8-1.7,1.8c0,1,0.8,1.8,1.7,1.8h3.2
+			C17.3,32.2,17.5,31.2,17.9,30.3z"/>
+		<path class="st0" d="M5.9,15.7H4.5c-0.9,0-1.7-0.8-1.7-1.8s0.8-1.8,1.7-1.8h1.4c0.9,0,1.7,0.8,1.7,1.8S6.8,15.7,5.9,15.7z"/>
+		<path class="st0" d="M5.9,24.4H4.5c-0.9,0-1.7-0.8-1.7-1.8c0-1,0.8-1.8,1.7-1.8h1.4c0.9,0,1.7,0.8,1.7,1.8
+			C7.6,23.6,6.8,24.4,5.9,24.4z"/>
+		<path class="st0" d="M5.9,33.2H4.5c-0.9,0-1.7-0.8-1.7-1.8s0.8-1.8,1.7-1.8h1.4c0.9,0,1.7,0.8,1.7,1.8S6.8,33.2,5.9,33.2z"/>
+		<path class="st0" d="M17.3,38.3h-3.2c-0.9,0-1.7,0.8-1.7,1.8s0.8,1.8,1.7,1.8h3.2V38.3z"/>
+		<path class="st0" d="M5.9,42H4.5c-0.9,0-1.7-0.8-1.7-1.8c0-1,0.8-1.8,1.7-1.8h1.4c0.9,0,1.7,0.8,1.7,1.8C7.6,41.1,6.8,42,5.9,42z"
+			/>
+		<circle class="st0" cx="34.5" cy="14.3" r="7.8"/>
+		<path class="st0" d="M23.9,44.1c10.4,0,19.5-4.4,23.3-13.4c-1.3-2.7-3.9-4.7-7.1-4.7H29.5c-4.4,0-8.2,3.8-8.2,8.3v9.7
+			C22.2,44,23,44.1,23.9,44.1z"/>
+	</g>
+</g>
+</svg>
diff --git a/scripts/system/users.js b/scripts/system/users.js
index 4c9663e203..f440a62d62 100644
--- a/scripts/system/users.js
+++ b/scripts/system/users.js
@@ -16,7 +16,7 @@ var MENU_ITEM = "Users Online";
 // create tablet button
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var button = tablet.addButton({
-    icon: "icons/tablet-icons/people-i.svg",
+    icon: "icons/tablet-icons/users-i.svg",
     text: "Users",
     isActive: Menu.isOptionChecked(MENU_ITEM)
 });

From 6f46136699a6045963525e4b8a51c288594b4d0a Mon Sep 17 00:00:00 2001
From: Faye Li <si.fi.faye.li@gmial.com>
Date: Wed, 25 Jan 2017 15:02:55 -0800
Subject: [PATCH 2/2] reorder buttons to match mockup

---
 scripts/defaultScripts.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index bd3131f4ff..bb96fe96cf 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -14,13 +14,17 @@
 var DEFAULT_SCRIPTS = [
     "system/progress.js",
     "system/away.js",
-    "system/users.js",
     "system/mute.js",
-    "system/goto.js",
     "system/hmd.js",
+    "system/menu.js",
+    "system/bubble.js",
+    "system/snapshot.js",
+    "system/help.js",
+    "system/pal.js", //"system/mod.js", // older UX, if you prefer
+    "system/goto.js",
     "system/marketplaces/marketplaces.js",
     "system/edit.js",
-    "system/pal.js", //"system/mod.js", // older UX, if you prefer
+    "system/users.js",
     "system/selectAudioDevice.js",
     "system/notifications.js",
     "system/controllers/controllerDisplayManager.js",
@@ -32,11 +36,7 @@ var DEFAULT_SCRIPTS = [
     "system/controllers/toggleAdvancedMovementForHandControllers.js",
     "system/dialTone.js",
     "system/firstPersonHMD.js",
-    "system/snapshot.js",
-    "system/help.js",
-    "system/bubble.js",
-    "system/tablet-ui/tabletUI.js",
-    "system/menu.js"
+    "system/tablet-ui/tabletUI.js"
 ];
 
 // add a menu item for debugging