diff --git a/Android.mk b/Android.mk
index a0b633adb9ad1e228f6970d087a9646a2227551e..8e00991d9e7a02b1b08f993d2f4e8c2f287e5178 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
+LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk
 LOCAL_PACKAGE_NAME := DocumentsUI
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/proguard.flags b/proguard.flags
index 0f33fb27d8cc87320979b20f6a2f6411f8ad6e87..bfcfed0fe52c3aeef035e16d8a6d1b5a1b1555da 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -15,4 +15,5 @@
 # Keep
 -keep public class android.support.v4.view.accessibility.AccessibilityNodeInfoCompat {
    public static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat obtain();
-}
\ No newline at end of file
+}
+-dontwarn lineageos.**
\ No newline at end of file
diff --git a/res/drawable/ic_doc_audio.xml b/res/drawable/ic_doc_audio.xml
index 341a91942bdb69ee33f7afb52a8b6eaa0cbde35d..1de91bdf63c275884d2d4f070ed30ab99e64890b 100644
--- a/res/drawable/ic_doc_audio.xml
+++ b/res/drawable/ic_doc_audio.xml
@@ -17,8 +17,10 @@ Copyright (C) 2017 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/accent"
+    >
     <path
-        android:fillColor="#FFDB4437"
+        android:fillColor="@color/accent"
         android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zM7.2 18c-.66 0,-1.2,-.54,-1.2,-1.2V12c0,-3.31 2.69,-6 6,-6s6 2.69 6 6v4.8c0 .66,-.54 1.2,-1.2 1.2H14v-4h2v-2c0,-2.21,-1.79,-4,-4,-4s-4 1.79,-4 4v2h2v4H7.2z"/>
 </vector>
diff --git a/res/drawable/ic_doc_folder.xml b/res/drawable/ic_doc_folder.xml
index 21c3bb2138cc47f9d1837797ee69398436605d6a..6b2c8782e9a9c58038d52c05511a209db8f77b08 100644
--- a/res/drawable/ic_doc_folder.xml
+++ b/res/drawable/ic_doc_folder.xml
@@ -18,9 +18,9 @@ Copyright (C) 2015 The Android Open Source Project
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-    android:tint="@color/color_default_blue1"
+    android:tint="@color/accent"
     >
     <path
-        android:fillColor="#FF737373"
+        android:fillColor="@color/accent"
         android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>
 </vector>
diff --git a/res/drawable/ic_doc_generic.xml b/res/drawable/ic_doc_generic.xml
index a4fd77ae51ce76a69e3486191d59abebb513c6c5..b7ae5b5c037cd6031bb444605d110f5c3c9abd05 100644
--- a/res/drawable/ic_doc_generic.xml
+++ b/res/drawable/ic_doc_generic.xml
@@ -17,8 +17,10 @@ Copyright (C) 2017 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/accent"
+    >
     <path
-        android:fillColor="#FF737373"
+        android:fillColor="@color/accent"
         android:pathData="M6 2c-1.1 0,-1.99.9,-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2,-.9 2,-2V8l-6,-6H6zm7 7V3.5L18.5 9H13z"/>
 </vector>
diff --git a/res/drawable/ic_doc_image.xml b/res/drawable/ic_doc_image.xml
index 0fb43d4248097a07ab545022580765389cf7f9e6..413d4c30bfd3bae2e1b8067efe4a276b7b400567 100644
--- a/res/drawable/ic_doc_image.xml
+++ b/res/drawable/ic_doc_image.xml
@@ -18,9 +18,9 @@ Copyright (C) 2017 The Android Open Source Project
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-    android:tint="@color/color_default_blue1"
+    android:tint="@color/accent"
     >
     <path
-        android:fillColor="#FFDB4437"
+        android:fillColor="@color/accent"
         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/drawable/ic_doc_video.xml b/res/drawable/ic_doc_video.xml
index 4944232e9b164c486594a82a6b5813b4f573cb27..2753daf7d751f3018156bbca51b1091e808b1f44 100644
--- a/res/drawable/ic_doc_video.xml
+++ b/res/drawable/ic_doc_video.xml
@@ -17,8 +17,10 @@ Copyright (C) 2017 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/accent"
+    >
     <path
-        android:fillColor="#FFDB4437"
+        android:fillColor="@color/accent"
         android:pathData="M18 4l2 4h-3l-2,-4h-2l2 4h-3l-2,-4H8l2 4H7L5 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V4h-4z"/>
 </vector>
diff --git a/res/values/drawables.xml b/res/values/drawables.xml
index 3873eefec26cc0fd53c8163e09fd19b68e9df067..d0e7db6d6a04792fda6de81c08e6ed70b0da865b 100644
--- a/res/values/drawables.xml
+++ b/res/values/drawables.xml
@@ -17,10 +17,10 @@
 <resources>
     <item name="app_icon" type="drawable">@mipmap/ic_launcher</item>
     <item name="launcher_icon" type="drawable">@mipmap/ic_launcher</item>
-    <item name="image_root_icon" type="drawable">@*android:drawable/ic_doc_image</item>
-    <item name="video_root_icon" type="drawable">@*android:drawable/ic_doc_video</item>
-    <item name="audio_root_icon" type="drawable">@*android:drawable/ic_doc_audio</item>
-    <item name="generic_doc_icon" type="drawable">@*android:drawable/ic_doc_generic</item>
+    <item name="image_root_icon" type="drawable">@drawable/ic_doc_image</item>
+    <item name="video_root_icon" type="drawable">@drawable/ic_doc_video</item>
+    <item name="audio_root_icon" type="drawable">@drawable/ic_doc_audio</item>
+    <item name="generic_doc_icon" type="drawable">@drawable/ic_doc_generic</item>
     <item name="search_text_select_handle_left" type="drawable">@*android:drawable/text_select_handle_left_mtrl_alpha</item>
     <item name="search_text_select_handle_right" type="drawable">@*android:drawable/text_select_handle_right_mtrl_alpha</item>
     <item name="search_text_select_handle_middle" type="drawable">@*android:drawable/text_select_handle_middle_mtrl_alpha</item>
diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index 340d61459e10d62b0036d7efa1997934aa15d06d..74b6c56e70e6fc211e052eda08b85058ec4e0020 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
 
         if (isHome()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = R.drawable.ic_root_documents;
+            derivedIcon = lineageos.platform.R.drawable.ic_folder;//R.drawable.ic_root_documents;
         } else if (isMtp()) {
             derivedType = TYPE_MTP;
             derivedIcon = R.drawable.ic_usb_storage;
@@ -214,21 +214,22 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
             derivedIcon = R.drawable.ic_sd_storage;
         } else if (isExternalStorage()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = R.drawable.ic_root_smartphone;
+            derivedIcon = lineageos.platform.R.drawable.ic_device_phone;
         } else if (isDownloads()) {
             derivedType = TYPE_DOWNLOADS;
-            derivedIcon = R.drawable.ic_root_download;
+            derivedIcon = lineageos.platform.R.drawable.ic_downloads;
         } else if (isImages()) {
             derivedType = TYPE_IMAGES;
-            derivedIcon = R.drawable.image_root_icon;
+            derivedIcon = lineageos.platform.R.drawable.ic_album;
         } else if (isVideos()) {
             derivedType = TYPE_VIDEO;
-            derivedIcon = R.drawable.video_root_icon;
+            derivedIcon = lineageos.platform.R.drawable.ic_videos;
         } else if (isAudio()) {
             derivedType = TYPE_AUDIO;
-            derivedIcon = R.drawable.audio_root_icon;
+            derivedIcon = lineageos.platform.R.drawable.ic_audio;
         } else if (isRecents()) {
             derivedType = TYPE_RECENTS;
+
         } else {
             derivedType = TYPE_OTHER;
         }