diff --git a/res/drawable/ic_downloads_shortcut.xml b/res/drawable/ic_images_shortcut.xml
similarity index 89%
rename from res/drawable/ic_downloads_shortcut.xml
rename to res/drawable/ic_images_shortcut.xml
index 952c5b6..a60f27c 100644
--- a/res/drawable/ic_downloads_shortcut.xml
+++ b/res/drawable/ic_images_shortcut.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 The Android Open Source Project
+  ~ Copyright (C) 2017 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -16,18 +16,15 @@
   -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item>
         <shape android:shape="oval">
             <solid android:color="@color/shortcut_background" />
         </shape>
     </item>
-
     <item
-        android:drawable="@drawable/ic_downloads_white"
+        android:drawable="@drawable/ic_images_white"
         android:top="16dp"
         android:right="16dp"
         android:bottom="16dp"
         android:left="16dp" />
-
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_downloads_white.xml b/res/drawable/ic_images_white.xml
similarity index 80%
rename from res/drawable/ic_downloads_white.xml
rename to res/drawable/ic_images_white.xml
index f4e3b1f..35d0e3a 100644
--- a/res/drawable/ic_downloads_white.xml
+++ b/res/drawable/ic_images_white.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2016 The Android Open Source Project
+    Copyright (C) 2017 The Android Open Source Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,5 +22,5 @@
         android:viewportWidth="24">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" />
+        android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z" />
 </vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8aa5034..92dcee9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -311,8 +311,8 @@
         <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> items?</item>
     </plurals>
 
-    <!-- Shortcut label of Downloads root folder -->
-    <string name="downloads_shortcut_label">Downloads</string>
+    <!-- Shortcut label of Images root folder -->
+    <string name="images_shortcut_label">Images</string>
 
     <!-- Error message shown when an archive fails to load -->
     <string name="archive_loading_failed">Unable to open archive for browsing. File is either corrupt, or an unsupported format.</string>
diff --git a/res/xml/shortcuts.xml b/res/xml/shortcuts.xml
index 1901140..97180f5 100644
--- a/res/xml/shortcuts.xml
+++ b/res/xml/shortcuts.xml
@@ -17,11 +17,11 @@
 
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
     <shortcut
-        android:shortcutId="content://com.android.providers.downloads.documents/root/downloads"
-        android:icon="@drawable/ic_downloads_shortcut"
-        android:shortcutShortLabel="@string/downloads_shortcut_label" >
+        android:shortcutId="content://com.android.providers.media.documents/root/images_root"
+        android:icon="@drawable/ic_images_shortcut"
+        android:shortcutShortLabel="@string/images_shortcut_label" >
         <intent
             android:action="android.intent.action.VIEW"
-            android:data="content://com.android.providers.downloads.documents/root/downloads" />
+            android:data="content://com.android.providers.media.documents/root/images_root" />
     </shortcut>
 </shortcuts>
\ No newline at end of file