diff --git a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 259f1ab815..b870961cee 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -334,8 +334,7 @@ public class FileListListAdapter extends BaseAdapter {
                             R.color.primary));
                 } else {
                     view.setBackgroundColor(Color.WHITE);
-                    checkBoxV.setImageDrawable(DisplayUtils.tintDrawable(R.drawable.ic_checkbox_blank_outline,
-                            R.color.primary));
+                    checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
                 }
                 checkBoxV.setVisibility(View.VISIBLE);
             }
diff --git a/src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java
index 8c21374390..3278ce4c00 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java
@@ -35,6 +35,7 @@ import com.afollestad.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -188,7 +189,7 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
 
     private void setSyncButtonActiveIcon(ImageButton syncStatusButton, boolean enabled) {
         if(enabled) {
-            syncStatusButton.setImageResource(R.drawable.ic_cloud_sync_on);
+            syncStatusButton.setImageDrawable(DisplayUtils.tintDrawable(R.drawable.ic_cloud_sync_on, R.color.primary));
         } else {
             syncStatusButton.setImageResource(R.drawable.ic_cloud_sync_off);
         }
diff --git a/src/main/res/layout/folder_sync_item_header.xml b/src/main/res/layout/folder_sync_item_header.xml
index 9bf1c57cbe..d73aa80d24 100644
--- a/src/main/res/layout/folder_sync_item_header.xml
+++ b/src/main/res/layout/folder_sync_item_header.xml
@@ -52,7 +52,6 @@
             android:background="@color/transparent"
             android:clickable="true"
             android:padding="@dimen/standard_half_padding"
-            android:tint="@color/primary"
             android:src="@drawable/ic_cloud_sync_off"/>
 
         <ImageButton