Merge branch 'v1.4-bug-975535-homescreen' of github.com:samjoch/gaia …

…into samjoch-v1.4-bug-975535-homescreen Conflicts: external-apps/marketplace.firefox.com/application.zip
mozilla-b2g · Apr 22, 2014 · 38997b9 · 38997b9
2 parents 00279ff + 7477a27
commit 38997b9
Show file tree

Hide file tree

Showing 173 changed files with 56 additions and 26 deletions.
diff --git a/apps/calendar/manifest.webapp b/apps/calendar/manifest.webapp
@@ -41,7 +41,8 @@
   "icons": {
     "60": "/style/icons/Calendar_60.png",
     "90": "/style/icons/Calendar_90.png",
-    "120": "/style/icons/Calendar_120.png"
+    "120": "/style/icons/Calendar_120.png",
+    "135": "/style/icons/Calendar_135.png"
   },
   "orientation": "default"
 }
diff --git a/apps/calendar/style/icons/Calendar_120.png b/apps/calendar/style/icons/Calendar_120.png
diff --git a/apps/calendar/style/icons/Calendar_135.png b/apps/calendar/style/icons/Calendar_135.png
diff --git a/apps/calendar/style/icons/Calendar_60.png b/apps/calendar/style/icons/Calendar_60.png
diff --git a/apps/calendar/style/icons/Calendar_90.png b/apps/calendar/style/icons/Calendar_90.png
diff --git a/apps/camera/manifest.webapp b/apps/camera/manifest.webapp
@@ -56,6 +56,7 @@
   "icons": {
     "60": "/style/icons/Camera_60.png",
     "90": "/style/icons/Camera_90.png",
-    "120": "/style/icons/Camera_120.png"
+    "120": "/style/icons/Camera_120.png",
+    "135": "/style/icons/Camera_135.png"
   }
 }
diff --git a/apps/camera/style/icons/Camera_120.png b/apps/camera/style/icons/Camera_120.png
diff --git a/apps/camera/style/icons/Camera_135.png b/apps/camera/style/icons/Camera_135.png
diff --git a/apps/camera/style/icons/Camera_60.png b/apps/camera/style/icons/Camera_60.png
diff --git a/apps/camera/style/icons/Camera_90.png b/apps/camera/style/icons/Camera_90.png
diff --git a/apps/clock/manifest.webapp b/apps/clock/manifest.webapp
@@ -36,7 +36,8 @@
   "icons": {
     "60": "/style/icons/Clock_60.png",
     "90": "/style/icons/Clock_90.png",
-    "120": "/style/icons/Clock_120.png"
+    "120": "/style/icons/Clock_120.png",
+    "135": "/style/icons/Clock_135.png"
   },
   "orientation": "default",
   "messages": [

diff --git a/apps/clock/style/icons/Clock_120.png b/apps/clock/style/icons/Clock_120.png
diff --git a/apps/clock/style/icons/Clock_135.png b/apps/clock/style/icons/Clock_135.png
diff --git a/apps/clock/style/icons/Clock_60.png b/apps/clock/style/icons/Clock_60.png
diff --git a/apps/clock/style/icons/Clock_90.png b/apps/clock/style/icons/Clock_90.png
diff --git a/apps/communications/contacts/style/icons/Contacts_120.png b/apps/communications/contacts/style/icons/Contacts_120.png
diff --git a/apps/communications/contacts/style/icons/Contacts_135.png b/apps/communications/contacts/style/icons/Contacts_135.png
diff --git a/apps/communications/contacts/style/icons/Contacts_60.png b/apps/communications/contacts/style/icons/Contacts_60.png
diff --git a/apps/communications/contacts/style/icons/Contacts_90.png b/apps/communications/contacts/style/icons/Contacts_90.png
diff --git a/apps/communications/dialer/style/icons/Dialer_120.png b/apps/communications/dialer/style/icons/Dialer_120.png
diff --git a/apps/communications/dialer/style/icons/Dialer_135.png b/apps/communications/dialer/style/icons/Dialer_135.png
diff --git a/apps/communications/dialer/style/icons/Dialer_60.png b/apps/communications/dialer/style/icons/Dialer_60.png
diff --git a/apps/communications/dialer/style/icons/Dialer_90.png b/apps/communications/dialer/style/icons/Dialer_90.png
diff --git a/apps/communications/manifest.webapp b/apps/communications/manifest.webapp
@@ -14,7 +14,8 @@
       "icons": {
         "60": "/dialer/style/icons/Dialer_60.png",
         "90": "/dialer/style/icons/Dialer_90.png",
-        "120": "/dialer/style/icons/Dialer_120.png"
+        "120": "/dialer/style/icons/Dialer_120.png",
+        "135": "/dialer/style/icons/Dialer_135.png"
       },
       "locales": {
         "ar": {
@@ -41,7 +42,8 @@
       "icons": {
         "60": "/contacts/style/icons/Contacts_60.png",
         "90": "/contacts/style/icons/Contacts_90.png",
-        "120": "/contacts/style/icons/Contacts_120.png"
+        "120": "/contacts/style/icons/Contacts_120.png",
+        "135": "/contacts/style/icons/Contacts_135.png"
       },
       "locales": {
         "ar": {

diff --git a/apps/costcontrol/manifest.webapp b/apps/costcontrol/manifest.webapp
@@ -42,6 +42,7 @@
   },
   "default_locale": "en-US",
   "icons": {
+    "135": "/style/icons/cost-control_135.png",
     "120": "/style/icons/cost-control_120.png",
     "90": "/style/icons/cost-control_90.png",
     "60": "/style/icons/cost-control_60.png"

diff --git a/apps/costcontrol/style/icons/cost-control_120.png b/apps/costcontrol/style/icons/cost-control_120.png
diff --git a/apps/costcontrol/style/icons/cost-control_135.png b/apps/costcontrol/style/icons/cost-control_135.png
diff --git a/apps/costcontrol/style/icons/cost-control_60.png b/apps/costcontrol/style/icons/cost-control_60.png
diff --git a/apps/costcontrol/style/icons/cost-control_90.png b/apps/costcontrol/style/icons/cost-control_90.png
diff --git a/apps/email/manifest.webapp b/apps/email/manifest.webapp
@@ -44,7 +44,8 @@
   "icons": {
     "79": "/style/icons/Email_90.png",
     "60": "/style/icons/Email_60.png",
-    "120": "/style/icons/Email_120.png"
+    "120": "/style/icons/Email_120.png",
+    "135": "/style/icons/Email_135.png"
   },
   "activities": {
     "new": {

diff --git a/apps/email/style/icons/Email_120.png b/apps/email/style/icons/Email_120.png
diff --git a/apps/email/style/icons/Email_135.png b/apps/email/style/icons/Email_135.png
diff --git a/apps/email/style/icons/Email_60.png b/apps/email/style/icons/Email_60.png
diff --git a/apps/email/style/icons/Email_90.png b/apps/email/style/icons/Email_90.png
diff --git a/apps/fm/manifest.webapp b/apps/fm/manifest.webapp
@@ -33,6 +33,7 @@
   },
   "default_locale": "en-US",
   "icons": {
+    "135": "/style/icons/Fm_135.png",
     "128": "/style/icons/Fm_120.png",
     "90": "/style/icons/Fm_90.png",
     "60": "/style/icons/Fm_60.png"

diff --git a/apps/fm/style/icons/Fm_120.png b/apps/fm/style/icons/Fm_120.png
diff --git a/apps/fm/style/icons/Fm_135.png b/apps/fm/style/icons/Fm_135.png
diff --git a/apps/fm/style/icons/Fm_60.png b/apps/fm/style/icons/Fm_60.png
diff --git a/apps/fm/style/icons/Fm_90.png b/apps/fm/style/icons/Fm_90.png
diff --git a/apps/gallery/manifest.webapp b/apps/gallery/manifest.webapp
@@ -63,6 +63,7 @@
   "icons": {
     "60": "/style/icons/Gallery_60.png",
     "90": "/style/icons/Gallery_90.png",
-    "120": "/style/icons/Gallery_120.png"
+    "120": "/style/icons/Gallery_120.png",
+    "135": "/style/icons/Gallery_135.png"
   }
 }
diff --git a/apps/gallery/style/icons/Gallery_120.png b/apps/gallery/style/icons/Gallery_120.png
diff --git a/apps/gallery/style/icons/Gallery_135.png b/apps/gallery/style/icons/Gallery_135.png
diff --git a/apps/gallery/style/icons/Gallery_60.png b/apps/gallery/style/icons/Gallery_60.png
diff --git a/apps/gallery/style/icons/Gallery_90.png b/apps/gallery/style/icons/Gallery_90.png
diff --git a/apps/homescreen/collections/funny/icon.png b/apps/homescreen/collections/funny/icon.png
diff --git a/apps/homescreen/collections/funny/icon@1.5x.png b/apps/homescreen/collections/funny/icon@1.5x.png
diff --git a/apps/homescreen/collections/funny/icon@2.25x.png b/apps/homescreen/collections/funny/icon@2.25x.png
diff --git a/apps/homescreen/collections/funny/manifest.collection b/apps/homescreen/collections/funny/manifest.collection
@@ -9,6 +9,7 @@
   "icons": {
     "60": "/collections/funny/icon.png",
     "90": "/collections/funny/icon@1.5x.png",
-    "120": "/collections/funny/icon@2x.png"
+    "120": "/collections/funny/icon@2x.png",
+    "135": "/collections/funny/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/games/icon.png b/apps/homescreen/collections/games/icon.png
diff --git a/apps/homescreen/collections/games/icon@1.5x.png b/apps/homescreen/collections/games/icon@1.5x.png
diff --git a/apps/homescreen/collections/games/icon@2.25x.png b/apps/homescreen/collections/games/icon@2.25x.png
diff --git a/apps/homescreen/collections/games/icon@2x.png b/apps/homescreen/collections/games/icon@2x.png
diff --git a/apps/homescreen/collections/games/manifest.collection b/apps/homescreen/collections/games/manifest.collection
@@ -7,6 +7,7 @@
   "icons": {
     "60": "/collections/games/icon.png",
     "90": "/collections/games/icon@1.5x.png",
-    "120": "/collections/games/icon@2x.png"
+    "120": "/collections/games/icon@2x.png",
+    "135": "/collections/games/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/local/icon.png b/apps/homescreen/collections/local/icon.png
diff --git a/apps/homescreen/collections/local/icon@1.5x.png b/apps/homescreen/collections/local/icon@1.5x.png
diff --git a/apps/homescreen/collections/local/icon@2.25x.png b/apps/homescreen/collections/local/icon@2.25x.png
diff --git a/apps/homescreen/collections/local/icon@2x.png b/apps/homescreen/collections/local/icon@2x.png
diff --git a/apps/homescreen/collections/local/manifest.collection b/apps/homescreen/collections/local/manifest.collection
@@ -6,6 +6,7 @@
   "icons": {
     "60": "/collections/local/icon.png",
     "90": "/collections/local/icon@1.5x.png",
-    "120": "/collections/local/icon@2x.png"
+    "120": "/collections/local/icon@2x.png",
+    "135": "/collections/local/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/music/icon.png b/apps/homescreen/collections/music/icon.png
diff --git a/apps/homescreen/collections/music/icon@1.5x.png b/apps/homescreen/collections/music/icon@1.5x.png
diff --git a/apps/homescreen/collections/music/icon@2.25x.png b/apps/homescreen/collections/music/icon@2.25x.png
diff --git a/apps/homescreen/collections/music/icon@2x.png b/apps/homescreen/collections/music/icon@2x.png
diff --git a/apps/homescreen/collections/music/manifest.collection b/apps/homescreen/collections/music/manifest.collection
@@ -11,6 +11,7 @@
   "icons": {
     "60": "/collections/music/icon.png",
     "90": "/collections/music/icon@1.5x.png",
-    "120": "/collections/music/icon@2x.png"
+    "120": "/collections/music/icon@2x.png",
+    "135": "/collections/music/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/news/icon.png b/apps/homescreen/collections/news/icon.png
diff --git a/apps/homescreen/collections/news/icon@1.5x.png b/apps/homescreen/collections/news/icon@1.5x.png
diff --git a/apps/homescreen/collections/news/icon@2.25x.png b/apps/homescreen/collections/news/icon@2.25x.png
diff --git a/apps/homescreen/collections/news/icon@2x.png b/apps/homescreen/collections/news/icon@2x.png
diff --git a/apps/homescreen/collections/news/manifest.collection b/apps/homescreen/collections/news/manifest.collection
@@ -6,6 +6,7 @@
   "icons": {
     "60": "/collections/news/icon.png",
     "90": "/collections/news/icon@1.5x.png",
-    "120": "/collections/news/icon@2x.png"
+    "120": "/collections/news/icon@2x.png",
+    "135": "/collections/news/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/shopping/icon.png b/apps/homescreen/collections/shopping/icon.png
diff --git a/apps/homescreen/collections/shopping/icon@1.5x.png b/apps/homescreen/collections/shopping/icon@1.5x.png
diff --git a/apps/homescreen/collections/shopping/icon@2.25x.png b/apps/homescreen/collections/shopping/icon@2.25x.png
diff --git a/apps/homescreen/collections/shopping/icon@2x.png b/apps/homescreen/collections/shopping/icon@2x.png
diff --git a/apps/homescreen/collections/shopping/manifest.collection b/apps/homescreen/collections/shopping/manifest.collection
@@ -6,6 +6,7 @@
   "icons": {
     "60": "/collections/shopping/icon.png",
     "90": "/collections/shopping/icon@1.5x.png",
-    "120": "/collections/shopping/icon@2x.png"
+    "120": "/collections/shopping/icon@2x.png",
+    "135": "/collections/shopping/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/showbiz/icon.png b/apps/homescreen/collections/showbiz/icon.png
diff --git a/apps/homescreen/collections/showbiz/icon@1.5x.png b/apps/homescreen/collections/showbiz/icon@1.5x.png
diff --git a/apps/homescreen/collections/showbiz/icon@2.25x.png b/apps/homescreen/collections/showbiz/icon@2.25x.png
diff --git a/apps/homescreen/collections/showbiz/icon@2x.png b/apps/homescreen/collections/showbiz/icon@2x.png
diff --git a/apps/homescreen/collections/showbiz/manifest.collection b/apps/homescreen/collections/showbiz/manifest.collection
@@ -6,6 +6,7 @@
   "icons": {
     "60": "/collections/showbiz/icon.png",
     "90": "/collections/showbiz/icon@1.5x.png",
-    "120": "/collections/showbiz/icon@2x.png"
+    "120": "/collections/showbiz/icon@2x.png",
+    "135": "/collections/showbiz/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/social/icon.png b/apps/homescreen/collections/social/icon.png
diff --git a/apps/homescreen/collections/social/icon@1.5x.png b/apps/homescreen/collections/social/icon@1.5x.png
diff --git a/apps/homescreen/collections/social/icon@2.25x.png b/apps/homescreen/collections/social/icon@2.25x.png
diff --git a/apps/homescreen/collections/social/icon@2x.png b/apps/homescreen/collections/social/icon@2x.png
diff --git a/apps/homescreen/collections/social/manifest.collection b/apps/homescreen/collections/social/manifest.collection
@@ -12,6 +12,7 @@
   "icons": {
     "60": "/collections/social/icon.png",
     "90": "/collections/social/icon@1.5x.png",
-    "120": "/collections/social/icon@2x.png"
+    "120": "/collections/social/icon@2x.png",
+    "135": "/collections/social/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/sports/icon.png b/apps/homescreen/collections/sports/icon.png
diff --git a/apps/homescreen/collections/sports/icon@1.5x.png b/apps/homescreen/collections/sports/icon@1.5x.png
diff --git a/apps/homescreen/collections/sports/icon@2.25x.png b/apps/homescreen/collections/sports/icon@2.25x.png
diff --git a/apps/homescreen/collections/sports/icon@2x.png b/apps/homescreen/collections/sports/icon@2x.png
diff --git a/apps/homescreen/collections/sports/manifest.collection b/apps/homescreen/collections/sports/manifest.collection
@@ -6,6 +6,7 @@
   "icons": {
     "60": "/collections/sports/icon.png",
     "90": "/collections/sports/icon@1.5x.png",
-    "120": "/collections/sports/icon@2x.png"
+    "120": "/collections/sports/icon@2x.png",
+    "135": "/collections/sports/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/collections/tv/icon.png b/apps/homescreen/collections/tv/icon.png
diff --git a/apps/homescreen/collections/tv/icon@1.5x.png b/apps/homescreen/collections/tv/icon@1.5x.png
diff --git a/apps/homescreen/collections/tv/icon@2.25x.png b/apps/homescreen/collections/tv/icon@2.25x.png
diff --git a/apps/homescreen/collections/tv/icon@2x.png b/apps/homescreen/collections/tv/icon@2x.png
diff --git a/apps/homescreen/collections/tv/manifest.collection b/apps/homescreen/collections/tv/manifest.collection
@@ -9,6 +9,7 @@
   "icons": {
     "60": "/collections/tv/icon.png",
     "90": "/collections/tv/icon@1.5x.png",
-    "120": "/collections/tv/icon@2x.png"
+    "120": "/collections/tv/icon@2x.png",
+    "135": "/collections/tv/icon@2.25x.png"
   }
 }
diff --git a/apps/homescreen/everything.me/images/Wallpaper.png b/apps/homescreen/everything.me/images/Wallpaper.png
diff --git a/apps/homescreen/everything.me/images/Wallpaper.png b/apps/homescreen/everything.me/images/Wallpaper.png
@@ -0,0 +1 @@
+../../../wallpaper/style/icons/64/Wallpaper.png
diff --git a/apps/homescreen/everything.me/images/Wallpaper@1.5x.png b/apps/homescreen/everything.me/images/Wallpaper@1.5x.png
diff --git a/apps/homescreen/everything.me/images/Wallpaper@1.5x.png b/apps/homescreen/everything.me/images/Wallpaper@1.5x.png
@@ -0,0 +1 @@
+../../../wallpaper/style/icons/64/Wallpaper@1.5x.png
diff --git a/apps/homescreen/everything.me/images/Wallpaper@2.25.png b/apps/homescreen/everything.me/images/Wallpaper@2.25.png
@@ -0,0 +1 @@
+../../../wallpaper/style/icons/64/Wallpaper@2.25.png
diff --git a/apps/homescreen/everything.me/images/Wallpaper@2x.png b/apps/homescreen/everything.me/images/Wallpaper@2x.png
diff --git a/apps/homescreen/everything.me/images/Wallpaper@2x.png b/apps/homescreen/everything.me/images/Wallpaper@2x.png
@@ -0,0 +1 @@
+../../../wallpaper/style/icons/64/Wallpaper@2x.png
diff --git a/apps/homescreen/js/page.js b/apps/homescreen/js/page.js
@@ -43,7 +43,7 @@ Icon.prototype = {
   // App icons shadow settings
   SHADOW_BLUR: 5,
   SHADOW_OFFSET_Y: 2,
-  SHADOW_COLOR: 'rgba(0,0,0,0.15)',
+  SHADOW_COLOR: 'rgba(0,0,0,0.05)',
 
   // These properties will be copied from the descriptor onto the icon's HTML
   // element dataset and allow us to uniquely look up the Icon object from

diff --git a/apps/homescreen/manifest.webapp b/apps/homescreen/manifest.webapp
@@ -40,7 +40,10 @@
   },
   "default_locale": "en-US",
   "icons": {
-    "30": "/style/icons/HomeScreen.png"
+    "30": "/style/icons/HomeScreen.png",
+    "45": "/style/icons/HomeScreen_45.png",
+    "60": "/style/icons/HomeScreen_60.png",
+    "68": "/style/icons/HomeScreen_68.png"
   },
   "orientation": "default",
   "activities": {

diff --git a/apps/homescreen/style/icons/HomeScreen.png b/apps/homescreen/style/icons/HomeScreen.png
diff --git a/apps/homescreen/style/icons/HomeScreen@1.5x.png b/apps/homescreen/style/icons/HomeScreen@1.5x.png
diff --git a/apps/homescreen/style/icons/HomeScreen_45.png b/apps/homescreen/style/icons/HomeScreen_45.png
diff --git a/apps/homescreen/style/icons/HomeScreen_60.png b/apps/homescreen/style/icons/HomeScreen_60.png
diff --git a/apps/homescreen/style/icons/HomeScreen_68.png b/apps/homescreen/style/icons/HomeScreen_68.png
diff --git a/apps/homescreen/style/images/app_downloading.png b/apps/homescreen/style/images/app_downloading.png
diff --git a/apps/homescreen/style/images/app_downloading@1.5x.png b/apps/homescreen/style/images/app_downloading@1.5x.png
diff --git a/apps/homescreen/style/images/app_downloading@2.25x.png b/apps/homescreen/style/images/app_downloading@2.25x.png
diff --git a/apps/homescreen/style/images/app_downloading@2x.png b/apps/homescreen/style/images/app_downloading@2x.png
diff --git a/apps/homescreen/style/images/app_paused.png b/apps/homescreen/style/images/app_paused.png
diff --git a/apps/homescreen/style/images/app_paused@1.5x.png b/apps/homescreen/style/images/app_paused@1.5x.png
diff --git a/apps/homescreen/style/images/app_paused@2.25x.png b/apps/homescreen/style/images/app_paused@2.25x.png
diff --git a/apps/homescreen/style/images/app_paused@2x.png b/apps/homescreen/style/images/app_paused@2x.png
diff --git a/apps/homescreen/style/images/default.png b/apps/homescreen/style/images/default.png
diff --git a/apps/homescreen/style/images/default@1.5x.png b/apps/homescreen/style/images/default@1.5x.png
diff --git a/apps/homescreen/style/images/default@2.25x.png b/apps/homescreen/style/images/default@2.25x.png
diff --git a/apps/homescreen/style/images/default@2x.png b/apps/homescreen/style/images/default@2x.png
diff --git a/apps/homescreen/style/images/default_background.png b/apps/homescreen/style/images/default_background.png
diff --git a/apps/homescreen/style/images/default_background@1.5x.png b/apps/homescreen/style/images/default_background@1.5x.png
diff --git a/apps/homescreen/style/images/default_background@2.25x.png b/apps/homescreen/style/images/default_background@2.25x.png
diff --git a/apps/homescreen/style/images/default_background@2x.png b/apps/homescreen/style/images/default_background@2x.png
diff --git a/apps/music/manifest.webapp b/apps/music/manifest.webapp
@@ -56,7 +56,8 @@
   "icons": {
     "60": "/style/icons/Music_60.png",
     "90": "/style/icons/Music_90.png",
-    "120": "/style/icons/Music_120.png"
+    "120": "/style/icons/Music_120.png",
+    "135": "/style/icons/Music_135.png"
   },
   "orientation": "default",
   "messages": [

diff --git a/apps/music/style/icons/Music_120.png b/apps/music/style/icons/Music_120.png
diff --git a/apps/music/style/icons/Music_135.png b/apps/music/style/icons/Music_135.png
diff --git a/apps/music/style/icons/Music_60.png b/apps/music/style/icons/Music_60.png
diff --git a/apps/music/style/icons/Music_90.png b/apps/music/style/icons/Music_90.png
diff --git a/apps/settings/manifest.webapp b/apps/settings/manifest.webapp
@@ -75,7 +75,8 @@
   "icons": {
     "60": "/style/icons/Settings_60.png",
     "90": "/style/icons/Settings_90.png",
-    "120": "/style/icons/Settings_120.png"
+    "120": "/style/icons/Settings_120.png",
+    "135": "/style/icons/Settings_135.png"
   },
   "orientation": "default"
 }
diff --git a/apps/settings/style/icons/Settings_120.png b/apps/settings/style/icons/Settings_120.png
diff --git a/apps/settings/style/icons/Settings_135.png b/apps/settings/style/icons/Settings_135.png
diff --git a/apps/settings/style/icons/Settings_60.png b/apps/settings/style/icons/Settings_60.png
diff --git a/apps/settings/style/icons/Settings_90.png b/apps/settings/style/icons/Settings_90.png
diff --git a/apps/settings/style/images/default.png b/apps/settings/style/images/default.png
diff --git a/apps/settings/style/images/default@1.5x.png b/apps/settings/style/images/default@1.5x.png
diff --git a/apps/settings/style/images/default@2.25x.png b/apps/settings/style/images/default@2.25x.png
diff --git a/apps/settings/style/images/default@2x.png b/apps/settings/style/images/default@2x.png
diff --git a/apps/sms/manifest.webapp b/apps/sms/manifest.webapp
@@ -39,7 +39,8 @@
   "icons": {
     "60": "/style/icons/Sms_60.png",
     "90": "/style/icons/Sms_90.png",
-    "120": "/style/icons/Sms_120.png"
+    "120": "/style/icons/Sms_120.png",
+    "135": "/style/icons/Sms_135.png"
   },
   "orientation": "default",
   "activities": {

diff --git a/apps/sms/style/icons/Sms_120.png b/apps/sms/style/icons/Sms_120.png
diff --git a/apps/sms/style/icons/Sms_135.png b/apps/sms/style/icons/Sms_135.png
diff --git a/apps/sms/style/icons/Sms_60.png b/apps/sms/style/icons/Sms_60.png
diff --git a/apps/sms/style/icons/Sms_90.png b/apps/sms/style/icons/Sms_90.png
diff --git a/apps/system/manifest.webapp b/apps/system/manifest.webapp
@@ -67,7 +67,10 @@
   },
   "default_locale": "en-US",
   "icons": {
-    "30": "/style/icons/System.png"
+    "30": "/style/icons/System.png",
+    "45": "/style/icons/System_45.png",
+    "60": "/style/icons/System_60.png",
+    "68": "/style/icons/System_68.png"
   },
   "messages": [
      { "alarm": "/index.html" },

diff --git a/apps/system/style/icons/Gallery.png b/apps/system/style/icons/Gallery.png
diff --git a/apps/system/style/icons/Gallery@1.5x.png b/apps/system/style/icons/Gallery@1.5x.png
diff --git a/apps/system/style/icons/Gallery@2.25x.png b/apps/system/style/icons/Gallery@2.25x.png
diff --git a/apps/system/style/icons/Gallery@2x.png b/apps/system/style/icons/Gallery@2x.png
diff --git a/apps/system/style/icons/System.png b/apps/system/style/icons/System.png
diff --git a/apps/system/style/icons/System@1.5x.png b/apps/system/style/icons/System@1.5x.png
diff --git a/apps/system/style/icons/System_45.png b/apps/system/style/icons/System_45.png
diff --git a/apps/system/style/icons/System_60.png b/apps/system/style/icons/System_60.png
diff --git a/apps/system/style/icons/System_68.png b/apps/system/style/icons/System_68.png
diff --git a/apps/system/style/icons/captivePortal.png b/apps/system/style/icons/captivePortal.png
diff --git a/apps/system/style/icons/captivePortal@1.5x.png b/apps/system/style/icons/captivePortal@1.5x.png
diff --git a/apps/system/style/icons/captivePortal@2.25x.png b/apps/system/style/icons/captivePortal@2.25x.png
diff --git a/apps/system/style/icons/captivePortal@2x.png b/apps/system/style/icons/captivePortal@2x.png
diff --git a/apps/video/manifest.webapp b/apps/video/manifest.webapp
@@ -39,7 +39,8 @@
   "icons": {
     "60": "/style/icons/Video_60.png",
     "90": "/style/icons/Video_90.png",
-    "120": "/style/icons/Video_120.png"
+    "120": "/style/icons/Video_120.png",
+    "135": "/style/icons/Video_135.png"
   },
   "activities": {
     "pick": {

diff --git a/apps/video/style/icons/Video_120.png b/apps/video/style/icons/Video_120.png
diff --git a/apps/video/style/icons/Video_135.png b/apps/video/style/icons/Video_135.png
diff --git a/apps/video/style/icons/Video_60.png b/apps/video/style/icons/Video_60.png
diff --git a/apps/video/style/icons/Video_90.png b/apps/video/style/icons/Video_90.png
diff --git a/apps/wallpaper/style/icons/64/Wallpaper.png b/apps/wallpaper/style/icons/64/Wallpaper.png
diff --git a/apps/wallpaper/style/icons/64/Wallpaper@1.5x.png b/apps/wallpaper/style/icons/64/Wallpaper@1.5x.png
diff --git a/apps/wallpaper/style/icons/64/Wallpaper@2.25.png b/apps/wallpaper/style/icons/64/Wallpaper@2.25.png
diff --git a/apps/wallpaper/style/icons/64/Wallpaper@2x.png b/apps/wallpaper/style/icons/64/Wallpaper@2x.png
diff --git a/dogfood_apps/feedback/style/icons/60/Feedback.png b/dogfood_apps/feedback/style/icons/60/Feedback.png
diff --git a/external-apps/marketplace.firefox.com/application.zip b/external-apps/marketplace.firefox.com/application.zip
diff --git a/external-apps/marketplace.firefox.com/metadata.json b/external-apps/marketplace.firefox.com/metadata.json
@@ -1,8 +1,8 @@
 {
-  "etag": "\"a10ca98addc3785e92ead363281c425bd7114b84a4162f50096593b76a7ac2c3\"",
+  "etag": "\"ed2e516580c8fb5317a1d1378f02592dc64c69f0c822b52a1dc17601fdfbd2a7\"",
   "installOrigin": "https://marketplace.firefox.com",
   "manifestURL": "https://marketplace.firefox.com/packaged.webapp",
-  "packageEtag": "\"bf5f4736daffaf7982c872efc4beb38f440d5d84a6fb3f82c5d434cca6abd4d5\"",
+  "packageEtag": "\"3a5c08e91b3b7f885c7f6d1ab902f989d721947509ff39fc83913715855bb99e\"",
   "removable": false,
   "type": "privileged"
 }
diff --git a/shared/resources/branding/official/Browser_120.png b/shared/resources/branding/official/Browser_120.png
diff --git a/shared/resources/branding/official/Browser_135.png b/shared/resources/branding/official/Browser_135.png
diff --git a/shared/resources/branding/official/Browser_60.png b/shared/resources/branding/official/Browser_60.png
diff --git a/shared/resources/branding/official/Browser_90.png b/shared/resources/branding/official/Browser_90.png
diff --git a/shared/resources/branding/unofficial/Browser_120.png b/shared/resources/branding/unofficial/Browser_120.png
diff --git a/shared/resources/branding/unofficial/Browser_135.png b/shared/resources/branding/unofficial/Browser_135.png
diff --git a/shared/resources/branding/unofficial/Browser_60.png b/shared/resources/branding/unofficial/Browser_60.png
diff --git a/shared/resources/branding/unofficial/Browser_90.png b/shared/resources/branding/unofficial/Browser_90.png