diff --git a/res/drawable-hdpi/ic_available_offline.png b/res/drawable-hdpi/ic_available_offline.png
new file mode 100644
index 0000000000..102fc9c5eb
Binary files /dev/null and b/res/drawable-hdpi/ic_available_offline.png differ
diff --git a/res/drawable-mdpi/ic_available_offline.png b/res/drawable-mdpi/ic_available_offline.png
new file mode 100644
index 0000000000..1e5a4b3ea9
Binary files /dev/null and b/res/drawable-mdpi/ic_available_offline.png differ
diff --git a/res/drawable-xhdpi/ic_available_offline.png b/res/drawable-xhdpi/ic_available_offline.png
new file mode 100644
index 0000000000..fcd380a8e2
Binary files /dev/null and b/res/drawable-xhdpi/ic_available_offline.png differ
diff --git a/res/drawable-xxhdpi/ic_available_offline.png b/res/drawable-xxhdpi/ic_available_offline.png
new file mode 100644
index 0000000000..1d448df653
Binary files /dev/null and b/res/drawable-xxhdpi/ic_available_offline.png differ
diff --git a/res/drawable/conflict_file_indicator.png b/res/drawable/conflict_file_indicator.png
deleted file mode 100644
index fd580caf20..0000000000
Binary files a/res/drawable/conflict_file_indicator.png and /dev/null differ
diff --git a/res/drawable/downloading_file_indicator.png b/res/drawable/downloading_file_indicator.png
deleted file mode 100644
index e735542a6d..0000000000
Binary files a/res/drawable/downloading_file_indicator.png and /dev/null differ
diff --git a/res/drawable/ic_synced.png b/res/drawable/ic_synced.png
new file mode 100644
index 0000000000..0f1aabe4be
Binary files /dev/null and b/res/drawable/ic_synced.png differ
diff --git a/res/drawable/ic_synchronizing.png b/res/drawable/ic_synchronizing.png
new file mode 100644
index 0000000000..6880e3b119
Binary files /dev/null and b/res/drawable/ic_synchronizing.png differ
diff --git a/res/drawable/ic_synchronizing_error.png b/res/drawable/ic_synchronizing_error.png
new file mode 100644
index 0000000000..5d917b2540
Binary files /dev/null and b/res/drawable/ic_synchronizing_error.png differ
diff --git a/res/drawable/local_file_indicator.png b/res/drawable/local_file_indicator.png
deleted file mode 100644
index 85d5271cc7..0000000000
Binary files a/res/drawable/local_file_indicator.png and /dev/null differ
diff --git a/res/drawable/synchronizing_file_indicator.png b/res/drawable/synchronizing_file_indicator.png
deleted file mode 100644
index 947cba73bf..0000000000
Binary files a/res/drawable/synchronizing_file_indicator.png and /dev/null differ
diff --git a/res/drawable/uploading_file_indicator.png b/res/drawable/uploading_file_indicator.png
deleted file mode 100644
index b71add0175..0000000000
Binary files a/res/drawable/uploading_file_indicator.png and /dev/null differ
diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index 15a9baf032..5bde885c81 100644
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.xml
@@ -54,7 +54,7 @@
             android:layout_marginTop="4dp"
             android:layout_marginBottom="4dp"
             android:layout_marginRight="4dp"
-            android:src="@drawable/local_file_indicator" />
+            android:src="@drawable/ic_synced" />
 
         <ImageView
             android:id="@+id/favoriteIcon"
@@ -63,7 +63,7 @@
             android:layout_gravity="bottom|right"
             android:layout_marginBottom="4dp"
             android:layout_marginRight="4dp"
-            android:src="@drawable/ic_favorite" />
+            android:src="@drawable/ic_available_offline" />
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/grid_item.xml b/res/layout/grid_item.xml
index 6bec560437..ba3e029b5a 100644
--- a/res/layout/grid_item.xml
+++ b/res/layout/grid_item.xml
@@ -54,7 +54,7 @@
             android:layout_gravity="bottom|right"
             android:layout_marginTop="2dp"
             android:layout_marginRight="2dp"
-            android:src="@drawable/local_file_indicator" />
+            android:src="@drawable/ic_synced" />
 
         <ImageView
             android:id="@+id/favoriteIcon"
@@ -63,7 +63,7 @@
             android:layout_gravity="bottom|right"
             android:layout_marginBottom="2dp"
             android:layout_marginRight="2dp"
-            android:src="@drawable/ic_favorite" />
+            android:src="@drawable/ic_available_offline" />
 
 
 
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index cf09502e7e..e287e2a800 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -45,7 +45,7 @@
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_gravity="top|right"
                 android:layout_marginRight="4dp"
-                android:src="@drawable/local_file_indicator" />
+                android:src="@drawable/ic_synced" />
 
             <ImageView
                 android:id="@+id/thumbnail"
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:layout_marginRight="4dp"
-                android:src="@drawable/ic_favorite" />
+                android:src="@drawable/ic_available_offline" />
         </FrameLayout>
 
         <LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b84728cfd4..25d52b4d22 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -230,8 +230,8 @@
 	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
     <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
     
-    <string name="favorite">Favorite</string>
-    <string name="unfavorite">Unfavorite</string>
+    <string name="favorite">Set as available offline</string>
+    <string name="unfavorite">Unset as available offline</string>
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     <string name="confirmation_remove_alert">"Do you really want to remove %1$s?"</string>
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 75843cc225..fa56e61c23 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -269,37 +269,29 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                                 opsBinder != null &&
                                 opsBinder.isSynchronizing(mAccount, file.getRemotePath())
                             ) {
-                        localStateView.setImageResource(R.drawable.synchronizing_file_indicator);
+                        localStateView.setImageResource(R.drawable.ic_synchronizing);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if ( // downloading
                                 downloaderBinder != null &&
                                 downloaderBinder.isDownloading(mAccount, file)
                             ) {
-                        localStateView.setImageResource(
-                                file.isFolder() ?
-                                        R.drawable.synchronizing_file_indicator :
-                                        R.drawable.downloading_file_indicator
-                        );
+                        localStateView.setImageResource(R.drawable.ic_synchronizing);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if ( //uploading
                                 uploaderBinder != null &&
                                 uploaderBinder.isUploading(mAccount, file)
                             ) {
-                        localStateView.setImageResource(
-                                file.isFolder() ?
-                                        R.drawable.synchronizing_file_indicator :
-                                        R.drawable.uploading_file_indicator
-                        );
+                        localStateView.setImageResource(R.drawable.ic_synchronizing);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if (file.getEtagInConflict() != null) {   // conflict
-                        localStateView.setImageResource(R.drawable.conflict_file_indicator);
+                        localStateView.setImageResource(R.drawable.ic_synchronizing_error);
                         localStateView.setVisibility(View.VISIBLE);
 
                     } else if (file.isDown()) {
-                        localStateView.setImageResource(R.drawable.local_file_indicator);
+                        localStateView.setImageResource(R.drawable.ic_synced);
                         localStateView.setVisibility(View.VISIBLE);
                     }