diff --git a/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
index 4088d21..81bc684 100644
--- a/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
+++ b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
@@ -19,7 +19,6 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatButton;
-import androidx.core.content.ContextCompat;
 import androidx.core.widget.NestedScrollView;
 
 public abstract class MifosPassCodeActivity extends AppCompatActivity implements MifosPassCodeView.
@@ -308,11 +307,9 @@ public void clickedBackSpace(View v) {
     public void visibilityChange(View view) {
         mifosPassCodeView.revertPassCodeVisibility();
         if (!mifosPassCodeView.passcodeVisible()) {
-            ivVisibility.setColorFilter(ContextCompat.getColor(MifosPassCodeActivity.this,
-                    R.color.light_grey));
+            ivVisibility.setImageResource(R.drawable.ic_visibility_on_48px);
         } else {
-            ivVisibility.setColorFilter(ContextCompat.getColor(MifosPassCodeActivity.this,
-                    R.color.gray_dark));
+            ivVisibility.setImageResource(R.drawable.ic_visibility_off_24dp);
         }
     }
 
diff --git a/mifos-passcode/src/main/res/drawable/ic_visibility_off_24dp.xml b/mifos-passcode/src/main/res/drawable/ic_visibility_off_24dp.xml
new file mode 100644
index 0000000..d4cfc72
--- /dev/null
+++ b/mifos-passcode/src/main/res/drawable/ic_visibility_off_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/passcode_primary"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/mifos-passcode/src/main/res/drawable/ic_visibility_48px.xml b/mifos-passcode/src/main/res/drawable/ic_visibility_on_48px.xml
similarity index 90%
rename from mifos-passcode/src/main/res/drawable/ic_visibility_48px.xml
rename to mifos-passcode/src/main/res/drawable/ic_visibility_on_48px.xml
index 44f9d4f..8a550a2 100644
--- a/mifos-passcode/src/main/res/drawable/ic_visibility_48px.xml
+++ b/mifos-passcode/src/main/res/drawable/ic_visibility_on_48px.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="48.0"
     android:viewportHeight="48.0">
     <path
-        android:fillColor="@color/gray_dark"
+        android:fillColor="@color/passcode_primary"
         android:pathData="M24,9C14,9 5.46,15.22 2,24c3.46,8.78 12,15 22,15s18.54,-6.22 22,-15C42.54,15.22 34.01,9 24,9zM24,34c-5.52,0 -10,-4.48 -10,-10s4.48,-10 10,-10 10,4.48 10,10 -4.48,10 -10,10zM24,18c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6z" />
 </vector>
diff --git a/mifos-passcode/src/main/res/layout/activity_pass_code.xml b/mifos-passcode/src/main/res/layout/activity_pass_code.xml
index 6b15861..389d0f0 100644
--- a/mifos-passcode/src/main/res/layout/activity_pass_code.xml
+++ b/mifos-passcode/src/main/res/layout/activity_pass_code.xml
@@ -64,7 +64,7 @@
                     android:layout_marginStart="@dimen/default_padding"
                     android:layout_marginLeft="@dimen/default_padding"
                     android:onClick="visibilityChange"
-                    app:srcCompat="@drawable/ic_visibility_48px" />
+                    app:srcCompat="@drawable/ic_visibility_on_48px" />
 
             </LinearLayout>