diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_error.png
new file mode 100644
index 000000000..c4f7972c9
Binary files /dev/null and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_loading.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_loading.png
new file mode 100644
index 000000000..565fc903a
Binary files /dev/null and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_loading.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_success.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_success.png
new file mode 100644
index 000000000..3875d77ba
Binary files /dev/null and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/dark_theme/onboarding_success.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_error.png
new file mode 100644
index 000000000..d56823f11
Binary files /dev/null and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_loading.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_loading.png
new file mode 100644
index 000000000..a9a2133b7
Binary files /dev/null and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_loading.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_success.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_success.png
new file mode 100644
index 000000000..b024209d5
Binary files /dev/null and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding/view/goldens/ci/light_theme/onboarding_success.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_error.png
index 78a3b1d1b..53b80a1d0 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_error.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_loading.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_loading.png
index e16610fa3..f41b6d12e 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_loading.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/dark_theme/onboarding_email_confirmation_loading.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_error.png
index 0f84642d1..f5ad27ddd 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_error.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_loading.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_loading.png
index 35c4dfd01..ce0a1046b 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_loading.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmation_loading.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmed_loading.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmed_loading.png
index 5e77ce160..4732ec484 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmed_loading.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_email_confirmation/view/goldens/ci/light_theme/onboarding_email_confirmed_loading.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_confirmation_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_confirmation_error.png
index 5ca22ee6e..4197b7065 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_confirmation_error.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_confirmation_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_empty.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_empty.png
index c89aad0d1..c1a219a43 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_empty.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_empty.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_error.png
index 3730b6dc3..323e43ccd 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_error.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_filled.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_filled.png
index 61ebb0814..f3218145a 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_filled.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_filled.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_loading.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_loading.png
index 154e69403..022fb89ea 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_loading.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/dark_theme/onboarding_phone_loading.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_confirmation_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_confirmation_error.png
index ac08ca862..50d7b8034 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_confirmation_error.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_confirmation_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_empty.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_empty.png
index 87cee4f4d..ac8ab4b82 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_empty.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_empty.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_error.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_error.png
index d00d50942..2cbe6b6a6 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_error.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_error.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_filled.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_filled.png
index 99122508e..421c75100 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_filled.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_filled.png differ
diff --git a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_loading.png b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_loading.png
index e4cae8bca..151f95255 100644
Binary files a/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_loading.png and b/packages/rx_bloc_cli/mason_templates/bricks/feature_onboarding/__brick__/test/feature_onboarding_phone_confirmation/view/goldens/ci/light_theme/onboarding_phone_loading.png differ