ash: Add some 2x assets for the uber-tray.

BUG=119832
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10451101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139956 0039d316-1c4b-4281-b951-d872f2087c98

59 files changed, 209 insertions, 76 deletions

diff --git a/ash/shell.cc b/ash/shell.cc
index 8229524..a4053fc 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -289,10 +289,6 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
     return true;
   }
 
-  virtual int GetSystemUpdateIconResource() const OVERRIDE {
-    return IDR_AURA_UBER_TRAY_UPDATE;
-  }
-
   virtual base::HourClockType GetHourClockType() const OVERRIDE {
     return base::k24HourClock;
   }
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc
index 5b9d3a3..9e8b4a6 100644
--- a/ash/system/audio/tray_volume.cc
+++ b/ash/system/audio/tray_volume.cc
@@ -10,7 +10,7 @@
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index 43b707f..8a6551d7 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -12,7 +12,7 @@
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_views.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc
index 33ced23..03bee13 100644
--- a/ash/system/brightness/tray_brightness.cc
+++ b/ash/system/brightness/tray_brightness.cc
@@ -14,7 +14,7 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/image_button.h"
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index e9c9a25..8181d79 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -15,7 +15,7 @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc
index b803db0..135b0b4 100644
--- a/ash/system/drive/tray_drive.cc
+++ b/ash/system/drive/tray_drive.cc
@@ -19,7 +19,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/stl_util.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index 3724553..386fde5 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -18,7 +18,7 @@
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
diff --git a/ash/system/locale/tray_locale.cc b/ash/system/locale/tray_locale.cc
index 724de71..26ab746 100644
--- a/ash/system/locale/tray_locale.cc
+++ b/ash/system/locale/tray_locale.cc
@@ -8,7 +8,7 @@
 #include "ash/system/tray/tray_views.h"
 #include "base/string16.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/view.h"
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc
index 95823ca..98e5c33 100644
--- a/ash/system/network/tray_network.cc
+++ b/ash/system/network/tray_network.cc
@@ -15,7 +15,7 @@
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/network/tray_sms.cc b/ash/system/network/tray_sms.cc
index 479f5f7..49fa1ee 100644
--- a/ash/system/network/tray_sms.cc
+++ b/ash/system/network/tray_sms.cc
@@ -17,7 +17,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "grit/ui_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc
index 48b206e..b851a75 100644
--- a/ash/system/power/tray_power.cc
+++ b/ash/system/power/tray_power.cc
@@ -16,7 +16,7 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc
index b0587ce..fee44ec 100644
--- a/ash/system/settings/tray_settings.cc
+++ b/ash/system/settings/tray_settings.cc
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
index 6a82a16..a2cdab4 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -9,7 +9,7 @@
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/utf_string_conversions.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index d8d48ff..3c6f3f8 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -112,9 +112,6 @@ class SystemTrayDelegate {
   // Returns whether a system upgrade is available.
   virtual bool SystemShouldUpgrade() const = 0;
 
-  // Returns the resource id for the icon to show for the update notification.
-  virtual int GetSystemUpdateIconResource() const = 0;
-
   // Returns the desired hour clock type.
   virtual base::HourClockType GetHourClockType() const = 0;
 
diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc
index 8e71830..b4c8ea1 100644
--- a/ash/system/tray/tray_item_more.cc
+++ b/ash/system/tray/tray_item_more.cc
@@ -7,7 +7,7 @@
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
index 664f987b..85e82cd 100644
--- a/ash/system/tray/tray_views.cc
+++ b/ash/system/tray/tray_views.cc
@@ -6,7 +6,7 @@
 
 #include "ash/system/tray/tray_constants.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "grit/ui_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index 08e173e..fda568b 100644
--- a/ash/system/tray_accessibility.cc
+++ b/ash/system/tray_accessibility.cc
@@ -9,7 +9,7 @@
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc
index 466fa77..e6c3f4b 100644
--- a/ash/system/tray_caps_lock.cc
+++ b/ash/system/tray_caps_lock.cc
@@ -9,7 +9,7 @@
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index 82957f0..f98d311 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -13,7 +13,7 @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index e18f400..202f1d5 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -269,11 +269,6 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     return UpgradeDetector::GetInstance()->notify_upgrade();
   }
 
-  virtual int GetSystemUpdateIconResource() const OVERRIDE {
-    return UpgradeDetector::GetInstance()->GetIconResourceID(
-        UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON);
-  }
-
   virtual base::HourClockType GetHourClockType() const OVERRIDE {
     return clock_type_;
   }
diff --git a/ui/resources/default_200_percent/aura/status_accessibility_mode.png b/ui/resources/default_200_percent/aura/status_accessibility_mode.png
new file mode 100644
index 0000000..f91cf66
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_accessibility_mode.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth.png b/ui/resources/default_200_percent/aura/status_bluetooth.png
new file mode 100644
index 0000000..3af6c75
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_bluetooth.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_disabled.png b/ui/resources/default_200_percent/aura/status_bluetooth_disabled.png
new file mode 100644
index 0000000..b89c5cb
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_bluetooth_disabled.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_disabled_h.png b/ui/resources/default_200_percent/aura/status_bluetooth_disabled_h.png
new file mode 100644
index 0000000..28335e1
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_bluetooth_disabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_enabled.png b/ui/resources/default_200_percent/aura/status_bluetooth_enabled.png
new file mode 100644
index 0000000..ade36ed
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_bluetooth_enabled.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_enabled_h.png b/ui/resources/default_200_percent/aura/status_bluetooth_enabled_h.png
new file mode 100644
index 0000000..24413cb
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_bluetooth_enabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_brightness.png b/ui/resources/default_200_percent/aura/status_brightness.png
new file mode 100644
index 0000000..f96488f
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_brightness.png
diff --git a/ui/resources/default_200_percent/aura/status_capslock.png b/ui/resources/default_200_percent/aura/status_capslock.png
new file mode 100644
index 0000000..7e144945
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_capslock.png
diff --git a/ui/resources/default_200_percent/aura/status_capslock_dark.png b/ui/resources/default_200_percent/aura/status_capslock_dark.png
new file mode 100644
index 0000000..7b04eca
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_capslock_dark.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_disabled.png b/ui/resources/default_200_percent/aura/status_cellular_disabled.png
new file mode 100644
index 0000000..e538f72
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_cellular_disabled.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_disabled_h.png b/ui/resources/default_200_percent/aura/status_cellular_disabled_h.png
new file mode 100644
index 0000000..52813a8
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_cellular_disabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_enabled.png b/ui/resources/default_200_percent/aura/status_cellular_enabled.png
new file mode 100644
index 0000000..2702a6d
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_cellular_enabled.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_enabled_h.png b/ui/resources/default_200_percent/aura/status_cellular_enabled_h.png
new file mode 100644
index 0000000..a36b3ff
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_cellular_enabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_help.png b/ui/resources/default_200_percent/aura/status_help.png
new file mode 100644
index 0000000..8630e7e
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_help.png
diff --git a/ui/resources/default_200_percent/aura/status_help_h.png b/ui/resources/default_200_percent/aura/status_help_h.png
new file mode 100644
index 0000000..f441e8f
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_help_h.png
diff --git a/ui/resources/default_200_percent/aura/status_less.png b/ui/resources/default_200_percent/aura/status_less.png
new file mode 100644
index 0000000..e620ddc
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_less.png
diff --git a/ui/resources/default_200_percent/aura/status_lockscreen.png b/ui/resources/default_200_percent/aura/status_lockscreen.png
new file mode 100644
index 0000000..5a37767
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_lockscreen.png
diff --git a/ui/resources/default_200_percent/aura/status_lockscreen_h.png b/ui/resources/default_200_percent/aura/status_lockscreen_h.png
new file mode 100644
index 0000000..54a70d4
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_lockscreen_h.png
diff --git a/ui/resources/default_200_percent/aura/status_more.png b/ui/resources/default_200_percent/aura/status_more.png
new file mode 100644
index 0000000..0700acc
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_more.png
diff --git a/ui/resources/default_200_percent/aura/status_network_info.png b/ui/resources/default_200_percent/aura/status_network_info.png
new file mode 100644
index 0000000..c003bd8
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_network_info.png
diff --git a/ui/resources/default_200_percent/aura/status_network_info_h.png b/ui/resources/default_200_percent/aura/status_network_info_h.png
new file mode 100644
index 0000000..7a4ddf0
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_network_info_h.png
diff --git a/ui/resources/default_200_percent/aura/status_power_small_all.png b/ui/resources/default_200_percent/aura/status_power_small_all.png
new file mode 100644
index 0000000..2700b02
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_power_small_all.png
diff --git a/ui/resources/default_200_percent/aura/status_power_small_all_dark.png b/ui/resources/default_200_percent/aura/status_power_small_all_dark.png
new file mode 100644
index 0000000..2365016
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_power_small_all_dark.png
diff --git a/ui/resources/default_200_percent/aura/status_settings.png b/ui/resources/default_200_percent/aura/status_settings.png
new file mode 100644
index 0000000..754a3df
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_settings.png
diff --git a/ui/resources/default_200_percent/aura/status_shutdown.png b/ui/resources/default_200_percent/aura/status_shutdown.png
new file mode 100644
index 0000000..0ec047b
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_shutdown.png
diff --git a/ui/resources/default_200_percent/aura/status_shutdown_h.png b/ui/resources/default_200_percent/aura/status_shutdown_h.png
new file mode 100644
index 0000000..287e572
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_shutdown_h.png
diff --git a/ui/resources/default_200_percent/aura/status_update.png b/ui/resources/default_200_percent/aura/status_update.png
new file mode 100644
index 0000000..24755bb
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_update.png
diff --git a/ui/resources/default_200_percent/aura/status_update_dark.png b/ui/resources/default_200_percent/aura/status_update_dark.png
new file mode 100644
index 0000000..b0867a6
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_update_dark.png
diff --git a/ui/resources/default_200_percent/aura/status_volume_all.png b/ui/resources/default_200_percent/aura/status_volume_all.png
new file mode 100644
index 0000000..80059a2
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_volume_all.png
diff --git a/ui/resources/default_200_percent/aura/status_volume_mute.png b/ui/resources/default_200_percent/aura/status_volume_mute.png
new file mode 100644
index 0000000..9c18441
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_volume_mute.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_disabled.png b/ui/resources/default_200_percent/aura/status_wifi_disabled.png
new file mode 100644
index 0000000..9da6815
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_wifi_disabled.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_disabled_h.png b/ui/resources/default_200_percent/aura/status_wifi_disabled_h.png
new file mode 100644
index 0000000..52eef9f
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_wifi_disabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_enabled.png b/ui/resources/default_200_percent/aura/status_wifi_enabled.png
new file mode 100644
index 0000000..596f95fa
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_wifi_enabled.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_enabled_h.png b/ui/resources/default_200_percent/aura/status_wifi_enabled_h.png
new file mode 100644
index 0000000..419c016
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/status_wifi_enabled_h.png
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 1ca87ec..d903859 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -283,53 +283,6 @@
         <include name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT" file="default_100_percent/aura/window_header_shade_top_left.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT" file="default_100_percent/aura/window_header_shade_top_right.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="default_100_percent/aura/slab_zoom.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/aura/status_volume_all.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_100_percent/aura/status_volume_mute.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_100_percent/aura/status_brightness.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_100_percent/aura/status_settings.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_100_percent/aura/status_power_small_all.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_100_percent/aura/status_power_small_all_dark.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/aura/status_network_airplane.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_100_percent/aura/status_network_info.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_100_percent/aura/status_network_info_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/aura/status_network_failed.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/aura/status_data_low.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/aura/status_data_none.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/aura/status_sms.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/aura/status_more.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/aura/status_less.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/aura/status_accessibility_mode.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/aura/status_capslock.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/aura/status_capslock_dark.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/aura/status_bluetooth.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/aura/status_drive.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/aura/status_drive_item_failed.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/aura/status_drive_item_done.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/aura/status_drive_item_cancel.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/aura/status_drive_item_cancel_hover.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/aura/status_drive_light.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/aura/status_ime.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_100_percent/aura/status_update.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_100_percent/aura/status_update_dark.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_100_percent/aura/status_wifi_enabled.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_100_percent/aura/status_wifi_enabled_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_100_percent/aura/status_wifi_disabled.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_100_percent/aura/status_wifi_disabled_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_100_percent/aura/status_cellular_enabled.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_100_percent/aura/status_cellular_enabled_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_100_percent/aura/status_cellular_disabled.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_100_percent/aura/status_cellular_disabled_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_100_percent/aura/status_bluetooth_enabled.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_100_percent/aura/status_bluetooth_enabled_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_100_percent/aura/status_bluetooth_disabled.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_100_percent/aura/status_bluetooth_disabled_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_100_percent/aura/status_shutdown.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_100_percent/aura/status_shutdown_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_100_percent/aura/status_lockscreen.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_100_percent/aura/status_lockscreen_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/aura/status_help.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_100_percent/aura/status_help_h.png" type="BINDATA" />
-        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/aura/status_locale.png" type="BINDATA" />
 
         <include name="IDR_AURA_SWITCH_MONITOR" file="default_100_percent/aura/switch_monitor.png" type="BINDATA" />
         <include name="IDR_OAK" file="oak.png" type="BINDATA"/>
diff --git a/ui/resources/ui_resources_2x.grd b/ui/resources/ui_resources_2x.grd
index b328da8..757d41e 100644
--- a/ui/resources/ui_resources_2x.grd
+++ b/ui/resources/ui_resources_2x.grd
@@ -108,6 +108,54 @@
         <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" />
+        <!-- uber-tray -->
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_200_percent/aura/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_200_percent/aura/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_200_percent/aura/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_200_percent/aura/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_200_percent/aura/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_200_percent/aura/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/aura/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_200_percent/aura/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_200_percent/aura/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/aura/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/aura/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/aura/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/aura/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/aura/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_200_percent/aura/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_200_percent/aura/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/aura/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/aura/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/aura/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/aura/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/aura/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/aura/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/aura/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/aura/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/aura/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/aura/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/aura/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/aura/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/aura/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_200_percent/aura/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_200_percent/aura/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_200_percent/aura/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_200_percent/aura/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_200_percent/aura/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_200_percent/aura/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_200_percent/aura/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_200_percent/aura/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_200_percent/aura/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_200_percent/aura/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_200_percent/aura/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_200_percent/aura/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_200_percent/aura/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_200_percent/aura/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_200_percent/aura/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_200_percent/aura/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_200_percent/aura/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/aura/status_locale.png" type="BINDATA" />
       </if>
       <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')">
         <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" />
diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd
index 19bdfae..823b99f 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -108,6 +108,54 @@
         <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" />
+        <!-- uber-tray -->
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/aura/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_100_percent/aura/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_100_percent/aura/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_100_percent/aura/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_100_percent/aura/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_100_percent/aura/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/aura/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_100_percent/aura/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_100_percent/aura/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/aura/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/aura/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/aura/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/aura/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/aura/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/aura/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/aura/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/aura/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/aura/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/aura/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/aura/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/aura/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/aura/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/aura/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/aura/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/aura/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/aura/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_100_percent/aura/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_100_percent/aura/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_100_percent/aura/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_100_percent/aura/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_100_percent/aura/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_100_percent/aura/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_100_percent/aura/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_100_percent/aura/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_100_percent/aura/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_100_percent/aura/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_100_percent/aura/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_100_percent/aura/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_100_percent/aura/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_100_percent/aura/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_100_percent/aura/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_100_percent/aura/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_100_percent/aura/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_100_percent/aura/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/aura/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_100_percent/aura/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/aura/status_locale.png" type="BINDATA" />
       </if>
 
       <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')">
diff --git a/ui/resources/ui_resources_touch.grd b/ui/resources/ui_resources_touch.grd
index efc02fd9..9b8760b 100644
--- a/ui/resources/ui_resources_touch.grd
+++ b/ui/resources/ui_resources_touch.grd
@@ -105,6 +105,54 @@
         <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" />
+        <!-- uber-tray -->
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/aura/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_100_percent/aura/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_100_percent/aura/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_100_percent/aura/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_100_percent/aura/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_100_percent/aura/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/aura/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_100_percent/aura/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_100_percent/aura/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/aura/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/aura/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/aura/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/aura/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/aura/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/aura/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/aura/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/aura/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/aura/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/aura/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/aura/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/aura/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/aura/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/aura/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/aura/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/aura/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/aura/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_100_percent/aura/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_100_percent/aura/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_100_percent/aura/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_100_percent/aura/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_100_percent/aura/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_100_percent/aura/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_100_percent/aura/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_100_percent/aura/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_100_percent/aura/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_100_percent/aura/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_100_percent/aura/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_100_percent/aura/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_100_percent/aura/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_100_percent/aura/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_100_percent/aura/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_100_percent/aura/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_100_percent/aura/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_100_percent/aura/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/aura/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_100_percent/aura/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/aura/status_locale.png" type="BINDATA" />
       </if>
 
       <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')">
diff --git a/ui/resources/ui_resources_touch_2x.grd b/ui/resources/ui_resources_touch_2x.grd
index 487c4a3..5c63548 100644
--- a/ui/resources/ui_resources_touch_2x.grd
+++ b/ui/resources/ui_resources_touch_2x.grd
@@ -105,6 +105,54 @@
         <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" />
         <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" />
+        <!-- uber-tray -->
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_200_percent/aura/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_200_percent/aura/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_200_percent/aura/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_200_percent/aura/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_200_percent/aura/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_200_percent/aura/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/aura/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_200_percent/aura/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_200_percent/aura/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/aura/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/aura/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/aura/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/aura/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/aura/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_200_percent/aura/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_200_percent/aura/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/aura/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/aura/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/aura/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/aura/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/aura/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/aura/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/aura/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/aura/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/aura/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/aura/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/aura/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/aura/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/aura/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_200_percent/aura/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_200_percent/aura/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_200_percent/aura/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_200_percent/aura/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_200_percent/aura/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_200_percent/aura/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_200_percent/aura/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_200_percent/aura/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_200_percent/aura/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_200_percent/aura/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_200_percent/aura/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_200_percent/aura/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_200_percent/aura/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_200_percent/aura/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_200_percent/aura/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_200_percent/aura/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_200_percent/aura/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/aura/status_locale.png" type="BINDATA" />
       </if>
 
       <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')">