diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap
index 6d26c9fcc..dbf7b51fe 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap
@@ -7,12 +7,12 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/Welcom
   <div
     className="WelcomeView__title"
   >
-    ghostery_browser_hub_onboarding_welcome
+    ghostery_dawn_onboarding_welcome
   </div>
   <div
     className="WelcomeView__subtitle"
   >
-    ghostery_browser_hub_onboarding_lets_begin
+    ghostery_dawn_onboarding_lets_begin
   </div>
   <img
     className="WelcomeView__rocketShip"
@@ -25,7 +25,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/Welcom
     onClick={[Function]}
   >
     <span>
-      ghostery_browser_hub_onboarding_lets_do_this
+      ghostery_dawn_onboarding_lets_do_this
     </span>
   </a>
 </div>
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx
index fb5634a9d..7a80e9b18 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx
@@ -188,8 +188,8 @@ export const Step1_CreateAccountForm = (props) => {
 					)}
 				</div>
 			</div>
-			<div className="row align-center-middle">
-				<div className="columns small-10 medium-8">
+			<div className="row">
+				<div className="columns small-12 medium-10">
 					<div className="Step1_CreateAccountForm__checkboxContainer BrowserCreateAccountForm--marginBottom flex-container">
 						<ToggleCheckbox
 							name="globals"
@@ -204,7 +204,6 @@ export const Step1_CreateAccountForm = (props) => {
 						/>
 					</div>
 				</div>
-				<div className="columns small-10 medium-2" />
 			</div>
 			<div className="Step1_CreateAccountForm__ctaButtonContainer">
 				<button type="submit" className="Step1_CreateAccountForm__ctaButton">{t('create_account')}</button>
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss
index ab27dedf5..43bea6263 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss
@@ -53,8 +53,9 @@
 }
 .Step1_CreateAccountForm__legalConsentCheckedLabel {
 	font-size: 14px;
+	margin-top: 13px;
 	@include breakpoint(small down) {
-		width: 258px;
+		width: 290px;
 	}
 
 	&.error {
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap
index a03bbdbf6..65c1003cf 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap
@@ -140,35 +140,10 @@ exports[`app/hub/Views/Step1_CreateAccountForm component Snapshot tests with rea
     </div>
   </div>
   <div
-    className="row align-center-middle"
+    className="row"
   >
     <div
-      className="columns small-10 medium-8"
-    >
-      <div
-        className="Step1_CreateAccountForm__checkboxContainer Step1_CreateAccountForm--marginBottom flex-container"
-      >
-        <div />
-        <span
-          className="Step1_CreateAccountForm__promoString"
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "ghostery_browser_hub_onboarding_send_me Ghostery ghostery_browser_hub_onboarding_updates_and_promotions",
-            }
-          }
-          onClick={[Function]}
-        />
-      </div>
-    </div>
-    <div
-      className="columns small-10 medium-2"
-    />
-  </div>
-  <div
-    className="row align-center-middle"
-  >
-    <div
-      className="columns small-10 medium-8"
+      className="columns small-12 medium-10"
     >
       <div
         className="Step1_CreateAccountForm__checkboxContainer BrowserCreateAccountForm--marginBottom flex-container"
@@ -185,9 +160,6 @@ exports[`app/hub/Views/Step1_CreateAccountForm component Snapshot tests with rea
         />
       </div>
     </div>
-    <div
-      className="columns small-10 medium-2"
-    />
   </div>
   <div
     className="Step1_CreateAccountForm__ctaButtonContainer"
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx
index 67fa068d7..b551bd552 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx
@@ -36,7 +36,7 @@ const faqList = [
 ];
 
 const renderFAQListItem = (icon, label, description) => (
-	<div className="Step1_CreateAccountView__faqItemContainer row">
+	<div key={label} className="Step1_CreateAccountView__faqItemContainer row">
 		<div className="Step1_CreateAccountView__faqIconContainer columns small-12 medium-10 large-2">
 			<img className="Step1_CreateAccountView__faqIcon" src={`/app/images/hub/browser-create-account-view/${icon}`} />
 		</div>
@@ -54,16 +54,24 @@ const renderFAQListItem = (icon, label, description) => (
  */
 const Step1_CreateAccountView = (props) => {
 	const { user, actions } = props;
-	const { setSetupStep } = actions;
+	const { setSetupStep, setToast } = actions;
 	const email = user && user.email;
 
 	const [view, setView] = useState(CREATE_ACCOUNT);
 
+	const handleSkipButton = () => {
+		setSetupStep({ setup_step: LOGIN, origin: ONBOARDING });
+		setToast({
+			toastMessage: '',
+			toastClass: ''
+		});
+	};
+
 	const renderSkipLink = () => (
 		<div className="row align-center-middle">
 			<div className="columns small-10 medium-6" />
 			<div className="columns small-10 medium-6">
-				<NavLink className="Step1_CreateAccountView__skip" to="/onboarding/2" onClick={() => setSetupStep({ setup_step: LOGIN, origin: ONBOARDING })}>
+				<NavLink className="Step1_CreateAccountView__skip" to="/onboarding/2" onClick={() => handleSkipButton()}>
 					<span>{t('ghostery_dawn_onboarding_skip')}</span>
 				</NavLink>
 			</div>
@@ -75,7 +83,7 @@ const Step1_CreateAccountView = (props) => {
 			<div className="Step1_CreateAccountView__title">{t('ghostery_dawn_onboarding_you_are_signed_in_as')}</div>
 			<div className="Step1_CreateAccountView__email">{email}</div>
 			<div className="Step1_CreateAccountView__ctaButtonContainer">
-				<NavLink className="Step1_CreateAccountView__ctaButton" to="/onboarding/2" onClick={() => setSetupStep({ setup_step: LOGIN, origin: ONBOARDING })}>
+				<NavLink className="Step1_CreateAccountView__ctaButton" to="/onboarding/2" onClick={() => handleSkipButton()}>
 					<span>{t('next')}</span>
 				</NavLink>
 			</div>
@@ -91,10 +99,10 @@ const Step1_CreateAccountView = (props) => {
 			<div className="Step1_CreateAccountView__subtitle">{ t('ghostery_dawn_onboarding_sync_settings') }</div>
 			<div className="row align-center-middle">
 				{view === CREATE_ACCOUNT && (
-					<div className="Step1_CreateAccountView__alreadyHaveAccount columns small-12" onClick={() => setView(SIGN_IN)}>{t('ghostery_browser_hub_onboarding_already_have_account')}</div>
+					<div className="Step1_CreateAccountView__alreadyHaveAccount columns small-12" onClick={() => setView(SIGN_IN)}>{t('ghostery_dawn_onboarding_already_have_account')}</div>
 				)}
 				{view === SIGN_IN && (
-					<div className="Step1_CreateAccountView__alreadyHaveAccount columns small-12" onClick={() => setView(CREATE_ACCOUNT)}>{t('ghostery_browser_hub_onboarding_create_an_account')}</div>
+					<div className="Step1_CreateAccountView__alreadyHaveAccount columns small-12" onClick={() => setView(CREATE_ACCOUNT)}>{t('ghostery_dawn_onboarding_create_an_account')}</div>
 				)}
 			</div>
 			{view === CREATE_ACCOUNT ? (
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/__tests__/__snapshots__/Step1_CreateAccountView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/__tests__/__snapshots__/Step1_CreateAccountView.test.jsx.snap
index ef2454236..4d2149cf0 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/__tests__/__snapshots__/Step1_CreateAccountView.test.jsx.snap
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/__tests__/__snapshots__/Step1_CreateAccountView.test.jsx.snap
@@ -7,25 +7,22 @@ exports[`app/hub/Views/Step1_CreateAccountView component Snapshot tests with rea
   <div
     className="Step1_CreateAccountView__title"
   >
-    ghostery_browser_hub_onboarding_create_a_ghostery_account
+    ghostery_dawn_onboarding_create_a_ghostery_account
   </div>
   <div
     className="Step1_CreateAccountView__subtitle"
   >
-    ghostery_browser_hub_onboarding_sync_settings
+    ghostery_dawn_onboarding_sync_settings
   </div>
   <div
     className="row align-center-middle"
   >
     <div
-      className="Step1_CreateAccountView__alreadyHaveAccount columns small-12 medium-6"
+      className="Step1_CreateAccountView__alreadyHaveAccount columns small-12"
       onClick={[Function]}
     >
-      ghostery_browser_hub_onboarding_already_have_account
+      ghostery_dawn_onboarding_already_have_account
     </div>
-    <div
-      className="Step1_CreateAccountView__alreadyHaveAccount columns small-12 medium-6"
-    />
   </div>
   <div />
   <div
@@ -44,27 +41,78 @@ exports[`app/hub/Views/Step1_CreateAccountView component Snapshot tests with rea
         onClick={[Function]}
       >
         <span>
-          ghostery_browser_hub_onboarding_skip
+          ghostery_dawn_onboarding_skip
         </span>
       </a>
     </div>
   </div>
   <div
-    className="Step1_CreateAccountView__learnMoreContainer"
-    onClick={[Function]}
+    className="Step1_CreateAccountView__FAQContainer"
   >
     <div
-      className="Step1_CreateAccountView__learnMore"
+      className="Step1_CreateAccountView__faqItemContainer row"
     >
-      ghostery_browser_hub_onboarding_we_take_your_privacy_very_seriously
+      <div
+        className="Step1_CreateAccountView__faqIconContainer columns small-12 medium-10 large-2"
+      >
+        <img
+          className="Step1_CreateAccountView__faqIcon"
+          src="/app/images/hub/browser-create-account-view/ghosty-shield.svg"
+        />
+      </div>
+      <div
+        className="Step1_CreateAccountView__faqItemTextContainer columns small-12 medium-10 large-10"
+      >
+        <div
+          className="Step1_CreateAccountView__faqItemLabel"
+        >
+          ghostery_dawn_onboarding_private_by_design
+        </div>
+        <div
+          className="Step1_CreateAccountView__faqItemDescription"
+        >
+          ghostery_dawn_onboarding_private_by_design_description
+        </div>
+      </div>
+    </div>
+    <div
+      className="Step1_CreateAccountView__faqItemContainer row"
+    >
+      <div
+        className="Step1_CreateAccountView__faqIconContainer columns small-12 medium-10 large-2"
+      >
+        <img
+          className="Step1_CreateAccountView__faqIcon"
+          src="/app/images/hub/browser-create-account-view/ghosty-box.svg"
+        />
+      </div>
+      <div
+        className="Step1_CreateAccountView__faqItemTextContainer columns small-12 medium-10 large-10"
+      >
+        <div
+          className="Step1_CreateAccountView__faqItemLabel"
+        >
+          ghostery_dawn_onboarding_can_i_remove_my_account
+        </div>
+        <div
+          className="Step1_CreateAccountView__faqItemDescription"
+        >
+          ghostery_dawn_onboarding_can_i_remove_my_account_description
+        </div>
+      </div>
     </div>
   </div>
   <div
-    className="Step1_CreateAccountView__arrow down"
-    onClick={[Function]}
-  />
-  <div
-    className="Step1_CreateAccountView__FAQContainer"
-  />
+    className="row"
+  >
+    <a
+      className="Step1_CreateAccountView__privacyPolicyLink columns small-12 medium-10 medium-offset-1 large-8 large-offset-3"
+      href="https://ghosterystage.com/about-ghostery/ghostery-plans-and-products-privacy-policy/"
+      rel="noreferrer"
+      target="_blank"
+    >
+      ghostery_dawn_onboarding_visit_our_privacy_policy
+    </a>
+  </div>
 </div>
 `;
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js
index 09b839fa8..0d9bbea15 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js
@@ -14,9 +14,11 @@
 import { buildReduxHOC } from '../../../../shared-hub/utils';
 import Step1_CreateAccountView from './Step1_CreateAccountView';
 import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';
+import setToast from '../../../../shared-hub/actions/ToastActions';
 
 const actionCreators = {
 	setSetupStep,
+	setToast
 };
 
 export default buildReduxHOC(['account'], actionCreators, Step1_CreateAccountView);
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
index 330463407..0eca9aa0e 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
@@ -137,7 +137,7 @@ class BlockSettingsView extends Component {
 								checked={recommendedChoices}
 								onChange={() => this.toggleRecommendedChoices(!recommendedChoices)}
 							/>
-							<div>{t('ghostery_dawn_onboarding_recommended_choices')}</div>
+							<div className="BlockSettingsView_checkboxLabel" onClick={() => this.toggleRecommendedChoices(!recommendedChoices)}>{t('ghostery_dawn_onboarding_recommended_choices')}</div>
 						</div>
 						<ol>
 							<li className="BlockSettingsView_question">{t('ghostery_dawn_onboarding_question_block_ads')}</li>
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss
index 8a50b974a..399b6e8cd 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss
@@ -128,7 +128,11 @@
 	width: 20px;
 	height: 20px;
 	padding: 0;
-	margin-right: 14px;
+	margin-left: -14px;
+}
+
+.BlockSettingsView_checkboxLabel {
+	cursor: pointer;
 }
 
 .BlockSettingsView__infoIcon {
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap
index e4753d50d..823005b73 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap
@@ -21,7 +21,7 @@ Array [
         <span
           className="BlockSettingsView__back"
         >
-          ghostery_browser_hub_onboarding_back
+          ghostery_dawn_onboarding_back
         </span>
       </a>
     </div>
@@ -32,12 +32,12 @@ Array [
     <div
       className="BlockSettingsView__title"
     >
-      ghostery_browser_hub_onboarding_which_privacy_plan
+      ghostery_dawn_onboarding_which_privacy_plan
     </div>
     <div
       className="BlockSettingsView__subtitle"
     >
-      ghostery_browser_hub_onboarding_tell_us_your_preferences
+      ghostery_dawn_onboarding_tell_us_your_preferences
     </div>
     <div
       className="BlockSettingsView_formBlock"
@@ -57,15 +57,18 @@ Array [
             />
           </svg>
         </div>
-        <div>
-          ghostery_browser_hub_onboarding_recommended_choices
+        <div
+          className="BlockSettingsView_checkboxLabel"
+          onClick={[Function]}
+        >
+          ghostery_dawn_onboarding_recommended_choices
         </div>
       </div>
       <ol>
         <li
           className="BlockSettingsView_question"
         >
-          ghostery_browser_hub_onboarding_question_block_ads
+          ghostery_dawn_onboarding_question_block_ads
         </li>
         <div
           className="BlockSettingsView_answerBlock"
@@ -119,7 +122,7 @@ Array [
           <div
             className="BlockSettingsView_questionBlock"
           >
-            ghostery_browser_hub_onboarding_question_kinds_of_trackers
+            ghostery_dawn_onboarding_question_kinds_of_trackers
             <div
               className="BlockSettingsView__infoIcon g-tooltip"
             />
@@ -144,7 +147,7 @@ Array [
             <div
               className="BlockSettingsView_answerText"
             >
-              ghostery_browser_hub_onboarding_kinds_of_trackers_all
+              ghostery_dawn_onboarding_kinds_of_trackers_all
             </div>
           </div>
           <div
@@ -167,7 +170,7 @@ Array [
             <div
               className="BlockSettingsView_answerText"
             >
-              ghostery_browser_hub_onboarding_kinds_of_trackers_ad_and_analytics
+              ghostery_dawn_onboarding_kinds_of_trackers_ad_and_analytics
             </div>
           </div>
           <div
@@ -190,7 +193,7 @@ Array [
             <div
               className="BlockSettingsView_answerText"
             >
-              ghostery_browser_hub_onboarding_kinds_of_trackers_none
+              ghostery_dawn_onboarding_kinds_of_trackers_none
             </div>
           </div>
           <li
@@ -199,7 +202,7 @@ Array [
             <div
               className="BlockSettingsView_questionBlock"
             >
-              ghostery_browser_hub_onboarding_question_anti_tracking
+              ghostery_dawn_onboarding_question_anti_tracking
               <div
                 className="BlockSettingsView__infoIcon g-tooltip"
               />
@@ -257,7 +260,7 @@ Array [
             <div
               className="BlockSettingsView_questionBlock"
             >
-              ghostery_browser_hub_onboarding_question_smart_browsing
+              ghostery_dawn_onboarding_question_smart_browsing
               <div
                 className="BlockSettingsView__infoIcon g-tooltip"
               />
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap
index 28e39c2ea..1f22378ab 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap
@@ -27,7 +27,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
         <span
           className="ChoosePlanView__back"
         >
-          ghostery_browser_hub_onboarding_back
+          ghostery_dawn_onboarding_back
         </span>
       </a>
     </div>
@@ -38,12 +38,12 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
     <div
       className="ChoosePlanView__yourPrivacyPlan"
     >
-      ghostery_browser_hub_onboarding_your_privacy_plan
+      ghostery_dawn_onboarding_your_privacy_plan
     </div>
     <div
       className="ChoosePlanView__subtitle"
     >
-      ghostery_browser_hub_onboarding_choose_an_option
+      ghostery_dawn_onboarding_choose_an_option
     </div>
     <div>
       <div
@@ -111,7 +111,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_private_search
+                ghostery_dawn_onboarding_private_search
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -119,7 +119,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_tracker_protection
+                ghostery_dawn_onboarding_tracker_protection
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -127,7 +127,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_speedy_page_loads
+                ghostery_dawn_onboarding_speedy_page_loads
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -135,7 +135,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_intelligence_technology
+                ghostery_dawn_onboarding_intelligence_technology
               </div>
             </div>
           </div>
@@ -204,7 +204,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_private_search
+                ghostery_dawn_onboarding_private_search
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -212,7 +212,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_tracker_protection
+                ghostery_dawn_onboarding_tracker_protection
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -220,7 +220,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_speedy_page_loads
+                ghostery_dawn_onboarding_speedy_page_loads
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -228,7 +228,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_intelligence_technology
+                ghostery_dawn_onboarding_intelligence_technology
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -236,7 +236,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_ad_free
+                ghostery_dawn_onboarding_ad_free
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -244,7 +244,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_supports_ghosterys_mission
+                ghostery_dawn_onboarding_supports_ghosterys_mission
               </div>
             </div>
           </div>
@@ -316,7 +316,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_private_search
+                ghostery_dawn_onboarding_private_search
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -324,7 +324,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_tracker_protection
+                ghostery_dawn_onboarding_tracker_protection
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -332,7 +332,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_speedy_page_loads
+                ghostery_dawn_onboarding_speedy_page_loads
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -340,7 +340,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_intelligence_technology
+                ghostery_dawn_onboarding_intelligence_technology
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -348,7 +348,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_ad_free
+                ghostery_dawn_onboarding_ad_free
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -356,7 +356,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_supports_ghosterys_mission
+                ghostery_dawn_onboarding_supports_ghosterys_mission
               </div>
               <div
                 className="ChoosePlanView__cardSubCopy"
@@ -372,7 +372,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
                 <span
                   className="check blue"
                 />
-                ghostery_browser_hub_onboarding_unlimited_bandwidth
+                ghostery_dawn_onboarding_unlimited_bandwidth
               </div>
             </div>
           </div>
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
index db0ce4475..a19c3721b 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
@@ -22,6 +22,12 @@ import { NavLink } from 'react-router-dom';
 const SuccessView = (props) => {
 	const { actions } = props;
 	const { sendPing } = actions;
+
+	const handleCTAButtonClick = () => {
+		sendPing({ type: 'gb_onboarding_success' });
+		window.close();
+	};
+
 	return (
 		<Fragment>
 			<div className="SuccessView__relativeContainer">
@@ -37,7 +43,7 @@ const SuccessView = (props) => {
 
 				<div className="SuccessView__subtitle">{`${t('ghostery_dawn_onboarding_surf_with_ease')} Ghostery`}</div>
 				<img className="SuccessView__ghosterySuite" src="/app/images/hub/success/ghostery-suite.png" />
-				<button className="SuccessView__ctaButton" onClick={() => sendPing({ type: 'gb_onboarding_success' })} type="button">{t('ghostery_dawn_onboarding_start_browsing')}</button>
+				<button className="SuccessView__ctaButton" onClick={() => handleCTAButtonClick()} type="button">{t('ghostery_dawn_onboarding_start_browsing')}</button>
 			</div>
 		</Fragment>
 	);
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap
index 6508140e8..2a6ff5651 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap
@@ -19,7 +19,7 @@ Array [
         <span
           className="SuccessView__back"
         >
-          ghostery_browser_hub_onboarding_back
+          ghostery_dawn_onboarding_back
         </span>
       </a>
     </div>
@@ -30,12 +30,12 @@ Array [
     <div
       className="SuccessView__title"
     >
-      ghostery_browser_hub_onboarding_youve_successfully_set_up_your_browser
+      ghostery_dawn_onboarding_youve_successfully_set_up_your_browser
     </div>
     <div
       className="SuccessView__subtitle"
     >
-      ghostery_browser_hub_onboarding_surf_with_ease Ghostery
+      ghostery_dawn_onboarding_surf_with_ease Ghostery
     </div>
     <img
       className="SuccessView__ghosterySuite"
@@ -46,7 +46,7 @@ Array [
       onClick={[Function]}
       type="button"
     >
-      ghostery_browser_hub_onboarding_start_browsing
+      ghostery_dawn_onboarding_start_browsing
     </button>
   </div>,
 ]
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap
index e389612c4..9b0463a08 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap
@@ -4,8 +4,6 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProg
 
 exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 1 1`] = `ShallowWrapper {}`;
 
-exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 2 1`] = `ShallowWrapper {}`;
-
 exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 4 1`] = `ShallowWrapper {}`;
 
 exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 5 1`] = `ShallowWrapper {}`;
@@ -41,7 +39,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProg
     <div
       className="StepProgressBar__label"
     >
-      ghostery_browser_hub_onboarding_privacy
+      ghostery_dawn_onboarding_privacy
     </div>
     <div
       className="StepProgressBar__Step incomplete step-2"
@@ -56,7 +54,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProg
     <div
       className="StepProgressBar__label"
     >
-      ghostery_browser_hub_onboarding_search
+      ghostery_dawn_onboarding_search
     </div>
     <div
       className="StepProgressBar__Step incomplete step-3"
@@ -71,7 +69,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProg
     <div
       className="StepProgressBar__label"
     >
-      ghostery_browser_hub_onboarding_plan
+      ghostery_dawn_onboarding_plan
     </div>
     <div
       className="StepProgressBar__Step incomplete step-4"
diff --git a/app/hub/Views/AppView/__tests__/__snapshots__/AppView.test.jsx.snap b/app/hub/Views/AppView/__tests__/__snapshots__/AppView.test.jsx.snap
index f6369e1a9..ee1da5b3b 100644
--- a/app/hub/Views/AppView/__tests__/__snapshots__/AppView.test.jsx.snap
+++ b/app/hub/Views/AppView/__tests__/__snapshots__/AppView.test.jsx.snap
@@ -11,7 +11,7 @@ exports[`app/hub/Views/AppView component Snapshot tests with react-test-renderer
     className="App__mainContent full-height full-width"
   >
     <div
-      className="ToastMessage full-width"
+      className="ToastMessage full-width "
     >
       <div
         className="callout-container"
@@ -23,9 +23,13 @@ exports[`app/hub/Views/AppView component Snapshot tests with react-test-renderer
             className="flex-container align-center-middle"
           >
             <div
-              className="callout-text"
+              className="flex-container align-middle"
             >
-              Example toast message
+              <div
+                className="callout-text"
+              >
+                Example toast message
+              </div>
             </div>
             <div
               className="ToastMessage__close clickable"
diff --git a/app/images/hub/step-progress-bar/step-1-current.svg b/app/images/hub/step-progress-bar/step-1-current.svg
index f909351a2..ea7621dde 100644
--- a/app/images/hub/step-progress-bar/step-1-current.svg
+++ b/app/images/hub/step-progress-bar/step-1-current.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35"><g fill="none" fill-rule="evenodd"><path fill="#00AEF0" d="M26.117 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C8.08 0 2.878 5.014 2.878 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/><text fill="#4A4A4A" font-family="Roboto-Medium, Roboto" font-size="12.6" font-weight="400" transform="translate(.5)"><tspan x="10" y="20">1</tspan></text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35">
+	<g fill="none" fill-rule="evenodd">
+		<path fill="#00AEF0" d="M26.117 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C8.08 0 2.878 5.014 2.878 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/>
+		<text fill="#4A4A4A" font-family="Roboto, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif" font-size="12.6" font-weight="700" transform="translate(.5)">
+		<tspan x="10" y="20">1</tspan>
+		</text>
+	</g>
+</svg>
diff --git a/app/images/hub/step-progress-bar/step-2-current.svg b/app/images/hub/step-progress-bar/step-2-current.svg
index 334222a0f..7b2b0d76f 100644
--- a/app/images/hub/step-progress-bar/step-2-current.svg
+++ b/app/images/hub/step-progress-bar/step-2-current.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35"><g fill="none" fill-rule="evenodd"><path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/><text fill="#4A4A4A" font-family="Roboto-Medium, Roboto" font-size="12.6" font-weight="400"><tspan x="10" y="20">2</tspan></text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35">
+	<g fill="none" fill-rule="evenodd">
+		<path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/>
+		<text fill="#4A4A4A" font-family="Roboto, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif" font-size="12.6" font-weight="700">
+		<tspan x="10" y="20">2</tspan>
+		</text>
+	</g>
+</svg>
diff --git a/app/images/hub/step-progress-bar/step-2-incomplete.svg b/app/images/hub/step-progress-bar/step-2-incomplete.svg
index b85269220..f53cb0b71 100644
--- a/app/images/hub/step-progress-bar/step-2-incomplete.svg
+++ b/app/images/hub/step-progress-bar/step-2-incomplete.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35"><g fill="none" fill-rule="evenodd"><path fill="#FFF" stroke="#00AEF0" stroke-width="2.1" d="M28.117 21.298V13.2c0-6.186-5.202-11.2-11.619-11.2-6.418 0-11.62 5.014-11.62 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/><text fill="#4A4A4A" font-family="Roboto-Medium, Roboto" font-size="12.6" font-weight="400" transform="translate(2.5 2)"><tspan x="10" y="20">2</tspan></text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35">
+	<g fill="none" fill-rule="evenodd">
+		<path fill="#FFF" stroke="#00AEF0" stroke-width="2.1" d="M28.117 21.298V13.2c0-6.186-5.202-11.2-11.619-11.2-6.418 0-11.62 5.014-11.62 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/>
+		<text fill="#4A4A4A" font-family="Roboto, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif" font-size="12.6" font-weight="700" transform="translate(2.5 2)">
+		<tspan x="10" y="20">2</tspan>
+		</text>
+	</g>
+</svg>
diff --git a/app/images/hub/step-progress-bar/step-3-current.svg b/app/images/hub/step-progress-bar/step-3-current.svg
index 6e8c4a48f..a1e47f728 100644
--- a/app/images/hub/step-progress-bar/step-3-current.svg
+++ b/app/images/hub/step-progress-bar/step-3-current.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35"><g fill="none" fill-rule="evenodd"><path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/><text fill="#4A4A4A" font-family="Roboto-Medium, Roboto" font-size="12.6" font-weight="400"><tspan x="10" y="20">3</tspan></text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35">
+	<g fill="none" fill-rule="evenodd">
+		<path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/>
+		<text fill="#4A4A4A" font-family="Roboto, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif" font-size="12.6" font-weight="700">
+		<tspan x="10" y="20">3</tspan>
+		</text>
+	</g>
+</svg>
diff --git a/app/images/hub/step-progress-bar/step-3-incomplete.svg b/app/images/hub/step-progress-bar/step-3-incomplete.svg
index 3e5ac18a2..3b0ec21f0 100644
--- a/app/images/hub/step-progress-bar/step-3-incomplete.svg
+++ b/app/images/hub/step-progress-bar/step-3-incomplete.svg
@@ -3,7 +3,7 @@
         <g>
             <g>
                 <path fill="#FFF" stroke="#00AEF0" stroke-width="2.1" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z" transform="translate(-554 -163) translate(556.5 165)"/>
-                <text fill="#4A4A4A" font-family="Roboto-Medium, Roboto" font-size="12.6" font-weight="400" transform="translate(-554 -163) translate(556.5 165)">
+                <text fill="#4A4A4A" font-family="Roboto, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif" font-size="12.6" font-weight="700" transform="translate(-554 -163) translate(556.5 165)">
                     <tspan x="10" y="20">3</tspan>
                 </text>
             </g>
diff --git a/app/images/hub/step-progress-bar/step-4-current.svg b/app/images/hub/step-progress-bar/step-4-current.svg
index e558755dc..eeed221c5 100644
--- a/app/images/hub/step-progress-bar/step-4-current.svg
+++ b/app/images/hub/step-progress-bar/step-4-current.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35"><g fill="none" fill-rule="evenodd"><path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/><text fill="#4A4A4A" font-family="Roboto-Medium, Roboto" font-size="12.6" font-weight="400"><tspan x="10" y="20">4</tspan></text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35">
+	<g fill="none" fill-rule="evenodd">
+		<path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/>
+		<text fill="#4A4A4A" font-family="Roboto, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif" font-size="12.6" font-weight="700">
+		<tspan x="10" y="20">4</tspan>
+		</text>
+	</g>
+</svg>
diff --git a/app/images/hub/step-progress-bar/step-4-incomplete.svg b/app/images/hub/step-progress-bar/step-4-incomplete.svg
index ee06f911b..26322cabe 100644
--- a/app/images/hub/step-progress-bar/step-4-incomplete.svg
+++ b/app/images/hub/step-progress-bar/step-4-incomplete.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35"><g fill="none" fill-rule="evenodd"><path fill="#FFF" stroke="#00AEF0" stroke-width="2.1" d="M28.117 21.298V13.2c0-6.186-5.202-11.2-11.619-11.2-6.418 0-11.62 5.014-11.62 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/><text fill="#4A4A4A" font-family="Roboto-Medium, Roboto" font-size="12.6" font-weight="400" transform="translate(2.5 2)"><tspan x="10" y="20">4</tspan></text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 35">
+	<g fill="none" fill-rule="evenodd">
+		<path fill="#FFF" stroke="#00AEF0" stroke-width="2.1" d="M28.117 21.298V13.2c0-6.186-5.202-11.2-11.619-11.2-6.418 0-11.62 5.014-11.62 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/>
+		<text fill="#4A4A4A" font-family="Roboto, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif" font-size="12.6" font-weight="700" transform="translate(2.5 2)">
+		<tspan x="10" y="20">4</tspan>
+		</text>
+	</g>
+</svg>
diff --git a/app/images/hub/step-progress-bar/step-completed.svg b/app/images/hub/step-progress-bar/step-completed.svg
index 0ff6754ad..531837424 100644
--- a/app/images/hub/step-progress-bar/step-completed.svg
+++ b/app/images/hub/step-progress-bar/step-completed.svg
@@ -1 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 33 35"><defs><path id="a" d="M16.387 6.096L7.68 14.804a.717.717 0 01-.554.238.72.72 0 01-.554-.238l-3.958-3.958a.764.764 0 010-1.108.764.764 0 011.108 0l3.404 3.404 8.154-8.155a.766.766 0 011.108 0 .766.766 0 010 1.109z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/><g transform="translate(5 8)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#000" fill-rule="nonzero" xlink:href="#a"/><g fill="#4A4A4A" mask="url(#b)"><path d="M0 0h19v19H0z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 33 35">
+	<defs>
+		<path id="a" d="M16.387 6.096L7.68 14.804a.717.717 0 01-.554.238.72.72 0 01-.554-.238l-3.958-3.958a.764.764 0 010-1.108.764.764 0 011.108 0l3.404 3.404 8.154-8.155a.766.766 0 011.108 0 .766.766 0 010 1.109z"/>
+	</defs>
+	<g fill="none" fill-rule="evenodd">
+		<path fill="#00AEF0" d="M25.617 19.298V11.2c0-6.186-5.202-11.2-11.619-11.2C7.58 0 2.378 5.014 2.378 11.2v8.215c-.05 1.059-.31 3.487-1.586 6.328-1.715 3.818-.296 3.363.975 3.049 1.271-.313 4.11-1.54 4.997-.029.886 1.51 1.626 2.821 3.695 1.966 2.07-.854 3.045-1.139 3.34-1.139h.402c.295 0 1.27.285 3.34 1.14 2.07.854 2.81-.457 3.696-1.967.886-1.51 3.725-.284 4.996.029 1.271.314 2.69.769.975-3.049-1.327-2.956-1.555-5.46-1.59-6.445z"/>
+		<g transform="translate(5 8)">
+			<mask id="b" fill="#fff">
+				<use xlink:href="#a"/>
+			</mask>
+			<use fill="#000" fill-rule="nonzero" xlink:href="#a"/>
+			<g fill="#4A4A4A" mask="url(#b)">
+				<path d="M0 0h19v19H0z"/>
+			</g>
+		</g>
+	</g>
+</svg>