diff --git a/build.gradle b/build.gradle
index 623df81f6617..b0551ab8335c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -194,9 +194,9 @@ dependencies {
// dependencies for app building
implementation 'com.android.support:multidex:1.0.3'
// implementation project('nextcloud-android-library')
- genericImplementation "com.github.nextcloud:android-library:${androidLibraryVersion}"
- gplayImplementation "com.github.nextcloud:android-library:${androidLibraryVersion}"
- versionDevImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT' // use always latest master
+ genericImplementation "com.github.nextcloud:android-library:filterActivities-SNAPSHOT"
+ gplayImplementation "com.github.nextcloud:android-library:filterActivities-SNAPSHOT"
+ versionDevImplementation 'com.github.nextcloud:android-library:filterActivities-SNAPSHOT' // use always latest master
implementation "com.android.support:support-v4:${supportLibraryVersion}"
implementation "com.android.support:design:${supportLibraryVersion}"
implementation 'com.jakewharton:disklrucache:2.0.2'
diff --git a/drawable_resources/ic_star.svg b/drawable_resources/ic_star.svg
new file mode 100644
index 000000000000..40c0577e5915
--- /dev/null
+++ b/drawable_resources/ic_star.svg
@@ -0,0 +1 @@
+
diff --git a/drawable_resources/ic_star_outline.svg b/drawable_resources/ic_star_outline.svg
new file mode 100644
index 000000000000..638248c7c158
--- /dev/null
+++ b/drawable_resources/ic_star_outline.svg
@@ -0,0 +1 @@
+
diff --git a/drawable_resources/ic_tag.svg b/drawable_resources/ic_tag.svg
new file mode 100644
index 000000000000..fd1d1bf731cb
--- /dev/null
+++ b/drawable_resources/ic_tag.svg
@@ -0,0 +1 @@
+
diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt
index 0cc0a7f04705..820328a72cc0 100644
--- a/scripts/lint/lint-results.txt
+++ b/scripts/lint/lint-results.txt
@@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE
- Lint Report: 114 warnings
+ Lint Report: 113 warnings
diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 1c61db27147e..756471e553cb 100644
--- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -56,6 +56,7 @@
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
import com.owncloud.android.ui.TextDrawable;
import com.owncloud.android.ui.adapter.DiskLruImageCache;
+import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.utils.BitmapUtils;
import com.owncloud.android.utils.ConnectivityUtils;
@@ -208,17 +209,17 @@ public static Bitmap getBitmapFromDiskCache(String key) {
}
public static class ResizedImageGenerationTask extends AsyncTask