Move ash specific resources to ash directory

TBR=sky@chromium.org
BUG=none
TEST=none

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

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

146 files changed, 283 insertions, 247 deletions

diff --git a/ui/resources/default_100_percent/ash/PRESUBMIT.py b/ui/resources/default_100_percent/ash/PRESUBMIT.py
new file mode 100644
index 0000000..8311e1c
--- /dev/null
+++ b/ui/resources/default_100_percent/ash/PRESUBMIT.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Chromium presubmit script for src/chrome/browser/externsions.
+
+See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+for more details on the presubmit API built into gcl.
+"""
+
+def GetPreferredTrySlaves():
+  return ['linux_chromeos']
diff --git a/ui/resources/default_100_percent/aura/launcher_applist.png b/ui/resources/default_100_percent/ash/launcher_applist.png
index 8cf67bd..8cf67bd 100644
--- a/ui/resources/default_100_percent/aura/launcher_applist.png
+++ b/ui/resources/default_100_percent/ash/launcher_applist.png
diff --git a/ui/resources/default_100_percent/aura/launcher_applist_hover.png b/ui/resources/default_100_percent/ash/launcher_applist_hover.png
index 0fbca85..0fbca85 100644
--- a/ui/resources/default_100_percent/aura/launcher_applist_hover.png
+++ b/ui/resources/default_100_percent/ash/launcher_applist_hover.png
diff --git a/ui/resources/default_100_percent/aura/launcher_applist_pressed.png b/ui/resources/default_100_percent/ash/launcher_applist_pressed.png
index 747f7e8..747f7e8 100644
--- a/ui/resources/default_100_percent/aura/launcher_applist_pressed.png
+++ b/ui/resources/default_100_percent/ash/launcher_applist_pressed.png
diff --git a/ui/resources/default_100_percent/aura/launcher_browser.png b/ui/resources/default_100_percent/ash/launcher_browser.png
index 5289e8f..5289e8f 100644
--- a/ui/resources/default_100_percent/aura/launcher_browser.png
+++ b/ui/resources/default_100_percent/ash/launcher_browser.png
diff --git a/ui/resources/default_100_percent/aura/launcher_browser_panel.png b/ui/resources/default_100_percent/ash/launcher_browser_panel.png
index eb69679..eb69679 100644
--- a/ui/resources/default_100_percent/aura/launcher_browser_panel.png
+++ b/ui/resources/default_100_percent/ash/launcher_browser_panel.png
diff --git a/ui/resources/default_100_percent/aura/launcher_incognito_browser.png b/ui/resources/default_100_percent/ash/launcher_incognito_browser.png
index 60e0676..60e0676 100644
--- a/ui/resources/default_100_percent/aura/launcher_incognito_browser.png
+++ b/ui/resources/default_100_percent/ash/launcher_incognito_browser.png
diff --git a/ui/resources/default_100_percent/aura/launcher_incognito_browser_panel.png b/ui/resources/default_100_percent/ash/launcher_incognito_browser_panel.png
index d89b37d..d89b37d 100644
--- a/ui/resources/default_100_percent/aura/launcher_incognito_browser_panel.png
+++ b/ui/resources/default_100_percent/ash/launcher_incognito_browser_panel.png
diff --git a/ui/resources/default_100_percent/aura/launcher_overflow.png b/ui/resources/default_100_percent/ash/launcher_overflow.png
index 8aa0f58..8aa0f58 100644
--- a/ui/resources/default_100_percent/aura/launcher_overflow.png
+++ b/ui/resources/default_100_percent/ash/launcher_overflow.png
diff --git a/ui/resources/default_100_percent/aura/launcher_overflow_hover.png b/ui/resources/default_100_percent/ash/launcher_overflow_hover.png
index 3e49df4..3e49df4 100644
--- a/ui/resources/default_100_percent/aura/launcher_overflow_hover.png
+++ b/ui/resources/default_100_percent/ash/launcher_overflow_hover.png
diff --git a/ui/resources/default_100_percent/aura/launcher_overflow_pressed.png b/ui/resources/default_100_percent/ash/launcher_overflow_pressed.png
index a6bb62f..a6bb62f 100644
--- a/ui/resources/default_100_percent/aura/launcher_overflow_pressed.png
+++ b/ui/resources/default_100_percent/ash/launcher_overflow_pressed.png
diff --git a/ui/resources/default_100_percent/aura/launcher_underline_active.png b/ui/resources/default_100_percent/ash/launcher_underline_active.png
index e5a216e..e5a216e 100644
--- a/ui/resources/default_100_percent/aura/launcher_underline_active.png
+++ b/ui/resources/default_100_percent/ash/launcher_underline_active.png
diff --git a/ui/resources/default_100_percent/aura/launcher_underline_hover.png b/ui/resources/default_100_percent/ash/launcher_underline_hover.png
index 521454c..521454c 100644
--- a/ui/resources/default_100_percent/aura/launcher_underline_hover.png
+++ b/ui/resources/default_100_percent/ash/launcher_underline_hover.png
diff --git a/ui/resources/default_100_percent/aura/launcher_underline_running.png b/ui/resources/default_100_percent/ash/launcher_underline_running.png
index 9ce23e7..9ce23e7 100644
--- a/ui/resources/default_100_percent/aura/launcher_underline_running.png
+++ b/ui/resources/default_100_percent/ash/launcher_underline_running.png
diff --git a/ui/resources/default_100_percent/aura/multi_window_resize_hover.png b/ui/resources/default_100_percent/ash/multi_window_resize_hover.png
index 49ba487..49ba487 100644
--- a/ui/resources/default_100_percent/aura/multi_window_resize_hover.png
+++ b/ui/resources/default_100_percent/ash/multi_window_resize_hover.png
diff --git a/ui/resources/default_100_percent/aura/multi_window_resize_v.png b/ui/resources/default_100_percent/ash/multi_window_resize_v.png
index f093a61..f093a61 100644
--- a/ui/resources/default_100_percent/aura/multi_window_resize_v.png
+++ b/ui/resources/default_100_percent/ash/multi_window_resize_v.png
diff --git a/ui/resources/default_100_percent/aura/new_browser.png b/ui/resources/default_100_percent/ash/new_browser.png
index 0b7ddae..0b7ddae 100644
--- a/ui/resources/default_100_percent/aura/new_browser.png
+++ b/ui/resources/default_100_percent/ash/new_browser.png
diff --git a/ui/resources/default_100_percent/aura/new_browser_hover.png b/ui/resources/default_100_percent/ash/new_browser_hover.png
index 67b9805..67b9805 100644
--- a/ui/resources/default_100_percent/aura/new_browser_hover.png
+++ b/ui/resources/default_100_percent/ash/new_browser_hover.png
diff --git a/ui/resources/default_100_percent/aura/new_browser_pressed.png b/ui/resources/default_100_percent/ash/new_browser_pressed.png
index d37490d..d37490d 100644
--- a/ui/resources/default_100_percent/aura/new_browser_pressed.png
+++ b/ui/resources/default_100_percent/ash/new_browser_pressed.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_bottom.png b/ui/resources/default_100_percent/ash/resize_shadow_bottom.png
index d5d9123..d5d9123 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_bottom.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_bottom.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_bottom_left.png b/ui/resources/default_100_percent/ash/resize_shadow_bottom_left.png
index 8128c06..8128c06 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_bottom_left.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_bottom_left.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_bottom_right.png b/ui/resources/default_100_percent/ash/resize_shadow_bottom_right.png
index 93f039b..93f039b 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_bottom_right.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_bottom_right.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_left.png b/ui/resources/default_100_percent/ash/resize_shadow_left.png
index e85ab7c..e85ab7c 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_left.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_left.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_right.png b/ui/resources/default_100_percent/ash/resize_shadow_right.png
index 0ebf1d6..0ebf1d6 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_right.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_right.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_top.png b/ui/resources/default_100_percent/ash/resize_shadow_top.png
index 35b95f6..35b95f6 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_top.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_top.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_top_left.png b/ui/resources/default_100_percent/ash/resize_shadow_top_left.png
index 9f7f296..9f7f296 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_top_left.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_top_left.png
diff --git a/ui/resources/default_100_percent/aura/resize_shadow_top_right.png b/ui/resources/default_100_percent/ash/resize_shadow_top_right.png
index f4a9aef..f4a9aef 100644
--- a/ui/resources/default_100_percent/aura/resize_shadow_top_right.png
+++ b/ui/resources/default_100_percent/ash/resize_shadow_top_right.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_bottom.png b/ui/resources/default_100_percent/ash/small_shadow_bottom.png
index 87ccf0b..87ccf0b 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_bottom.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_bottom.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_bottom_left.png b/ui/resources/default_100_percent/ash/small_shadow_bottom_left.png
index e0bf537..e0bf537 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_bottom_left.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_bottom_left.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_bottom_right.png b/ui/resources/default_100_percent/ash/small_shadow_bottom_right.png
index 39f0965..39f0965 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_bottom_right.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_bottom_right.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_left.png b/ui/resources/default_100_percent/ash/small_shadow_left.png
index 06920a7..06920a7 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_left.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_left.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_right.png b/ui/resources/default_100_percent/ash/small_shadow_right.png
index 2221877..2221877 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_right.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_right.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_top.png b/ui/resources/default_100_percent/ash/small_shadow_top.png
index 552c6a7..552c6a7 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_top.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_top.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_top_left.png b/ui/resources/default_100_percent/ash/small_shadow_top_left.png
index 91c39eb..91c39eb 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_top_left.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_top_left.png
diff --git a/ui/resources/default_100_percent/aura/small_shadow_top_right.png b/ui/resources/default_100_percent/ash/small_shadow_top_right.png
index de1eee8..de1eee8 100644
--- a/ui/resources/default_100_percent/aura/small_shadow_top_right.png
+++ b/ui/resources/default_100_percent/ash/small_shadow_top_right.png
diff --git a/ui/resources/default_100_percent/aura/status_accessibility_mode.png b/ui/resources/default_100_percent/ash/status_accessibility_mode.png
index a80a8c0..a80a8c0 100644
--- a/ui/resources/default_100_percent/aura/status_accessibility_mode.png
+++ b/ui/resources/default_100_percent/ash/status_accessibility_mode.png
diff --git a/ui/resources/default_100_percent/aura/status_bluetooth.png b/ui/resources/default_100_percent/ash/status_bluetooth.png
index 6b987607..6b987607 100644
--- a/ui/resources/default_100_percent/aura/status_bluetooth.png
+++ b/ui/resources/default_100_percent/ash/status_bluetooth.png
diff --git a/ui/resources/default_100_percent/aura/status_bluetooth_disabled.png b/ui/resources/default_100_percent/ash/status_bluetooth_disabled.png
index c5a973b..c5a973b 100644
--- a/ui/resources/default_100_percent/aura/status_bluetooth_disabled.png
+++ b/ui/resources/default_100_percent/ash/status_bluetooth_disabled.png
diff --git a/ui/resources/default_100_percent/aura/status_bluetooth_disabled_h.png b/ui/resources/default_100_percent/ash/status_bluetooth_disabled_h.png
index fafd57e..fafd57e 100644
--- a/ui/resources/default_100_percent/aura/status_bluetooth_disabled_h.png
+++ b/ui/resources/default_100_percent/ash/status_bluetooth_disabled_h.png
diff --git a/ui/resources/default_100_percent/aura/status_bluetooth_enabled.png b/ui/resources/default_100_percent/ash/status_bluetooth_enabled.png
index 67f92e0..67f92e0 100644
--- a/ui/resources/default_100_percent/aura/status_bluetooth_enabled.png
+++ b/ui/resources/default_100_percent/ash/status_bluetooth_enabled.png
diff --git a/ui/resources/default_100_percent/aura/status_bluetooth_enabled_h.png b/ui/resources/default_100_percent/ash/status_bluetooth_enabled_h.png
index 5293e80..5293e80 100644
--- a/ui/resources/default_100_percent/aura/status_bluetooth_enabled_h.png
+++ b/ui/resources/default_100_percent/ash/status_bluetooth_enabled_h.png
diff --git a/ui/resources/default_100_percent/aura/status_brightness.png b/ui/resources/default_100_percent/ash/status_brightness.png
index a755777..a755777 100644
--- a/ui/resources/default_100_percent/aura/status_brightness.png
+++ b/ui/resources/default_100_percent/ash/status_brightness.png
diff --git a/ui/resources/default_100_percent/aura/status_capslock.png b/ui/resources/default_100_percent/ash/status_capslock.png
index 9b08738..9b08738 100644
--- a/ui/resources/default_100_percent/aura/status_capslock.png
+++ b/ui/resources/default_100_percent/ash/status_capslock.png
diff --git a/ui/resources/default_100_percent/aura/status_capslock_dark.png b/ui/resources/default_100_percent/ash/status_capslock_dark.png
index 8c43448..8c43448 100644
--- a/ui/resources/default_100_percent/aura/status_capslock_dark.png
+++ b/ui/resources/default_100_percent/ash/status_capslock_dark.png
diff --git a/ui/resources/default_100_percent/aura/status_cellular_disabled.png b/ui/resources/default_100_percent/ash/status_cellular_disabled.png
index e001010..e001010 100644
--- a/ui/resources/default_100_percent/aura/status_cellular_disabled.png
+++ b/ui/resources/default_100_percent/ash/status_cellular_disabled.png
diff --git a/ui/resources/default_100_percent/aura/status_cellular_disabled_h.png b/ui/resources/default_100_percent/ash/status_cellular_disabled_h.png
index cabf6ff..cabf6ff 100644
--- a/ui/resources/default_100_percent/aura/status_cellular_disabled_h.png
+++ b/ui/resources/default_100_percent/ash/status_cellular_disabled_h.png
diff --git a/ui/resources/default_100_percent/aura/status_cellular_enabled.png b/ui/resources/default_100_percent/ash/status_cellular_enabled.png
index 9b188e1..9b188e1 100644
--- a/ui/resources/default_100_percent/aura/status_cellular_enabled.png
+++ b/ui/resources/default_100_percent/ash/status_cellular_enabled.png
diff --git a/ui/resources/default_100_percent/aura/status_cellular_enabled_h.png b/ui/resources/default_100_percent/ash/status_cellular_enabled_h.png
index ae7c3cf..ae7c3cf 100644
--- a/ui/resources/default_100_percent/aura/status_cellular_enabled_h.png
+++ b/ui/resources/default_100_percent/ash/status_cellular_enabled_h.png
diff --git a/ui/resources/default_100_percent/aura/status_chromevox.png b/ui/resources/default_100_percent/ash/status_chromevox.png
index 7217f6c..7217f6c 100644
--- a/ui/resources/default_100_percent/aura/status_chromevox.png
+++ b/ui/resources/default_100_percent/ash/status_chromevox.png
diff --git a/ui/resources/default_100_percent/aura/status_data_low.png b/ui/resources/default_100_percent/ash/status_data_low.png
index d14f54f3..d14f54f3 100644
--- a/ui/resources/default_100_percent/aura/status_data_low.png
+++ b/ui/resources/default_100_percent/ash/status_data_low.png
diff --git a/ui/resources/default_100_percent/aura/status_data_none.png b/ui/resources/default_100_percent/ash/status_data_none.png
index 84b0e56..84b0e56 100644
--- a/ui/resources/default_100_percent/aura/status_data_none.png
+++ b/ui/resources/default_100_percent/ash/status_data_none.png
diff --git a/ui/resources/default_100_percent/aura/status_drive.png b/ui/resources/default_100_percent/ash/status_drive.png
index affd263..affd263 100644
--- a/ui/resources/default_100_percent/aura/status_drive.png
+++ b/ui/resources/default_100_percent/ash/status_drive.png
diff --git a/ui/resources/default_100_percent/aura/status_drive_item_cancel.png b/ui/resources/default_100_percent/ash/status_drive_item_cancel.png
index 8a7d270..8a7d270 100644
--- a/ui/resources/default_100_percent/aura/status_drive_item_cancel.png
+++ b/ui/resources/default_100_percent/ash/status_drive_item_cancel.png
diff --git a/ui/resources/default_100_percent/aura/status_drive_item_cancel_hover.png b/ui/resources/default_100_percent/ash/status_drive_item_cancel_hover.png
index 33750f4c..33750f4c 100644
--- a/ui/resources/default_100_percent/aura/status_drive_item_cancel_hover.png
+++ b/ui/resources/default_100_percent/ash/status_drive_item_cancel_hover.png
diff --git a/ui/resources/default_100_percent/aura/status_drive_item_done.png b/ui/resources/default_100_percent/ash/status_drive_item_done.png
index e55f50b..e55f50b 100644
--- a/ui/resources/default_100_percent/aura/status_drive_item_done.png
+++ b/ui/resources/default_100_percent/ash/status_drive_item_done.png
diff --git a/ui/resources/default_100_percent/aura/status_drive_item_failed.png b/ui/resources/default_100_percent/ash/status_drive_item_failed.png
index fcf99da..fcf99da 100644
--- a/ui/resources/default_100_percent/aura/status_drive_item_failed.png
+++ b/ui/resources/default_100_percent/ash/status_drive_item_failed.png
diff --git a/ui/resources/default_100_percent/aura/status_drive_light.png b/ui/resources/default_100_percent/ash/status_drive_light.png
index 7b44b57..7b44b57 100644
--- a/ui/resources/default_100_percent/aura/status_drive_light.png
+++ b/ui/resources/default_100_percent/ash/status_drive_light.png
diff --git a/ui/resources/default_100_percent/aura/status_help.png b/ui/resources/default_100_percent/ash/status_help.png
index 77d8c93308..77d8c93308 100644
--- a/ui/resources/default_100_percent/aura/status_help.png
+++ b/ui/resources/default_100_percent/ash/status_help.png
diff --git a/ui/resources/default_100_percent/aura/status_help_h.png b/ui/resources/default_100_percent/ash/status_help_h.png
index 5f6ca9e..5f6ca9e 100644
--- a/ui/resources/default_100_percent/aura/status_help_h.png
+++ b/ui/resources/default_100_percent/ash/status_help_h.png
diff --git a/ui/resources/default_100_percent/aura/status_ime.png b/ui/resources/default_100_percent/ash/status_ime.png
index a320232..a320232 100644
--- a/ui/resources/default_100_percent/aura/status_ime.png
+++ b/ui/resources/default_100_percent/ash/status_ime.png
diff --git a/ui/resources/default_100_percent/aura/status_less.png b/ui/resources/default_100_percent/ash/status_less.png
index abb8d14..abb8d14 100644
--- a/ui/resources/default_100_percent/aura/status_less.png
+++ b/ui/resources/default_100_percent/ash/status_less.png
diff --git a/ui/resources/default_100_percent/aura/status_locale.png b/ui/resources/default_100_percent/ash/status_locale.png
index 12559d6..12559d6 100644
--- a/ui/resources/default_100_percent/aura/status_locale.png
+++ b/ui/resources/default_100_percent/ash/status_locale.png
diff --git a/ui/resources/default_100_percent/aura/status_lockscreen.png b/ui/resources/default_100_percent/ash/status_lockscreen.png
index b8fb9c8..b8fb9c8 100644
--- a/ui/resources/default_100_percent/aura/status_lockscreen.png
+++ b/ui/resources/default_100_percent/ash/status_lockscreen.png
diff --git a/ui/resources/default_100_percent/aura/status_lockscreen_h.png b/ui/resources/default_100_percent/ash/status_lockscreen_h.png
index 9e16f37..9e16f37 100644
--- a/ui/resources/default_100_percent/aura/status_lockscreen_h.png
+++ b/ui/resources/default_100_percent/ash/status_lockscreen_h.png
diff --git a/ui/resources/default_100_percent/aura/status_more.png b/ui/resources/default_100_percent/ash/status_more.png
index ac9e1be..ac9e1be 100644
--- a/ui/resources/default_100_percent/aura/status_more.png
+++ b/ui/resources/default_100_percent/ash/status_more.png
diff --git a/ui/resources/default_100_percent/aura/status_network.png b/ui/resources/default_100_percent/ash/status_network.png
index 2e77d94..2e77d94 100644
--- a/ui/resources/default_100_percent/aura/status_network.png
+++ b/ui/resources/default_100_percent/ash/status_network.png
diff --git a/ui/resources/default_100_percent/aura/status_network_airplane.png b/ui/resources/default_100_percent/ash/status_network_airplane.png
index 2f796cb..2f796cb 100644
--- a/ui/resources/default_100_percent/aura/status_network_airplane.png
+++ b/ui/resources/default_100_percent/ash/status_network_airplane.png
diff --git a/ui/resources/default_100_percent/aura/status_network_failed.png b/ui/resources/default_100_percent/ash/status_network_failed.png
index 5adfbc7..5adfbc7 100644
--- a/ui/resources/default_100_percent/aura/status_network_failed.png
+++ b/ui/resources/default_100_percent/ash/status_network_failed.png
diff --git a/ui/resources/default_100_percent/aura/status_network_info.png b/ui/resources/default_100_percent/ash/status_network_info.png
index 6eb28ab..6eb28ab 100644
--- a/ui/resources/default_100_percent/aura/status_network_info.png
+++ b/ui/resources/default_100_percent/ash/status_network_info.png
diff --git a/ui/resources/default_100_percent/aura/status_network_info_h.png b/ui/resources/default_100_percent/ash/status_network_info_h.png
index b81ea4e..b81ea4e 100644
--- a/ui/resources/default_100_percent/aura/status_network_info_h.png
+++ b/ui/resources/default_100_percent/ash/status_network_info_h.png
diff --git a/ui/resources/default_100_percent/aura/status_power_small_all.png b/ui/resources/default_100_percent/ash/status_power_small_all.png
index e6160ef..e6160ef 100644
--- a/ui/resources/default_100_percent/aura/status_power_small_all.png
+++ b/ui/resources/default_100_percent/ash/status_power_small_all.png
diff --git a/ui/resources/default_100_percent/aura/status_power_small_all_dark.png b/ui/resources/default_100_percent/ash/status_power_small_all_dark.png
index 3c99c1c..3c99c1c 100644
--- a/ui/resources/default_100_percent/aura/status_power_small_all_dark.png
+++ b/ui/resources/default_100_percent/ash/status_power_small_all_dark.png
diff --git a/ui/resources/default_100_percent/aura/status_settings.png b/ui/resources/default_100_percent/ash/status_settings.png
index 6a0068d..6a0068d 100644
--- a/ui/resources/default_100_percent/aura/status_settings.png
+++ b/ui/resources/default_100_percent/ash/status_settings.png
diff --git a/ui/resources/default_100_percent/aura/status_shutdown.png b/ui/resources/default_100_percent/ash/status_shutdown.png
index 2de8ccb..2de8ccb 100644
--- a/ui/resources/default_100_percent/aura/status_shutdown.png
+++ b/ui/resources/default_100_percent/ash/status_shutdown.png
diff --git a/ui/resources/default_100_percent/aura/status_shutdown_h.png b/ui/resources/default_100_percent/ash/status_shutdown_h.png
index 5222e28..5222e28 100644
--- a/ui/resources/default_100_percent/aura/status_shutdown_h.png
+++ b/ui/resources/default_100_percent/ash/status_shutdown_h.png
diff --git a/ui/resources/default_100_percent/aura/status_sms.png b/ui/resources/default_100_percent/ash/status_sms.png
index eccaa3b..eccaa3b 100644
--- a/ui/resources/default_100_percent/aura/status_sms.png
+++ b/ui/resources/default_100_percent/ash/status_sms.png
diff --git a/ui/resources/default_100_percent/aura/status_update.png b/ui/resources/default_100_percent/ash/status_update.png
index b74d81d..b74d81d 100644
--- a/ui/resources/default_100_percent/aura/status_update.png
+++ b/ui/resources/default_100_percent/ash/status_update.png
diff --git a/ui/resources/default_100_percent/aura/status_update_dark.png b/ui/resources/default_100_percent/ash/status_update_dark.png
index c8c0cb7..c8c0cb7 100644
--- a/ui/resources/default_100_percent/aura/status_update_dark.png
+++ b/ui/resources/default_100_percent/ash/status_update_dark.png
diff --git a/ui/resources/default_100_percent/aura/status_volume.png b/ui/resources/default_100_percent/ash/status_volume.png
index 2f3b4a3..2f3b4a3 100644
--- a/ui/resources/default_100_percent/aura/status_volume.png
+++ b/ui/resources/default_100_percent/ash/status_volume.png
diff --git a/ui/resources/default_100_percent/aura/status_volume_all.png b/ui/resources/default_100_percent/ash/status_volume_all.png
index e24b60c..e24b60c 100644
--- a/ui/resources/default_100_percent/aura/status_volume_all.png
+++ b/ui/resources/default_100_percent/ash/status_volume_all.png
diff --git a/ui/resources/default_100_percent/aura/status_volume_mute.png b/ui/resources/default_100_percent/ash/status_volume_mute.png
index 7a3bc7c..7a3bc7c 100644
--- a/ui/resources/default_100_percent/aura/status_volume_mute.png
+++ b/ui/resources/default_100_percent/ash/status_volume_mute.png
diff --git a/ui/resources/default_100_percent/aura/status_wifi_disabled.png b/ui/resources/default_100_percent/ash/status_wifi_disabled.png
index 55fc2cc..55fc2cc 100644
--- a/ui/resources/default_100_percent/aura/status_wifi_disabled.png
+++ b/ui/resources/default_100_percent/ash/status_wifi_disabled.png
diff --git a/ui/resources/default_100_percent/aura/status_wifi_disabled_h.png b/ui/resources/default_100_percent/ash/status_wifi_disabled_h.png
index 775079c..775079c 100644
--- a/ui/resources/default_100_percent/aura/status_wifi_disabled_h.png
+++ b/ui/resources/default_100_percent/ash/status_wifi_disabled_h.png
diff --git a/ui/resources/default_100_percent/aura/status_wifi_enabled.png b/ui/resources/default_100_percent/ash/status_wifi_enabled.png
index c0150d8..c0150d8 100644
--- a/ui/resources/default_100_percent/aura/status_wifi_enabled.png
+++ b/ui/resources/default_100_percent/ash/status_wifi_enabled.png
diff --git a/ui/resources/default_100_percent/aura/status_wifi_enabled_h.png b/ui/resources/default_100_percent/ash/status_wifi_enabled_h.png
index a2f18bf..a2f18bf 100644
--- a/ui/resources/default_100_percent/aura/status_wifi_enabled_h.png
+++ b/ui/resources/default_100_percent/ash/status_wifi_enabled_h.png
diff --git a/ui/resources/default_100_percent/aura/statusbar.png b/ui/resources/default_100_percent/ash/statusbar.png
index 8c8b18e..8c8b18e 100644
--- a/ui/resources/default_100_percent/aura/statusbar.png
+++ b/ui/resources/default_100_percent/ash/statusbar.png
diff --git a/ui/resources/default_100_percent/aura/statusbar_notifications.png b/ui/resources/default_100_percent/ash/statusbar_notifications.png
index fbd8e38..fbd8e38 100644
--- a/ui/resources/default_100_percent/aura/statusbar_notifications.png
+++ b/ui/resources/default_100_percent/ash/statusbar_notifications.png
diff --git a/ui/resources/default_100_percent/aura/switch_monitor.png b/ui/resources/default_100_percent/ash/switch_monitor.png
index 5e94ec6..5e94ec6 100644
--- a/ui/resources/default_100_percent/aura/switch_monitor.png
+++ b/ui/resources/default_100_percent/ash/switch_monitor.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_bottom.png b/ui/resources/default_100_percent/ash/window_shadow_active_bottom.png
index 7a8d9f6..7a8d9f6 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_bottom.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_bottom.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_bottom_left.png b/ui/resources/default_100_percent/ash/window_shadow_active_bottom_left.png
index 8e4d5e2..8e4d5e2 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_bottom_left.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_bottom_left.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_bottom_right.png b/ui/resources/default_100_percent/ash/window_shadow_active_bottom_right.png
index 943e84c..943e84c 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_bottom_right.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_bottom_right.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_left.png b/ui/resources/default_100_percent/ash/window_shadow_active_left.png
index f63bfff..f63bfff 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_left.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_left.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_right.png b/ui/resources/default_100_percent/ash/window_shadow_active_right.png
index d318ed1..d318ed1 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_right.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_right.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_top.png b/ui/resources/default_100_percent/ash/window_shadow_active_top.png
index 08d0773..08d0773 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_top.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_top.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_top_left.png b/ui/resources/default_100_percent/ash/window_shadow_active_top_left.png
index f9513873..f9513873 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_top_left.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_top_left.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_active_top_right.png b/ui/resources/default_100_percent/ash/window_shadow_active_top_right.png
index 687dca7..687dca7 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_active_top_right.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_active_top_right.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_bottom.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom.png
index 88d3d7d..88d3d7d 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_bottom.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_bottom_left.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_left.png
index c0f5b63..c0f5b63 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_bottom_left.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_left.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_bottom_right.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_right.png
index 60f1a49..60f1a49 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_bottom_right.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_right.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_left.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_left.png
index 56b1a5d..56b1a5d 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_left.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_left.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_right.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_right.png
index 20ad740..20ad740 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_right.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_right.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_top.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_top.png
index f643d82..f643d82 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_top.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_top.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_top_left.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_top_left.png
index 3386052..3386052 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_top_left.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_top_left.png
diff --git a/ui/resources/default_100_percent/aura/window_shadow_inactive_top_right.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_top_right.png
index b614bbd..b614bbd 100644
--- a/ui/resources/default_100_percent/aura/window_shadow_inactive_top_right.png
+++ b/ui/resources/default_100_percent/ash/window_shadow_inactive_top_right.png
diff --git a/ui/resources/default_200_percent/ash/PRESUBMIT.py b/ui/resources/default_200_percent/ash/PRESUBMIT.py
new file mode 100644
index 0000000..8311e1c
--- /dev/null
+++ b/ui/resources/default_200_percent/ash/PRESUBMIT.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Chromium presubmit script for src/chrome/browser/externsions.
+
+See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+for more details on the presubmit API built into gcl.
+"""
+
+def GetPreferredTrySlaves():
+  return ['linux_chromeos']
diff --git a/ui/resources/default_200_percent/aura/status_accessibility_mode.png b/ui/resources/default_200_percent/ash/status_accessibility_mode.png
index f91cf66..f91cf66 100644
--- a/ui/resources/default_200_percent/aura/status_accessibility_mode.png
+++ b/ui/resources/default_200_percent/ash/status_accessibility_mode.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth.png b/ui/resources/default_200_percent/ash/status_bluetooth.png
index 3af6c75..3af6c75 100644
--- a/ui/resources/default_200_percent/aura/status_bluetooth.png
+++ b/ui/resources/default_200_percent/ash/status_bluetooth.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_disabled.png b/ui/resources/default_200_percent/ash/status_bluetooth_disabled.png
index b89c5cb..b89c5cb 100644
--- a/ui/resources/default_200_percent/aura/status_bluetooth_disabled.png
+++ b/ui/resources/default_200_percent/ash/status_bluetooth_disabled.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_disabled_h.png b/ui/resources/default_200_percent/ash/status_bluetooth_disabled_h.png
index 28335e1..28335e1 100644
--- a/ui/resources/default_200_percent/aura/status_bluetooth_disabled_h.png
+++ b/ui/resources/default_200_percent/ash/status_bluetooth_disabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_enabled.png b/ui/resources/default_200_percent/ash/status_bluetooth_enabled.png
index ade36ed..ade36ed 100644
--- a/ui/resources/default_200_percent/aura/status_bluetooth_enabled.png
+++ b/ui/resources/default_200_percent/ash/status_bluetooth_enabled.png
diff --git a/ui/resources/default_200_percent/aura/status_bluetooth_enabled_h.png b/ui/resources/default_200_percent/ash/status_bluetooth_enabled_h.png
index 24413cb..24413cb 100644
--- a/ui/resources/default_200_percent/aura/status_bluetooth_enabled_h.png
+++ b/ui/resources/default_200_percent/ash/status_bluetooth_enabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_brightness.png b/ui/resources/default_200_percent/ash/status_brightness.png
index f96488f..f96488f 100644
--- a/ui/resources/default_200_percent/aura/status_brightness.png
+++ b/ui/resources/default_200_percent/ash/status_brightness.png
diff --git a/ui/resources/default_200_percent/aura/status_capslock.png b/ui/resources/default_200_percent/ash/status_capslock.png
index 7e144945..7e144945 100644
--- a/ui/resources/default_200_percent/aura/status_capslock.png
+++ b/ui/resources/default_200_percent/ash/status_capslock.png
diff --git a/ui/resources/default_200_percent/aura/status_capslock_dark.png b/ui/resources/default_200_percent/ash/status_capslock_dark.png
index 7b04eca..7b04eca 100644
--- a/ui/resources/default_200_percent/aura/status_capslock_dark.png
+++ b/ui/resources/default_200_percent/ash/status_capslock_dark.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_disabled.png b/ui/resources/default_200_percent/ash/status_cellular_disabled.png
index e538f72..e538f72 100644
--- a/ui/resources/default_200_percent/aura/status_cellular_disabled.png
+++ b/ui/resources/default_200_percent/ash/status_cellular_disabled.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_disabled_h.png b/ui/resources/default_200_percent/ash/status_cellular_disabled_h.png
index 52813a8..52813a8 100644
--- a/ui/resources/default_200_percent/aura/status_cellular_disabled_h.png
+++ b/ui/resources/default_200_percent/ash/status_cellular_disabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_enabled.png b/ui/resources/default_200_percent/ash/status_cellular_enabled.png
index 2702a6d..2702a6d 100644
--- a/ui/resources/default_200_percent/aura/status_cellular_enabled.png
+++ b/ui/resources/default_200_percent/ash/status_cellular_enabled.png
diff --git a/ui/resources/default_200_percent/aura/status_cellular_enabled_h.png b/ui/resources/default_200_percent/ash/status_cellular_enabled_h.png
index a36b3ff..a36b3ff 100644
--- a/ui/resources/default_200_percent/aura/status_cellular_enabled_h.png
+++ b/ui/resources/default_200_percent/ash/status_cellular_enabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_help.png b/ui/resources/default_200_percent/ash/status_help.png
index 8630e7e..8630e7e 100644
--- a/ui/resources/default_200_percent/aura/status_help.png
+++ b/ui/resources/default_200_percent/ash/status_help.png
diff --git a/ui/resources/default_200_percent/aura/status_help_h.png b/ui/resources/default_200_percent/ash/status_help_h.png
index f441e8f..f441e8f 100644
--- a/ui/resources/default_200_percent/aura/status_help_h.png
+++ b/ui/resources/default_200_percent/ash/status_help_h.png
diff --git a/ui/resources/default_200_percent/aura/status_less.png b/ui/resources/default_200_percent/ash/status_less.png
index e620ddc..e620ddc 100644
--- a/ui/resources/default_200_percent/aura/status_less.png
+++ b/ui/resources/default_200_percent/ash/status_less.png
diff --git a/ui/resources/default_200_percent/aura/status_lockscreen.png b/ui/resources/default_200_percent/ash/status_lockscreen.png
index 5a37767..5a37767 100644
--- a/ui/resources/default_200_percent/aura/status_lockscreen.png
+++ b/ui/resources/default_200_percent/ash/status_lockscreen.png
diff --git a/ui/resources/default_200_percent/aura/status_lockscreen_h.png b/ui/resources/default_200_percent/ash/status_lockscreen_h.png
index 54a70d4..54a70d4 100644
--- a/ui/resources/default_200_percent/aura/status_lockscreen_h.png
+++ b/ui/resources/default_200_percent/ash/status_lockscreen_h.png
diff --git a/ui/resources/default_200_percent/aura/status_more.png b/ui/resources/default_200_percent/ash/status_more.png
index 0700acc..0700acc 100644
--- a/ui/resources/default_200_percent/aura/status_more.png
+++ b/ui/resources/default_200_percent/ash/status_more.png
diff --git a/ui/resources/default_200_percent/aura/status_network_info.png b/ui/resources/default_200_percent/ash/status_network_info.png
index c003bd8..c003bd8 100644
--- a/ui/resources/default_200_percent/aura/status_network_info.png
+++ b/ui/resources/default_200_percent/ash/status_network_info.png
diff --git a/ui/resources/default_200_percent/aura/status_network_info_h.png b/ui/resources/default_200_percent/ash/status_network_info_h.png
index 7a4ddf0..7a4ddf0 100644
--- a/ui/resources/default_200_percent/aura/status_network_info_h.png
+++ b/ui/resources/default_200_percent/ash/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/ash/status_power_small_all.png
index 2700b02..2700b02 100644
--- a/ui/resources/default_200_percent/aura/status_power_small_all.png
+++ b/ui/resources/default_200_percent/ash/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/ash/status_power_small_all_dark.png
index 2365016..2365016 100644
--- a/ui/resources/default_200_percent/aura/status_power_small_all_dark.png
+++ b/ui/resources/default_200_percent/ash/status_power_small_all_dark.png
diff --git a/ui/resources/default_200_percent/aura/status_settings.png b/ui/resources/default_200_percent/ash/status_settings.png
index 754a3df..754a3df 100644
--- a/ui/resources/default_200_percent/aura/status_settings.png
+++ b/ui/resources/default_200_percent/ash/status_settings.png
diff --git a/ui/resources/default_200_percent/aura/status_shutdown.png b/ui/resources/default_200_percent/ash/status_shutdown.png
index 0ec047b..0ec047b 100644
--- a/ui/resources/default_200_percent/aura/status_shutdown.png
+++ b/ui/resources/default_200_percent/ash/status_shutdown.png
diff --git a/ui/resources/default_200_percent/aura/status_shutdown_h.png b/ui/resources/default_200_percent/ash/status_shutdown_h.png
index 287e572..287e572 100644
--- a/ui/resources/default_200_percent/aura/status_shutdown_h.png
+++ b/ui/resources/default_200_percent/ash/status_shutdown_h.png
diff --git a/ui/resources/default_200_percent/aura/status_update.png b/ui/resources/default_200_percent/ash/status_update.png
index 24755bb..24755bb 100644
--- a/ui/resources/default_200_percent/aura/status_update.png
+++ b/ui/resources/default_200_percent/ash/status_update.png
diff --git a/ui/resources/default_200_percent/aura/status_update_dark.png b/ui/resources/default_200_percent/ash/status_update_dark.png
index b0867a6..b0867a6 100644
--- a/ui/resources/default_200_percent/aura/status_update_dark.png
+++ b/ui/resources/default_200_percent/ash/status_update_dark.png
diff --git a/ui/resources/default_200_percent/aura/status_volume_all.png b/ui/resources/default_200_percent/ash/status_volume_all.png
index 80059a2..80059a2 100644
--- a/ui/resources/default_200_percent/aura/status_volume_all.png
+++ b/ui/resources/default_200_percent/ash/status_volume_all.png
diff --git a/ui/resources/default_200_percent/aura/status_volume_mute.png b/ui/resources/default_200_percent/ash/status_volume_mute.png
index 9c18441..9c18441 100644
--- a/ui/resources/default_200_percent/aura/status_volume_mute.png
+++ b/ui/resources/default_200_percent/ash/status_volume_mute.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_disabled.png b/ui/resources/default_200_percent/ash/status_wifi_disabled.png
index 9da6815..9da6815 100644
--- a/ui/resources/default_200_percent/aura/status_wifi_disabled.png
+++ b/ui/resources/default_200_percent/ash/status_wifi_disabled.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_disabled_h.png b/ui/resources/default_200_percent/ash/status_wifi_disabled_h.png
index 52eef9f..52eef9f 100644
--- a/ui/resources/default_200_percent/aura/status_wifi_disabled_h.png
+++ b/ui/resources/default_200_percent/ash/status_wifi_disabled_h.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_enabled.png b/ui/resources/default_200_percent/ash/status_wifi_enabled.png
index 596f95fa..596f95fa 100644
--- a/ui/resources/default_200_percent/aura/status_wifi_enabled.png
+++ b/ui/resources/default_200_percent/ash/status_wifi_enabled.png
diff --git a/ui/resources/default_200_percent/aura/status_wifi_enabled_h.png b/ui/resources/default_200_percent/ash/status_wifi_enabled_h.png
index 419c016..419c016 100644
--- a/ui/resources/default_200_percent/aura/status_wifi_enabled_h.png
+++ b/ui/resources/default_200_percent/ash/status_wifi_enabled_h.png
diff --git a/ui/resources/default_200_percent/aura/statusbar_notifications.png b/ui/resources/default_200_percent/ash/statusbar_notifications.png
index ba121bf..ba121bf 100644
--- a/ui/resources/default_200_percent/aura/statusbar_notifications.png
+++ b/ui/resources/default_200_percent/ash/statusbar_notifications.png
diff --git a/ui/resources/default_200_percent/aura/PRESUBMIT.py b/ui/resources/default_200_percent/aura/PRESUBMIT.py
new file mode 100644
index 0000000..8311e1c
--- /dev/null
+++ b/ui/resources/default_200_percent/aura/PRESUBMIT.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Chromium presubmit script for src/chrome/browser/externsions.
+
+See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+for more details on the presubmit API built into gcl.
+"""
+
+def GetPreferredTrySlaves():
+  return ['linux_chromeos']
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index e780a32..2153456 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -137,60 +137,60 @@
       <!-- Images only used by Aura. -->
       <if expr="pp_ifdef('use_aura')">
         <include name="IDR_AURA_LAUNCHER_BROWSER_SHORTCUT" file="default_100_percent/aura/chromium-32.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_BROWSER" file="default_100_percent/aura/launcher_browser.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_BROWSER_PANEL" file="default_100_percent/aura/launcher_browser_panel.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="default_100_percent/aura/launcher_applist.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="default_100_percent/aura/launcher_applist_hover.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="default_100_percent/aura/launcher_applist_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER" file="default_100_percent/aura/launcher_incognito_browser.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL" file="default_100_percent/aura/launcher_incognito_browser_panel.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER" file="default_100_percent/aura/new_browser.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_HOT" file="default_100_percent/aura/new_browser_hover.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED" file="default_100_percent/aura/new_browser_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_OVERFLOW" file="default_100_percent/aura/launcher_overflow.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_OVERFLOW_HOT" file="default_100_percent/aura/launcher_overflow_hover.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_OVERFLOW_PUSHED" file="default_100_percent/aura/launcher_overflow_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE" file="default_100_percent/aura/launcher_underline_active.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_UNDERLINE_HOVER" file="default_100_percent/aura/launcher_underline_hover.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING" file="default_100_percent/aura/launcher_underline_running.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE" file="default_100_percent/aura/launcher_underline_active.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER" file="default_100_percent/aura/launcher_underline_hover.png" type="BINDATA" />
-        <include name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING" file="default_100_percent/aura/launcher_underline_running.png" type="BINDATA" />
-        <include name="IDR_AURA_MULTI_WINDOW_RESIZE_H" file="default_100_percent/aura/multi_window_resize_hover.png" type="BINDATA" />
-        <include name="IDR_AURA_MULTI_WINDOW_RESIZE_V" file="default_100_percent/aura/multi_window_resize_v.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_TOP_LEFT" file="default_100_percent/aura/resize_shadow_top_left.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_TOP" file="default_100_percent/aura/resize_shadow_top.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_TOP_RIGHT" file="default_100_percent/aura/resize_shadow_top_right.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_LEFT" file="default_100_percent/aura/resize_shadow_left.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_RIGHT" file="default_100_percent/aura/resize_shadow_right.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_BOTTOM_LEFT" file="default_100_percent/aura/resize_shadow_bottom_left.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_BOTTOM" file="default_100_percent/aura/resize_shadow_bottom.png" type="BINDATA" />
-        <include name="IDR_AURA_RESIZE_SHADOW_BOTTOM_RIGHT" file="default_100_percent/aura/resize_shadow_bottom_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_TOP_LEFT" file="default_100_percent/aura/window_shadow_active_top_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_TOP" file="default_100_percent/aura/window_shadow_active_top.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT" file="default_100_percent/aura/window_shadow_active_top_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_LEFT" file="default_100_percent/aura/window_shadow_active_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_RIGHT" file="default_100_percent/aura/window_shadow_active_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT" file="default_100_percent/aura/window_shadow_active_bottom_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_BOTTOM" file="default_100_percent/aura/window_shadow_active_bottom.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT" file="default_100_percent/aura/window_shadow_active_bottom_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_TOP_LEFT" file="default_100_percent/aura/window_shadow_inactive_top_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_TOP" file="default_100_percent/aura/window_shadow_inactive_top.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT" file="default_100_percent/aura/window_shadow_inactive_top_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_LEFT" file="default_100_percent/aura/window_shadow_inactive_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_RIGHT" file="default_100_percent/aura/window_shadow_inactive_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT" file="default_100_percent/aura/window_shadow_inactive_bottom_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM" file="default_100_percent/aura/window_shadow_inactive_bottom.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT" file="default_100_percent/aura/window_shadow_inactive_bottom_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_TOP_LEFT" file="default_100_percent/aura/small_shadow_top_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_TOP" file="default_100_percent/aura/small_shadow_top.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_TOP_RIGHT" file="default_100_percent/aura/small_shadow_top_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_LEFT" file="default_100_percent/aura/small_shadow_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_RIGHT" file="default_100_percent/aura/small_shadow_right.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT" file="default_100_percent/aura/small_shadow_bottom_left.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_BOTTOM" file="default_100_percent/aura/small_shadow_bottom.png" type="BINDATA" />
-        <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT" file="default_100_percent/aura/small_shadow_bottom_right.png" type="BINDATA" />
-        <include name="IDR_AURA_STATUS_MOCK" file="default_100_percent/aura/statusbar.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_BROWSER" file="default_100_percent/ash/launcher_browser.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_BROWSER_PANEL" file="default_100_percent/ash/launcher_browser_panel.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="default_100_percent/ash/launcher_applist.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="default_100_percent/ash/launcher_applist_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="default_100_percent/ash/launcher_applist_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER" file="default_100_percent/ash/launcher_incognito_browser.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL" file="default_100_percent/ash/launcher_incognito_browser_panel.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER" file="default_100_percent/ash/new_browser.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_HOT" file="default_100_percent/ash/new_browser_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED" file="default_100_percent/ash/new_browser_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_OVERFLOW" file="default_100_percent/ash/launcher_overflow.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_OVERFLOW_HOT" file="default_100_percent/ash/launcher_overflow_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_OVERFLOW_PUSHED" file="default_100_percent/ash/launcher_overflow_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE" file="default_100_percent/ash/launcher_underline_active.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_UNDERLINE_HOVER" file="default_100_percent/ash/launcher_underline_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING" file="default_100_percent/ash/launcher_underline_running.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE" file="default_100_percent/ash/launcher_underline_active.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER" file="default_100_percent/ash/launcher_underline_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING" file="default_100_percent/ash/launcher_underline_running.png" type="BINDATA" />
+        <include name="IDR_AURA_MULTI_WINDOW_RESIZE_H" file="default_100_percent/ash/multi_window_resize_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_MULTI_WINDOW_RESIZE_V" file="default_100_percent/ash/multi_window_resize_v.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_TOP_LEFT" file="default_100_percent/ash/resize_shadow_top_left.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_TOP" file="default_100_percent/ash/resize_shadow_top.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_TOP_RIGHT" file="default_100_percent/ash/resize_shadow_top_right.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_LEFT" file="default_100_percent/ash/resize_shadow_left.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_RIGHT" file="default_100_percent/ash/resize_shadow_right.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_BOTTOM_LEFT" file="default_100_percent/ash/resize_shadow_bottom_left.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_BOTTOM" file="default_100_percent/ash/resize_shadow_bottom.png" type="BINDATA" />
+        <include name="IDR_AURA_RESIZE_SHADOW_BOTTOM_RIGHT" file="default_100_percent/ash/resize_shadow_bottom_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_TOP_LEFT" file="default_100_percent/ash/window_shadow_active_top_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_TOP" file="default_100_percent/ash/window_shadow_active_top.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT" file="default_100_percent/ash/window_shadow_active_top_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_LEFT" file="default_100_percent/ash/window_shadow_active_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_RIGHT" file="default_100_percent/ash/window_shadow_active_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT" file="default_100_percent/ash/window_shadow_active_bottom_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_BOTTOM" file="default_100_percent/ash/window_shadow_active_bottom.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT" file="default_100_percent/ash/window_shadow_active_bottom_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_TOP_LEFT" file="default_100_percent/ash/window_shadow_inactive_top_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_TOP" file="default_100_percent/ash/window_shadow_inactive_top.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT" file="default_100_percent/ash/window_shadow_inactive_top_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_LEFT" file="default_100_percent/ash/window_shadow_inactive_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_RIGHT" file="default_100_percent/ash/window_shadow_inactive_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT" file="default_100_percent/ash/window_shadow_inactive_bottom_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM" file="default_100_percent/ash/window_shadow_inactive_bottom.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT" file="default_100_percent/ash/window_shadow_inactive_bottom_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_TOP_LEFT" file="default_100_percent/ash/small_shadow_top_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_TOP" file="default_100_percent/ash/small_shadow_top.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_TOP_RIGHT" file="default_100_percent/ash/small_shadow_top_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_LEFT" file="default_100_percent/ash/small_shadow_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_RIGHT" file="default_100_percent/ash/small_shadow_right.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT" file="default_100_percent/ash/small_shadow_bottom_left.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_BOTTOM" file="default_100_percent/ash/small_shadow_bottom.png" type="BINDATA" />
+        <include name="IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT" file="default_100_percent/ash/small_shadow_bottom_right.png" type="BINDATA" />
+        <include name="IDR_AURA_STATUS_MOCK" file="default_100_percent/ash/statusbar.png" type="BINDATA" />
       </if>
 
       <!-- Wallpapers used by Ash when building ChromiumOS. -->
@@ -283,7 +283,7 @@
         <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_SWITCH_MONITOR" file="default_100_percent/aura/switch_monitor.png" type="BINDATA" />
+        <include name="IDR_AURA_SWITCH_MONITOR" file="default_100_percent/ash/switch_monitor.png" type="BINDATA" />
         <include name="IDR_OAK" file="oak.png" type="BINDATA"/>
       </if>
     </includes>
diff --git a/ui/resources/ui_resources_2x.grd b/ui/resources/ui_resources_2x.grd
index 779d850..0440d74 100644
--- a/ui/resources/ui_resources_2x.grd
+++ b/ui/resources/ui_resources_2x.grd
@@ -110,54 +110,54 @@
         <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" />
-        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_200_percent/aura/statusbar_notifications.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_200_percent/ash/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_200_percent/ash/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_200_percent/ash/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_200_percent/ash/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_200_percent/ash/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_200_percent/ash/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_200_percent/ash/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_200_percent/ash/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/ash/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_200_percent/ash/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_200_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/ash/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/ash/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/ash/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/ash/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/ash/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/ash/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_200_percent/ash/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_200_percent/ash/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_200_percent/ash/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_200_percent/ash/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_200_percent/ash/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_200_percent/ash/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_200_percent/ash/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_200_percent/ash/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_200_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_200_percent/ash/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_200_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_200_percent/ash/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_200_percent/ash/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_200_percent/ash/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_200_percent/ash/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_200_percent/ash/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_200_percent/ash/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_200_percent/ash/statusbar_notifications.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_standard.grd b/ui/resources/ui_resources_standard.grd
index 0826c7f..99143a9 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -110,54 +110,54 @@
         <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" />
-        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_100_percent/aura/statusbar_notifications.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/ash/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_100_percent/ash/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_100_percent/ash/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_100_percent/ash/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_100_percent/ash/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_100_percent/ash/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_100_percent/ash/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_100_percent/ash/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/ash/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/ash/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/ash/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_100_percent/ash/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_100_percent/ash/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_100_percent/ash/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_100_percent/ash/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_100_percent/ash/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_100_percent/ash/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_100_percent/ash/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_100_percent/ash/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_100_percent/ash/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_100_percent/ash/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_100_percent/ash/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_100_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_100_percent/ash/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_100_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_100_percent/ash/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_100_percent/ash/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_100_percent/ash/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_100_percent/ash/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/ash/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_100_percent/ash/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_100_percent/ash/statusbar_notifications.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 529d8d1..59e99b3 100644
--- a/ui/resources/ui_resources_touch.grd
+++ b/ui/resources/ui_resources_touch.grd
@@ -107,54 +107,54 @@
         <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" />
-        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_100_percent/aura/statusbar_notifications.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/ash/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_100_percent/ash/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_100_percent/ash/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_100_percent/ash/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_100_percent/ash/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_100_percent/ash/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_100_percent/ash/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_100_percent/ash/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/ash/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/ash/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/ash/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_100_percent/ash/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_100_percent/ash/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_100_percent/ash/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_100_percent/ash/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_100_percent/ash/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_100_percent/ash/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_100_percent/ash/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_100_percent/ash/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_100_percent/ash/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_100_percent/ash/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_100_percent/ash/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_100_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_100_percent/ash/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_100_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_100_percent/ash/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_100_percent/ash/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_100_percent/ash/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_100_percent/ash/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/ash/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_100_percent/ash/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_100_percent/ash/statusbar_notifications.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 95e47ce..a58e704 100644
--- a/ui/resources/ui_resources_touch_2x.grd
+++ b/ui/resources/ui_resources_touch_2x.grd
@@ -107,54 +107,54 @@
         <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" />
-        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_200_percent/aura/statusbar_notifications.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_200_percent/ash/status_volume_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_200_percent/ash/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_200_percent/ash/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_200_percent/ash/status_settings.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_200_percent/ash/status_power_small_all.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_200_percent/ash/status_power_small_all_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_200_percent/ash/status_network_info.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_200_percent/ash/status_network_info_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/ash/status_more.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LESS" file="default_200_percent/ash/status_less.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_200_percent/ash/status_accessibility_mode.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/ash/status_capslock.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/ash/status_capslock_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/ash/status_bluetooth.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/ash/status_update.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/ash/status_update_dark.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/ash/status_wifi_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_200_percent/ash/status_wifi_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_200_percent/ash/status_wifi_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_200_percent/ash/status_wifi_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_200_percent/ash/status_cellular_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_200_percent/ash/status_cellular_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_200_percent/ash/status_cellular_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_200_percent/ash/status_cellular_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_200_percent/ash/status_bluetooth_enabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_200_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_200_percent/ash/status_bluetooth_disabled.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_200_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_200_percent/ash/status_shutdown.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_200_percent/ash/status_shutdown_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_200_percent/ash/status_lockscreen.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_200_percent/ash/status_lockscreen_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP" file="default_200_percent/ash/status_help.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_200_percent/ash/status_help_h.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_200_percent/ash/statusbar_notifications.png" type="BINDATA" />
       </if>
 
       <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')">