diff --git a/app/src/main/java/org/tasks/data/Filter.kt b/app/src/main/java/org/tasks/data/Filter.kt
index 0667d9712..d700ab46b 100644
--- a/app/src/main/java/org/tasks/data/Filter.kt
+++ b/app/src/main/java/org/tasks/data/Filter.kt
@@ -46,13 +46,15 @@ class Filter {
     val valuesAsMap: Map<String, Any>?
         get() = if (Strings.isNullOrEmpty(values)) null else AndroidUtilities.mapFromSerializedString(values)
 
-    fun getColor(): Int = color ?: 0
+    @Suppress("RedundantNullableReturnType")
+    fun getColor(): Int? = color ?: 0
 
     fun setColor(color: Int?) {
         this.color = color
     }
 
-    fun getIcon(): Int = icon ?: FILTER
+    @Suppress("RedundantNullableReturnType")
+    fun getIcon(): Int? = icon ?: FILTER
 
     fun setIcon(icon: Int?) {
         this.icon = icon
diff --git a/app/src/main/java/org/tasks/data/GoogleTaskList.kt b/app/src/main/java/org/tasks/data/GoogleTaskList.kt
index 559e0b813..1df813550 100644
--- a/app/src/main/java/org/tasks/data/GoogleTaskList.kt
+++ b/app/src/main/java/org/tasks/data/GoogleTaskList.kt
@@ -52,13 +52,15 @@ class GoogleTaskList : Parcelable {
         icon = parcel.readInt()
     }
 
-    fun getColor(): Int = color ?: 0
+    @Suppress("RedundantNullableReturnType")
+    fun getColor(): Int? = color ?: 0
 
     fun setColor(color: Int?) {
         this.color = color
     }
 
-    fun getIcon(): Int = icon ?: LIST
+    @Suppress("RedundantNullableReturnType")
+    fun getIcon(): Int? = icon ?: LIST
 
     fun setIcon(icon: Int?) {
         this.icon = icon
@@ -74,8 +76,8 @@ class GoogleTaskList : Parcelable {
             writeString(title)
             writeInt(order)
             writeLong(lastSync)
-            writeInt(getColor())
-            writeInt(getIcon())
+            writeInt(getColor()!!)
+            writeInt(getIcon()!!)
         }
     }
 
diff --git a/app/src/main/java/org/tasks/data/TagData.kt b/app/src/main/java/org/tasks/data/TagData.kt
index 35114d0e0..0c656b944 100644
--- a/app/src/main/java/org/tasks/data/TagData.kt
+++ b/app/src/main/java/org/tasks/data/TagData.kt
@@ -66,13 +66,15 @@ class TagData : Parcelable {
         }
     }
 
-    fun getColor(): Int = color ?: 0
+    @Suppress("RedundantNullableReturnType")
+    fun getColor(): Int? = color ?: 0
 
     fun setColor(color: Int?) {
         this.color = color
     }
 
-    fun getIcon(): Int = icon ?: LABEL
+    @Suppress("RedundantNullableReturnType")
+    fun getIcon(): Int? = icon ?: LABEL
 
     fun setIcon(icon: Int?) {
         this.icon = icon
@@ -87,7 +89,7 @@ class TagData : Parcelable {
             writeString(name)
             writeInt(color!!)
             writeString(tagOrdering)
-            writeInt(getIcon())
+            writeInt(getIcon()!!)
             writeInt(order)
         }
     }
diff --git a/app/src/main/java/org/tasks/tags/TagRecyclerAdapter.kt b/app/src/main/java/org/tasks/tags/TagRecyclerAdapter.kt
index f4a129e4e..45eb510c9 100644
--- a/app/src/main/java/org/tasks/tags/TagRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tags/TagRecyclerAdapter.kt
@@ -35,7 +35,7 @@ internal class TagRecyclerAdapter(
 
     private fun getColor(tagData: TagData): Int {
         if (tagData.getColor() != 0) {
-            val themeColor = colorProvider.getThemeColor(tagData.getColor(), true)
+            val themeColor = colorProvider.getThemeColor(tagData.getColor()!!, true)
             if (inventory.purchasedThemes() || themeColor.isFree) {
                 return themeColor.primaryColor
             }
@@ -44,7 +44,7 @@ internal class TagRecyclerAdapter(
     }
 
     private fun getIcon(tagData: TagData): Int? =
-            if (tagData.getIcon() < 1000 || inventory.hasPro) getIconResId(tagData.getIcon()) else null
+            tagData.getIcon()?.takeIf { it < 1000 || inventory.hasPro }?.let { getIconResId(it) }
 
     fun submitList(tagData: List<TagData>?) {
         differ.submitList(tagData)