diff --git a/src/status_im/contexts/onboarding/create_password/view.cljs b/src/status_im/contexts/onboarding/create_password/view.cljs
index 371caa4a1b..3f295e6981 100644
--- a/src/status_im/contexts/onboarding/create_password/view.cljs
+++ b/src/status_im/contexts/onboarding/create_password/view.cljs
@@ -40,7 +40,7 @@
       [quo/info-message
        {:status status
         :size   :default
-        :icon   (if (= status :success) :i/positive-state :i/info)
+        :icon   (if (= status :success) :i/check-circle :i/info)
         :color  (when (= status :default)
                   colors/white-70-blur)}
        text])]])
diff --git a/src/status_im/contexts/profile/settings/screens/password/change_password/new_password_form.cljs b/src/status_im/contexts/profile/settings/screens/password/change_password/new_password_form.cljs
index 018fd0ad20..17630d8b6c 100644
--- a/src/status_im/contexts/profile/settings/screens/password/change_password/new_password_form.cljs
+++ b/src/status_im/contexts/profile/settings/screens/password/change_password/new_password_form.cljs
@@ -27,7 +27,7 @@
        (cond-> {:status status
                 :size   :default}
          (not= :success status) (assoc :icon :i/info)
-         (= :success status)    (assoc :icon :i/positive-state)
+         (= :success status)    (assoc :icon :i/check-circle)
          (= :default status)    (assoc :color colors/white-70-blur))
        text])]])
 
@@ -141,9 +141,10 @@
       (when same-passwords?
         [rn/view {:style style/disclaimer-container}
          [quo/disclaimer
-          {:blur?     true
-           :on-change on-disclaimer-change
-           :checked?  disclaimer-accepted?}
+          {:blur?               true
+           :customization-color customization-color
+           :on-change           on-disclaimer-change
+           :checked?            disclaimer-accepted?}
           (i18n/label :t/password-creation-disclaimer)]])
       (when (and focused? (not same-passwords?))
         [help