diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
index 145c1b34..55078e00 100644
--- a/app/src/main/res/layout/activity_edit_profile.xml
+++ b/app/src/main/res/layout/activity_edit_profile.xml
@@ -46,7 +46,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_person_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="#7f7f7f"
+                    android:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
@@ -88,7 +88,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginStart="14dp"
                 android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
-                android:tint="#7f7f7f"/>
+                android:tint="?attr/iconColorPrimary"/>
 
             <TextView
                 android:id="@+id/accordian_title"
@@ -121,7 +121,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_info_outline_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="#7f7f7f"
+                    android:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
@@ -175,7 +175,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_timelapse_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="#7f7f7f"
+                    android:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
@@ -224,7 +224,7 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_vpn_key_black_24dp"
                     android:layout_marginTop="10dp"
-                    android:tint="#7f7f7f"
+                    android:tint="?attr/iconColorPrimary"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="20dp"/>
 
diff --git a/app/src/main/res/layout/activity_slots.xml b/app/src/main/res/layout/activity_slots.xml
index 23f89544..88265c3c 100644
--- a/app/src/main/res/layout/activity_slots.xml
+++ b/app/src/main/res/layout/activity_slots.xml
@@ -99,6 +99,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_info_outline_black_24dp"
+                    android:tint="?attr/iconColorPrimary"
                     android:layout_marginEnd="15dp"/>
 
                 <TextView
diff --git a/app/src/main/res/layout/bottom_sheet_edit_profile.xml b/app/src/main/res/layout/bottom_sheet_edit_profile.xml
index c6faeabc..8da8a8e4 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_profile.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_profile.xml
@@ -17,7 +17,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:src="@drawable/ic_content_copy_black_24dp"/>
+            android:src="@drawable/ic_content_copy_black_24dp"
+            android:tint="@color/icon_primary"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -37,7 +38,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:src="@drawable/ic_create_black_24dp"/>
+            android:src="@drawable/ic_create_black_24dp"
+            android:tint="@color/icon_primary"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -57,7 +59,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:src="@drawable/ic_delete_black_24dp"/>
+            android:src="@drawable/ic_delete_black_24dp"
+            android:tint="@color/icon_primary"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_slot.xml b/app/src/main/res/layout/card_slot.xml
index 47d73e24..b767bae1 100644
--- a/app/src/main/res/layout/card_slot.xml
+++ b/app/src/main/res/layout/card_slot.xml
@@ -20,6 +20,7 @@
 
         <ImageView
             android:id="@+id/img_slot"
+            android:tint="?attr/iconColorPrimary"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginEnd="15dp"/>
@@ -65,6 +66,7 @@
         android:clickable="true"
         android:focusable="true"
         android:src="@drawable/ic_delete_black_24dp"
+        android:tint="?attr/iconColorPrimary"
         android:paddingStart="15dp"
         android:paddingEnd="15dp"
         android:paddingTop="12.5dp"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index bd790f79..4ab8287c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,4 +5,6 @@
     <attr name="backgroundColor" format="color" />
     <attr name="cardBackground" format="color" />
     <attr name="codePrimaryText" format="color" />
-</resources>
\ No newline at end of file
+    <attr name="iconColorPrimary" format="color" />
+    <attr name="iconColorInverted" format="color" />
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 00100aa9..d8b42595 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,6 +21,11 @@
     <color name="colorSwirlPrimaryDark">#FFFFFF</color>
     <color name="colorSwirlErrorDark">#FF5252</color>
 
+    <color name="icon_primary">#212121</color>
+    <color name="icon_primary_inverted">#ffffff</color>
+    <color name="icon_primary_dark">#ffffff</color>
+    <color name="icon_primary_dark_inverted">#212121</color>
+
     <color name="code_primary_text">#0d47a1</color>
     <color name="code_primary_text_dark">#ffffff</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b68118d2..cb15d723 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,6 +27,9 @@
         <item name="background">@color/background</item>
         <item name="preferenceCategory_marginBottom">0dp</item>
 
+        <item name="iconColorPrimary">@color/icon_primary</item>
+        <item name="iconColorInverted">@color/icon_primary_inverted</item>
+
         <item name="swirl_ridgeColor">@color/colorSwirlPrimary</item>
         <item name="swirl_errorColor">@color/colorSwirlError</item>
     </style>
@@ -57,6 +60,9 @@
         <item name="background">@color/background_dark</item>
         <item name="preferenceCategory_marginBottom">0dp</item>
 
+        <item name="iconColorPrimary">@color/icon_primary_dark</item>
+        <item name="iconColorInverted">@color/icon_primary_dark_inverted</item>
+
         <item name="swirl_ridgeColor">@color/colorSwirlPrimaryDark</item>
         <item name="swirl_errorColor">@color/colorSwirlErrorDark</item>
     </style>