Oobe child specific signin: update assets

Bug: 1101318 Change-Id: I4750459cbdf3a069c76ca8726ed75c647ac5d387 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352894 Commit-Queue: Yunke Zhou <yunkez@google.com> Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org> Cr-Commit-Position: refs/heads/master@{#798180}

Oobe child specific signin: update assets
Bug: 1101318 Change-Id: I4750459cbdf3a069c76ca8726ed75c647ac5d387 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352894 Commit-Queue: Yunke Zhou <yunkez@google.com> Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org> Cr-Commit-Position: refs/heads/master@{#798180}
94be7a81 · Yunke Zhou · Commit Bot · 4d87b1a9 · 94be7a81 · 94be7a81
Commit 94be7a81 authored Aug 14, 2020 by Yunke Zhou Committed by Commit Bot Aug 14, 2020
12 changed files
--- a/chrome/browser/chromeos/login/ui/login_display_host_mojo.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_mojo.cc
@@ -118,11 +118,13 @@ void LoginDisplayHostMojo::SetUserCount(int user_count) {
  // Hide Gaia dialog in case empty list of users switched to a non-empty one.
  // And if the dialog shows login screen.
+  const OobeScreenId start_screen = features::IsChildSpecificSigninEnabled()
+                                        ? UserCreationView::kScreenId
+                                        : GaiaView::kScreenId;
  if (was_zero_users && user_count_ != 0 && dialog_ && dialog_->IsVisible() &&
      (!wizard_controller_->is_initialized() ||
       (wizard_controller_->current_screen() &&
-        wizard_controller_->current_screen()->screen_id() ==
+        wizard_controller_->current_screen()->screen_id() == start_screen))) {
-            GaiaView::kScreenId))) {
    HideOobeDialog();
  }
 }

--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -844,7 +844,7 @@ void WizardController::OnUserCreationScreenExit(
      AdvanceToScreen(GaiaView::kScreenId);
      break;
    case UserCreationScreen::Result::ENTERPRISE_ENROLL:
-      ShowEnrollmentScreen();
+      AdvanceToScreen(EnrollmentScreenView::kScreenId);
      break;
    case UserCreationScreen::Result::CANCEL:
      LoginDisplayHost::default_host()->HideOobeDialog();
@@ -1348,7 +1348,10 @@ void WizardController::OnDeviceModificationCanceled() {
  current_screen_->Hide();
  current_screen_ = nullptr;
  if (previous_screen_) {
-    if (previous_screen_ == GetScreen(GaiaView::kScreenId)) {
+    const OobeScreenId start_screen = features::IsChildSpecificSigninEnabled()
+                                          ? UserCreationView::kScreenId
+                                          : GaiaView::kScreenId;
+    if (previous_screen_ == GetScreen(start_screen)) {
      ShowLoginScreen();
    } else {
      SetCurrentScreen(previous_screen_);

--- a/chrome/browser/resources/chromeos/login/components/oobe_dialog.css
+++ b/chrome/browser/resources/chromeos/login/components/oobe_dialog.css
@@ -82,7 +82,7 @@
  padding-inline-start: var(--oobe-dialog-content-padding);
  /* TODO(https://crbug.com/1017173) Make it adaptive. */
-  padding-top: 20px;
+  padding-top: var(--oobe-dialog-content-padding-top);
 }
 #footerContainer[noFooterPadding] {

--- a/chrome/browser/resources/chromeos/login/components/oobe_icons.html
+++ b/chrome/browser/resources/chromeos/login/components/oobe_icons.html
@@ -77,6 +77,16 @@
        <path fill="#fff" d="M0 0h32v32H0z"></path>
        <path fill-rule="evenodd" clip-rule="evenodd" d="M16 2.667C8.64 2.667 2.667 8.64 2.667 16S8.64 29.333 16 29.333 29.333 23.36 29.333 16 23.36 2.667 16 2.667zm8.48 19.773c-1.907-2.32-6.533-3.107-8.48-3.107s-6.573.787-8.48 3.107A10.6 10.6 0 015.333 16C5.333 10.12 10.12 5.333 16 5.333S26.667 10.12 26.667 16a10.6 10.6 0 01-2.187 6.44zM16 8a4.655 4.655 0 00-4.667 4.667A4.655 4.655 0 0016 17.333a4.655 4.655 0 004.667-4.666A4.655 4.655 0 0016 8z" fill="#1A73E8"></path>
      </g>
+      <g id="family" fill="none" fill-rule="evenodd">
+        <path fill="#4285F4" d="M15.917 1.333c-.484 0-.967.184-1.35.534l-10.75 9.9c-.4.366-.617.85-.634 1.35l6.784 1.066L15.917 12l1.666-4.767-1.666-5.9z"></path>
+        <path fill="#BDC1C6" d="M18.267 21.45l-7.034 9.217H14.9c.617 0 1.2-.284 1.583-.784l6.434-8.433h-4.65zM3.2 24.017c-.617 0-1.2.283-1.583.783l-.284.383 1.984.45 1.166 1.517 2.4-3.133H3.2z"></path>
+        <path fill="#34A853" d="M15.917 12L3.183 13.117c-.033.466.1.933.4 1.333l3.734 4.883 1.016 1.334 4.284 1.283 3.3-1.95 1.666-4-1.666-4z"></path>
+        <path fill="#FBBC04" d="M8.333 20.667l6.017 7.883c.4.517.983.783 1.583.783l1.667-4.8L15.933 20l-7.6.667z"></path>
+        <path fill="#DADCE0" d="M14.9 30.667c-.617 0-1.2-.284-1.583-.784l-3.9-5.1A1.989 1.989 0 007.833 24H3.2c.617 0 1.2.283 1.583.783l3.9 5.1c.384.5.967.784 1.584.784H14.9z"></path>
+        <path fill="#669DF6" d="M28.667 13.117a2.28 2.28 0 00-.15-.667c-.1-.25-.267-.483-.484-.683L17.283 1.85a2.06 2.06 0 00-1.366-.517V12l6.366 2.233 6.384-1.116z"></path>
+        <path fill="#5BB974" d="M28.667 13.117L15.917 12v8l3.683 1.95 3.917-1.283 1.016-1.334 3.717-4.866c.317-.4.433-.884.417-1.35z"></path>
+        <path fill="#FCC934" d="M15.917 29.333c.583 0 1.183-.266 1.583-.783l6.017-7.883-7.6-.667v9.333z"></path>
+      </g>
    </defs>
  </svg>
 </iron-iconset-svg>
@@ -84,18 +94,22 @@
 <iron-iconset-svg name="oobe-48" size="48">
  <svg>
    <defs>
-      <g id="self" fill="none" fill-rule="evenodd">
+      <g id="avatar" fill="none" fill-rule="evenodd">
+        <path fill="#fff" d="M0 0h48v48H0z"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M24 13.2a6.284 6.284 0 00-6.3 6.3c0 3.492 2.808 6.3 6.3 6.3s6.3-2.808 6.3-6.3-2.808-6.3-6.3-6.3zm-2.7 6.3c0 1.494 1.206 2.7 2.7 2.7 1.494 0 2.7-1.206 2.7-2.7 0-1.494-1.206-2.7-2.7-2.7a2.696 2.696 0 00-2.7 2.7z"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M24 4.8C13.402 4.8 4.8 13.402 4.8 24c0 10.598 8.602 19.2 19.2 19.2 10.598 0 19.2-8.602 19.2-19.2 0-10.598-8.602-19.2-19.2-19.2zm-8.874 30.504C15.9 33.684 20.616 32.1 24 32.1c3.384 0 8.118 1.584 8.874 3.204A14.207 14.207 0 0124 38.4a14.207 14.207 0 01-8.874-3.096zM24 28.5c2.628 0 8.874 1.062 11.448 4.194C37.284 30.282 38.4 27.276 38.4 24c0-7.938-6.462-14.4-14.4-14.4-7.938 0-14.4 6.462-14.4 14.4 0 3.276 1.116 6.282 2.952 8.694C15.126 29.562 21.372 28.5 24 28.5z"></path>
+      </g>
+      <g id="child-user" fill="none" fill-rule="evenodd">
        <path fill="#fff" d="M0 0h48v48H0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M24 13.2a6.284 6.284 0 00-6.3 6.3c0 3.492 2.808 6.3 6.3 6.3s6.3-2.808 6.3-6.3-2.808-6.3-6.3-6.3zm-2.7 6.3c0 1.494 1.206 2.7 2.7 2.7 1.494 0 2.7-1.206 2.7-2.7 0-1.494-1.206-2.7-2.7-2.7a2.696 2.696 0 00-2.7 2.7z" clip-rule="evenodd"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M24 3.556c3.3 0 6 2.7 6 6s-2.7 6-6 6-6-2.7-6-6 2.7-6 6-6zm-13 21.22c0-4.1 6.84-7.22 13-7.22s13 3.12 13 7.22v11.54c0 2.32-2.18 4.34-5.2 5.64v-4.46c0-1.88-2.42-3.42-5.2-4.04-.86-.2-1.74-.3-2.6-.3-3.34 0-7.02 1.54-7.68 3.66 2.3.96 5.04 1.54 7.68 1.54.66 0 1.34-.06 2-.14v5.2c-.66.08-1.34.14-2 .14-2.68 0-5.48-.6-7.8-1.6-3.02-1.32-5.2-3.32-5.2-5.64v-11.54zm17 .78a4 4 0 11-8 0 4 4 0 018 0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M24 4.8C13.402 4.8 4.8 13.402 4.8 24c0 10.598 8.602 19.2 19.2 19.2 10.598 0 19.2-8.602 19.2-19.2 0-10.598-8.602-19.2-19.2-19.2zm-8.874 30.504C15.9 33.684 20.616 32.1 24 32.1c3.384 0 8.118 1.584 8.874 3.204A14.207 14.207 0 0124 38.4a14.207 14.207 0 01-8.874-3.096zM24 28.5c2.628 0 8.874 1.062 11.448 4.194C37.284 30.282 38.4 27.276 38.4 24c0-7.938-6.462-14.4-14.4-14.4-7.938 0-14.4 6.462-14.4 14.4 0 3.276 1.116 6.282 2.952 8.694C15.126 29.562 21.372 28.5 24 28.5z" clip-rule="evenodd"></path>
      </g>
      <g id="person-add" fill="none" fill-rule="evenodd">
        <path fill="#fff" d="M0 0h48v48H0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M18 24c4.42 0 8-3.58 8-8s-3.58-8-8-8-8 3.58-8 8 3.58 8 8 8zm0-12c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zM2 34c0-5.32 10.66-8 16-8s16 2.68 16 8v6H2v-6zm4 2v-1.98C6.4 32.58 12.6 30 18 30s11.6 2.58 12 4v2H6zm30-14v6h4v-6h6v-4h-6v-6h-4v6h-6v4h6z" clip-rule="evenodd"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M18 24c4.42 0 8-3.58 8-8s-3.58-8-8-8-8 3.58-8 8 3.58 8 8 8zm0-12c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zM2 34c0-5.32 10.66-8 16-8s16 2.68 16 8v6H2v-6zm4 2v-1.98C6.4 32.58 12.6 30 18 30s11.6 2.58 12 4v2H6zm30-14v6h4v-6h6v-4h-6v-6h-4v6h-6v4h6z"></path>
      </g>
-      <g id="child-account" fill="none" fill-rule="evenodd">
+      <g id="supervised-user" fill="none" fill-rule="evenodd">
        <path fill="#fff" d="M0 0h48v48H0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M24 4C12.96 4 4 12.96 4 24s8.96 20 20 20 20-8.96 20-20S35.04 4 24 4zm-5.28 8c-3.88 0-7 3.12-7 7s3.12 7 7 7 7-3.12 7-7-3.12-7-7-7zm0 10c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zM37 25a5 5 0 11-10 0 5 5 0 0110 0zm-5 6.24c1.52 0 3.7.36 5.66 1.04C39.14 29.86 40 27.04 40 24c0-8.82-7.18-16-16-16S8 15.18 8 24c0 2.54.6 4.94 1.66 7.08 3.18-1.48 7.06-2.06 9.06-2.06.98 0 2.44.14 4.04.46-1.64.88-3.08 2.02-3.92 3.54h-.12c-2.16 0-4.8.58-6.82 1.42 2.52 2.92 6.08 4.92 10.1 5.42v-3.62c0-.98.6-1.82 1.5-2.52.34-.26.72-.48 1.12-.7.01 0 .015-.005.02-.01.005-.005.01-.01.02-.01.4-.2.84-.4 1.3-.58.92-.36 1.92-.62 2.88-.82 1.16-.24 2.28-.36 3.16-.36z" clip-rule="evenodd"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M24 4C12.96 4 4 12.96 4 24s8.96 20 20 20 20-8.96 20-20S35.04 4 24 4zm-5.28 8c-3.88 0-7 3.12-7 7s3.12 7 7 7 7-3.12 7-7-3.12-7-7-7zm0 10c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zM37 25a5 5 0 11-10 0 5 5 0 0110 0zm-5 6.24c1.52 0 3.7.36 5.66 1.04C39.14 29.86 40 27.04 40 24c0-8.82-7.18-16-16-16S8 15.18 8 24c0 2.54.6 4.94 1.66 7.08 3.18-1.48 7.06-2.06 9.06-2.06.98 0 2.44.14 4.04.46-1.64.88-3.08 2.02-3.92 3.54h-.12c-2.16 0-4.8.58-6.82 1.42 2.52 2.92 6.08 4.92 10.1 5.42v-3.62c0-.98.6-1.82 1.5-2.52.34-.26.72-.48 1.12-.7.01 0 .015-.005.02-.01.005-.005.01-.01.02-.01.4-.2.84-.4 1.3-.58.92-.36 1.92-.62 2.88-.82 1.16-.24 2.28-.36 3.16-.36z"></path>
      </g>
    </defs>
    </svg>
@@ -173,6 +187,16 @@
        <path fill="#fff" d="M0 0h64v64H0z"></path>
        <path fill-rule="evenodd" clip-rule="evenodd" d="M32 5.333C17.28 5.333 5.333 17.28 5.333 32 5.333 46.72 17.28 58.667 32 58.667c14.72 0 26.667-11.947 26.667-26.667C58.667 17.28 46.72 5.333 32 5.333zM48.96 44.88c-3.813-4.64-13.067-6.213-16.96-6.213-3.893 0-13.147 1.573-16.96 6.213-2.72-3.573-4.373-8.027-4.373-12.88 0-11.76 9.573-21.333 21.333-21.333 11.76 0 21.333 9.573 21.333 21.333 0 4.853-1.653 9.307-4.373 12.88zM32 16a9.31 9.31 0 00-9.333 9.333A9.31 9.31 0 0032 34.667a9.31 9.31 0 009.333-9.334A9.31 9.31 0 0032 16z" fill="#1A73E8"></path>
      </g>
+      <g id="family" fill="none" fill-rule="evenodd">
+        <path fill="#4285F4" d="M31.833 2.667c-.966 0-1.933.366-2.7 1.066l-21.5 19.8c-.8.734-1.233 1.7-1.266 2.7l13.566 2.134L31.833 24l3.334-9.533-3.334-11.8z"></path>
+        <path fill="#BDC1C6" d="M36.533 42.9L22.467 61.333H29.8c1.233 0 2.4-.566 3.167-1.566L45.833 42.9h-9.3zM6.4 48.033c-1.233 0-2.4.567-3.167 1.567l-.566.767 3.966.9L8.967 54.3l4.8-6.267H6.4z"></path>
+        <path fill="#34A853" d="M31.833 24L6.367 26.233c-.067.934.2 1.867.8 2.667l7.466 9.767 2.034 2.666 8.566 2.567 6.6-3.9 3.334-8-3.334-8z"></path>
+        <path fill="#FBBC04" d="M16.667 41.333L28.7 57.1a3.976 3.976 0 003.167 1.567l3.333-9.6L31.867 40l-15.2 1.333z"></path>
+        <path fill="#DADCE0" d="M29.8 61.333c-1.233 0-2.4-.566-3.167-1.566l-7.8-10.2A3.978 3.978 0 0015.667 48H6.4c1.233 0 2.4.567 3.167 1.567l7.8 10.2a3.978 3.978 0 003.166 1.566H29.8z"></path>
+        <path fill="#669DF6" d="M57.333 26.233a4.555 4.555 0 00-.3-1.333c-.2-.5-.533-.967-.966-1.367L34.567 3.7a4.12 4.12 0 00-2.734-1.033V24l12.734 4.467 12.766-2.234z"></path>
+        <path fill="#5BB974" d="M57.333 26.233L31.833 24v16l7.367 3.9 7.833-2.567 2.034-2.666 7.433-9.734c.633-.8.867-1.766.833-2.7z"></path>
+        <path fill="#FCC934" d="M31.833 58.667A4.023 4.023 0 0035 57.1l12.033-15.767L31.833 40v18.667z"></path>
+      </g>
    </defs>
  </svg>
 </iron-iconset-svg>
@@ -180,18 +204,22 @@
 <iron-iconset-svg name="oobe-96" size="96">
  <svg>
    <defs>
-      <g id="self" fill="none" fill-rule="evenodd">
+      <g id="avatar" fill="none" fill-rule="evenodd">
+        <path fill="#fff" d="M0 0h96v96H0z"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M48 26.4c-6.984 0-12.6 5.616-12.6 12.6S41.016 51.6 48 51.6 60.6 45.984 60.6 39 54.984 26.4 48 26.4zM42.6 39c0 2.988 2.412 5.4 5.4 5.4 2.988 0 5.4-2.412 5.4-5.4 0-2.988-2.412-5.4-5.4-5.4a5.393 5.393 0 00-5.4 5.4z"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M48 9.6C26.803 9.6 9.6 26.803 9.6 48S26.803 86.4 48 86.4 86.4 69.197 86.4 48 69.197 9.6 48 9.6zM30.252 70.608C31.8 67.368 41.232 64.2 48 64.2c6.768 0 16.236 3.168 17.748 6.408A28.414 28.414 0 0148 76.8a28.414 28.414 0 01-17.748-6.192zM48 57c5.256 0 17.748 2.124 22.896 8.388C74.568 60.564 76.8 54.552 76.8 48c0-15.876-12.924-28.8-28.8-28.8-15.876 0-28.8 12.924-28.8 28.8 0 6.552 2.232 12.564 5.904 17.388C30.252 59.124 42.744 57 48 57z"></path>
+      </g>
+      <g id="child-user" fill="none" fill-rule="evenodd">
        <path fill="#fff" d="M0 0h96v96H0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M48 26.4c-6.984 0-12.6 5.616-12.6 12.6S41.016 51.6 48 51.6 60.6 45.984 60.6 39 54.984 26.4 48 26.4zM42.6 39c0 2.988 2.412 5.4 5.4 5.4 2.988 0 5.4-2.412 5.4-5.4 0-2.988-2.412-5.4-5.4-5.4a5.393 5.393 0 00-5.4 5.4z" clip-rule="evenodd"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M48 7.556c6.6 0 12 5.4 12 12s-5.4 12-12 12-12-5.4-12-12 5.4-12 12-12zm-26 42.44c0-8.2 13.68-14.44 26-14.44s26 6.24 26 14.44v23.08c0 4.64-4.36 8.68-10.4 11.28v-8.92c0-3.76-4.84-6.84-10.4-8.08-1.72-.4-3.48-.6-5.2-.6-6.68 0-14.04 3.08-15.36 7.32 4.6 1.92 10.08 3.08 15.36 3.08 1.32 0 2.68-.12 4-.28v10.4c-1.32.16-2.68.28-4 .28-5.36 0-10.96-1.2-15.6-3.2-6.04-2.64-10.4-6.64-10.4-11.28v-23.08zm34 1.56a8 8 0 11-16 0 8 8 0 0116 0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M48 9.6C26.803 9.6 9.6 26.803 9.6 48S26.803 86.4 48 86.4 86.4 69.197 86.4 48 69.197 9.6 48 9.6zM30.252 70.608C31.8 67.368 41.232 64.2 48 64.2c6.768 0 16.236 3.168 17.748 6.408A28.414 28.414 0 0148 76.8a28.414 28.414 0 01-17.748-6.192zM48 57c5.256 0 17.748 2.124 22.896 8.388C74.568 60.564 76.8 54.552 76.8 48c0-15.876-12.924-28.8-28.8-28.8-15.876 0-28.8 12.924-28.8 28.8 0 6.552 2.232 12.564 5.904 17.388C30.252 59.124 42.744 57 48 57z" clip-rule="evenodd"></path>
      </g>
      <g id="person-add" fill="none" fill-rule="evenodd">
        <path fill="#fff" d="M0 0h96v96H0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M36 48c8.84 0 16-7.16 16-16s-7.16-16-16-16-16 7.16-16 16 7.16 16 16 16zm0-24c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8zM4 68c0-10.64 21.32-16 32-16s32 5.36 32 16v12H4V68zm8 4v-3.96C12.8 65.16 25.2 60 36 60s23.2 5.16 24 8v4H12zm60-28v12h8V44h12v-8H80V24h-8v12H60v8h12z" clip-rule="evenodd"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M36 48c8.84 0 16-7.16 16-16s-7.16-16-16-16-16 7.16-16 16 7.16 16 16 16zm0-24c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8zM4 68c0-10.64 21.32-16 32-16s32 5.36 32 16v12H4V68zm8 4v-3.96C12.8 65.16 25.2 60 36 60s23.2 5.16 24 8v4H12zm60-28v12h8V44h12v-8H80V24h-8v12H60v8h12z"></path>
      </g>
-      <g id="child-account" fill="none" fill-rule="evenodd">
+      <g id="supervised-user" fill="none" fill-rule="evenodd">
        <path fill="#fff" d="M0 0h96v96H0z"></path>
-        <path fill="#1A73E8" fill-rule="evenodd" d="M48 8C25.92 8 8 25.92 8 48s17.92 40 40 40 40-17.92 40-40S70.08 8 48 8zM37.44 24c-7.76 0-14 6.24-14 14s6.24 14 14 14 14-6.24 14-14-6.24-14-14-14zm0 20c-3.32 0-6-2.68-6-6s2.68-6 6-6 6 2.68 6 6-2.68 6-6 6zM74 50c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10 10 4.477 10 10zM64 62.48c3.04 0 7.4.72 11.32 2.08C78.28 59.72 80 54.08 80 48c0-17.64-14.36-32-32-32S16 30.36 16 48c0 5.08 1.2 9.88 3.32 14.16 6.36-2.96 14.12-4.12 18.12-4.12 1.96 0 4.88.28 8.08.92-3.28 1.76-6.16 4.04-7.84 7.08h-.24c-4.32 0-9.6 1.16-13.64 2.84 5.04 5.84 12.16 9.84 20.2 10.84v-7.24c0-1.96 1.2-3.64 3-5.04.68-.52 1.44-.96 2.24-1.4.02 0 .03-.01.04-.02.01-.01.02-.02.04-.02.8-.4 1.68-.8 2.6-1.16 1.84-.72 3.84-1.24 5.76-1.64 2.32-.48 4.56-.72 6.32-.72z" clip-rule="evenodd"></path>
+        <path fill="#1A73E8" fill-rule="evenodd" d="M48 8C25.92 8 8 25.92 8 48s17.92 40 40 40 40-17.92 40-40S70.08 8 48 8zM37.44 24c-7.76 0-14 6.24-14 14s6.24 14 14 14 14-6.24 14-14-6.24-14-14-14zm0 20c-3.32 0-6-2.68-6-6s2.68-6 6-6 6 2.68 6 6-2.68 6-6 6zM74 50c0 5.523-4.477 10-10 10s-10-4.477-10-10 4.477-10 10-10 10 4.477 10 10zM64 62.48c3.04 0 7.4.72 11.32 2.08C78.28 59.72 80 54.08 80 48c0-17.64-14.36-32-32-32S16 30.36 16 48c0 5.08 1.2 9.88 3.32 14.16 6.36-2.96 14.12-4.12 18.12-4.12 1.96 0 4.88.28 8.08.92-3.28 1.76-6.16 4.04-7.84 7.08h-.24c-4.32 0-9.6 1.16-13.64 2.84 5.04 5.84 12.16 9.84 20.2 10.84v-7.24c0-1.96 1.2-3.64 3-5.04.68-.52 1.44-.96 2.24-1.4.02 0 .03-.01.04-.02.01-.01.02-.02.04-.02.8-.4 1.68-.8 2.6-1.16 1.84-.72 3.84-1.24 5.76-1.64 2.32-.48 4.56-.72 6.32-.72z"></path>
      </g>
    </defs>
    </svg>

--- a/chrome/browser/resources/chromeos/login/family_link_notice.html
+++ b/chrome/browser/resources/chromeos/login/family_link_notice.html
@@ -8,20 +8,22 @@ found in the LICENSE file. -->
 <dom-module id="family-link-notice">
  <template>
-    <style include="oobe-dialog-host"></style>
+    <style include="oobe-dialog-host">
+      oobe-dialog {
+        --oobe-dialog-content-padding-top: 0;
+      }
+    </style>
    <oobe-dialog id="familyLinkDialog" role="dialog" has-buttons>
-      <!-- TODO(crbug.com/1101318): replace with correct icon -->
      <hd-iron-icon slot="oobe-icon"
-          icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
+          icon1x="oobe-32:family" icon2x="oobe-64:family">
      </hd-iron-icon>
      <h1 slot="title">[[getDialogTitle_(locale, email_, domain_)]]</h1>
      <div slot="subtitle">
        [[getDialogSubtitle_(locale, isNewGaiaAccount_, email_, domain_)]]
      </div>
      <div slot="footer" class="flex layout vertical center center-justified">
-        <!-- TODO(crbug.com/1101318): replace with correct image -->
+        <img srcset="images/1x/parental_control.svg 1x,
-        <img srcset="images/illustration_complete_1x.png 1x,
+            images/2x/parental_control.svg 2x" class="oobe-illustration"
-            images/illustration_complete_2x.png 2x" class="oobe-illustration"
            alt$="[[i18nDynamic(locale, 'familyLinkDialogTitle')]]">
      </div>
      <div slot="bottom-buttons" class="layout horizontal end-justified">

--- a/chrome/browser/resources/chromeos/login/images/1x/parental_control.svg
+++ b/chrome/browser/resources/chromeos/login/images/1x/parental_control.svg
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 600 296">
+  <path fill="#fff" d="M0 0h600v296H0z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M295.996 112.607v36.366M291.993 188.508c-6.339.334-23.021 3.336-32.029 11.344-7.84 7.006-9.675 10.008-15.68 21.352"/>
+  <path fill="#8AB4F8" d="M328.692 240.388c-2.335.667-5.338 1.167-7.506 2.001-3.504 1.335-6.173 2.002-8.008 4.004 3.837.667 4.838 3.336 7.507 6.339 1.502 1.668 1.168 2.169 1.501 4.337.334 2.169.501 3.837-1 5.505 2.001 1.001 3.836 6.506 3.836 8.841 0 2.336-1.501 4.504-3.503 5.505.834 1.502 1.668 3.003 2.669 4.504.167.334.334.668.668.834.166.167.5 0 .667 0 20.518-1.334 36.199-4.504 54.215-14.346.5-.333 1.168-.667 1.168-1.334 0-.501-.167-.834-.501-1.168-7.173-9.675-15.18-18.516-23.855-26.69-2.669-2.503-3.669-3.17-7.173-2.002-3.002 1.001-4.337 1.001-7.506 1.501-6.339.667-7.173.334-13.179 2.169zM358.886 108.77c-.167.167-.334.501-.501.667-.166.167-.5.167-.667.167-3.67.334-7.173 0-10.843.668-.5.166-1.001.333-1.334.667-.668.667-.167 1.835.166 2.669.501 1.334.834 2.669 1.502 3.837 2.335 5.338 8.007 8.507 13.512 10.175 7.34 2.336 15.347 2.669 22.52 0s13.178-8.841 14.68-16.348a78.02 78.02 0 00-15.181-2.502 39.074 39.074 0 01-3.336-9.675c.167 1.001-11.51 1.334-12.511 1.334-.667 0-2.169-.5-2.669-.166-.667.333-1.335 2.001-1.668 2.669-1.335 2.001-2.502 4.003-3.67 5.838z"/>
+  <path fill="#D2E3FC" d="M296.497 179.667c-1.335 3.169-2.836 6.506-4.17 9.675 5.338 3.336 12.01 4.671 18.182 3.17 1.335-.334 2.669-.834 3.837-1.502.501-.333.834-.5 1.168-1.001.834-1.167 0-2.835-.667-4.003-1.168-2.169-1.835-4.504-2.169-6.84-2.669.834-5.505 1.669-8.174 1.835-2.669.334-5.672.167-8.007-1.334z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M268.639 72.738l-4.838-15.514-18.016-2.002s-6.005 14.513-6.005 15.014"/>
+  <path fill="#fff" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M256.128 60.56c10.042 0 18.183-8.14 18.183-18.182 0-10.042-8.141-18.183-18.183-18.183s-18.183 8.14-18.183 18.183c0 10.042 8.141 18.183 18.183 18.183z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M258.797 47.716c1.001 1.668 2.836 2.836 4.837 2.836 2.002 0 4.004-1.001 4.671-2.836"/>
+  <path fill="#4285F4" d="M269.139 31.034c-2.335-4.003-6.839-6.172-11.343-6.339-4.504-.167-8.508-.667-12.345 1.835-2.335 1.502-4.837 5.505-6.506 7.84-.834 1.168-1.501 2.503-2.001 4.004-.501 2.169.166 1.835 2.001 1.668 6.673-.5 13.346-2.002 19.685-4.337 3.67-1.334 7.173-2.836 10.509-4.67z"/>
+  <path fill="#4285F4" d="M251.79 27.531c-1.835.334-3.836 3.503-6.172 4.004.334 0-2.836-3.503-.834-5.005 2.002-1.501 4.504-2.335 6.673-3.17 2.669-1 5.505-2.001 8.174-3.169 2.669-1 5.338-2.335 8.007-3.336 1.168-.5 2.335-.834 3.336-1.001 1.335-.334 2.836-.5 4.337-.167 1.335.334 2.669 1.335 3.17 2.836.5 1.835-.501 3.67-1.668 5.005 1.835-.5 3.67-.5 5.505-.334 1 .167 2.168.5 2.835 1.335.668.834.668 2.001.501 3.169-.667 4.337-4.504 7.34-8.174 10.009-.167.167-2.002 1-2.335 1-.501 0-1.835-4.003-2.836-5.17-4.338-5.005-6.006-8.008-20.519-6.006z"/>
+  <path fill="#8AB4F8" d="M344.873 111.606s1.502 18.183 25.356 18.183c23.855 0 26.691-18.016 26.691-18.016"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M344.873 111.606s1.502 18.183 25.356 18.183c23.855 0 26.691-18.016 26.691-18.016"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.82" d="M359.887 109.104s-53.882-5.672-65.225 61.388"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M359.887 109.104l5.171-11.677"/>
+  <path fill="#8AB4F8" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="3.053" d="M371.23 101.097c8.752 0 15.848-7.095 15.848-15.848 0-8.752-7.096-15.847-15.848-15.847s-15.847 7.095-15.847 15.847c0 8.753 7.095 15.848 15.847 15.848z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M372.565 89.086c-1.001 1.835-3.003 3.17-5.171 3.17-2.169 0-4.171-1.168-5.005-3.17"/>
+  <path fill="#4285F4" d="M385.409 78.743h-29.192l4.003-3.836 7.841-5.505 6.005.167 6.839 4.504 4.504 4.67zM371.731 62.896c2.335 2.335 3.002 7.173 5.838 8.508 3.003 1.334 7.006-1.502 10.176-1.502 3.169 0 7.006 3.003 10.009 1.835 3.003-1.167 3.67-6.005 6.172-8.174 2.335-2.335 7.173-3.002 8.508-5.838 1.334-3.003-1.502-7.007-1.502-10.176 0-3.17 3.003-7.006 1.835-10.009-1.167-3.003-6.005-3.67-8.174-6.172-2.335-2.335-3.002-7.173-5.838-8.508-3.003-1.334-7.007 1.502-10.176 1.502-3.17 0-7.006-3.003-10.009-1.835-3.003 1.167-3.67 6.005-6.172 8.174-2.336 2.335-7.173 3.002-8.508 5.838-1.334 3.003 1.502 7.006 1.502 10.176s-3.003 7.006-1.835 10.009c1.001 3.003 5.838 3.67 8.174 6.172z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M269.306 268.913c15.681 2.669 31.862 5.505 44.54 15.014 1.334 1 2.502 2.168 2.669 3.669.166 2.002-1.669 3.67-3.67 4.171-2.002.333-4.004-.167-5.839-.667-17.182-5.005-34.531-7.841-52.213-11.511-28.692-6.172-58.219-18.516-80.572-37.867-32.195-27.691-34.531-78.737-18.35-115.603 14.513-33.196 44.707-58.886 82.407-56.717 3.503 5.171 9.842 8.841 16.181 9.175 6.339.166 12.345-2.336 16.348-7.173 10.176.667 29.86 6.505 38.368 12.177 8.341 5.338 18.016 17.683 21.853 31.361"/>
+  <path fill="#D2E3FC" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M304.504 183.003c8.937 0 16.181-7.244 16.181-16.181 0-8.937-7.244-16.181-16.181-16.181-8.937 0-16.181 7.244-16.181 16.181 0 8.937 7.244 16.181 16.181 16.181z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M294.495 167.99a5.267 5.267 0 003.67 2.168c1.501.167 3.003-.5 4.003-1.668"/>
+  <path fill="#4285F4" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M304.17 161.15l16.015 3.337c-.334-3.337-2.169-6.84-4.504-9.175-2.336-2.336-5.505-3.837-8.842-4.337-1.835-.167-7.173 0-8.507 1.334-1.168 1.168 2.002 3.17 2.836 4.504 1.167 1.335 3.002 2.669 3.002 4.337z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M291.993 188.675l3.169-6.84"/>
+  <path fill="#255FDB" d="M303.67 151.975c-2.335-3.67-4.17-6.839-7.674-9.842-4.17-3.67-10.342-5.505-13.678-2.001l-.167.166c-1.668 1.835-2.002 4.838-.834 7.841.667 1.501 1.501 2.836 2.335 4.17l4.671 7.674 23.02 4.17-7.673-12.178z"/>
+  <path fill="#D2E3FC" d="M291.993 188.675c.834 1.668 2.335 2.169 4.17 3.003 3.503 1.501 7.507 2.001 11.177 1.835 3.503-.334 7.673-2.002 10.175-4.338"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M291.993 188.675c.834 1.668 2.335 2.169 4.17 3.003 3.503 1.501 7.507 2.001 11.177 1.835 3.503-.334 7.673-2.002 10.175-4.338M313.679 181.001l2.502 7.173M217.76 113.274c-7.674 28.192-12.344 46.542-19.517 73.733 5.671 3.503 17.015 12.678 28.525 20.852 8.341 6.005 20.852 16.014 31.361 23.854-4.003 13.345-10.676 32.029-14.846 45.374M313.846 283.927c2.168 1.501 7.84 2.001 9.008-.334.834-1.835.5-4.004-.501-5.672-1.001-1.668-2.502-3.002-4.17-4.17-13.512-10.51-28.526-14.847-45.541-17.516M276.145 245.225c7.841 1.668 15.848 3.503 23.521 6.173 7.674 2.669 15.014 6.505 21.019 12.01 1.835 1.668 3.503 3.503 4.17 5.839.501 2.335-.5 5.338-2.835 6.005"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M321.186 262.407c1.334-1.668 1.668-3.836 1.167-5.838-.5-2.002-1.668-3.837-3.002-5.338-5.172-5.672-12.845-7.841-20.018-9.842-10.343-2.836-20.852-5.672-31.528-7.674-2.836-.5-5.839-1.001-8.675-1.501M322.854 283.593c38.868-3.67 70.563-17.182 93.917-43.706 11.844-13.512 19.517-30.36 22.853-48.043 6.339-33.196-1.167-65.058-36.365-78.903-5.672-2.169-20.352-3.67-20.352-3.67l-3.336-9.175"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M351.379 231.713c1.835 3.837 7.173 8.174 10.009 11.177 6.506 6.673 14.18 15.847 19.351 23.521M351.379 231.713c3.003-3.336 46.542-31.361 45.541-76.401"/>
+  <path fill="#fff" d="M362.389 222.538c-6.672-14.012-11.844-22.186-22.52-27.357-5.672-2.669-14.012-5.505-22.687-6.506"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M362.389 222.538c-6.672-14.012-11.844-22.186-22.52-27.357-5.672-2.669-14.012-5.505-22.687-6.506M352.547 235.216c-7.006 2.669-13.846 2.669-21.352 4.671-8.508 2.169-11.844 3.337-18.017 6.506M321.185 253.566c7.507-3.837 14.18-5.672 22.687-6.339M321.185 262.407c7.007-3.503 17.182-6.172 24.356-7.173M326.023 270.915a169.786 169.786 0 0121.853-6.005"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.986" d="M209.086 145.97c.667 7.674 1.834 16.014 3.336 24.022l-6.339 22.353"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2.956" d="M212.755 169.324h75.735"/>
+  <path stroke="#34A853" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="3.336" d="M102.824 40.71c6.005-6.006 15.847-5.839 21.686.333l25.189 25.69c6.005 6.005 5.839 15.847-.334 21.686-6.005 6.005-15.847 5.838-21.686-.334l-25.189-25.69a15.308 15.308 0 01.334-21.685z"/>
+  <path fill="#EA4335" d="M118.004 69.235l-24.522 6.673c-2.669.667-3.503 4.003-1.501 5.838l18.016 18.016c2.002 1.835 5.171 1.001 5.839-1.668l6.505-24.522a3.542 3.542 0 00-4.337-4.337z"/>
+  <path fill="#4285F4" d="M499.845 89.92c.334 1.835.333 3.837.167 5.839-1.168 12.177-12.178 21.018-24.189 19.851-12.01-1.168-21.018-12.178-19.851-24.189 1.168-12.01 12.178-21.018 24.189-19.85 10.175 1 18.016 8.674 19.684 18.35z"/>
+  <path fill="#FFBA00" d="M87.977 131.124c.334.667.5 1.501.668 2.168.667 4.838-2.67 9.175-7.34 9.842-4.838.668-9.175-2.669-9.842-7.34-.668-4.837 2.669-9.174 7.34-9.842 3.836-.667 7.673 1.668 9.174 5.172z"/>
+  <path fill="#EA4335" d="M118.004 69.235l-24.522 6.673c-2.669.667-3.503 4.003-1.501 5.838l18.016 18.016c2.002 1.835 5.171 1.001 5.839-1.668l6.505-24.522a3.542 3.542 0 00-4.337-4.337z"/>
+  <path stroke="#34A853" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="3.336" d="M102.824 40.71c6.005-6.006 15.847-5.839 21.686.333l25.189 25.69c6.005 6.005 5.839 15.847-.334 21.686-6.005 6.005-15.847 5.838-21.686-.334l-25.189-25.69a15.308 15.308 0 01.334-21.685z"/>
+  <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="3.336" d="M491.004 135.294c3.169 1.501 6.672 2.335 10.008 3.336 4.671 1.502 8.508 4.671 10.677 9.008 1.167 2.336 2.335 4.838 3.836 7.173 5.339 7.841 16.348 9.676 23.355 3.17 6.339-5.672 6.839-16.348.5-22.187-2.836-2.669-6.673-4.337-9.842-6.839-3.336-2.669-5.672-6.172-6.673-10.343-.834-3.503-1.167-7.173-2.502-10.676-1.168-3.336-3.169-6.339-5.838-8.841-8.008-7.173-20.185-7.507-28.526-.834-10.009 8.007-11.01 22.687-2.502 32.028 2.335 2.336 4.837 3.837 7.507 5.005z"/>
+  <path stroke="#FBBC05" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="3.336" d="M491.004 135.294c3.169 1.501 6.672 2.335 10.008 3.336 4.671 1.502 8.508 4.671 10.677 9.008 1.167 2.336 2.335 4.838 3.836 7.173 5.339 7.841 16.348 9.676 23.355 3.17 6.339-5.672 6.839-16.348.5-22.187-2.836-2.669-6.673-4.337-9.842-6.839-3.336-2.669-5.672-6.172-6.673-10.343-.834-3.503-1.167-7.173-2.502-10.676-1.168-3.336-3.169-6.339-5.838-8.841-8.008-7.173-20.185-7.507-28.526-.834-10.009 8.007-11.01 22.687-2.502 32.028 2.335 2.336 4.837 3.837 7.507 5.005z"/>
+  <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="3.336" d="M167.048 50.718l-11.343-11.343c-1.335-1.334-1.335-3.67 0-5.004l11.343-11.344c1.335-1.334 3.67-1.334 5.005 0l11.343 11.344c1.335 1.334 1.335 3.67 0 5.004l-11.343 11.343c-1.335 1.335-3.67 1.335-5.005 0z"/>
+</svg>
--- a/chrome/browser/resources/chromeos/login/images/2x/parental_control.svg
+++ b/chrome/browser/resources/chromeos/login/images/2x/parental_control.svg
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1200 592">
+  <path fill="#fff" d="M0 0h1200v592H0z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M591.993 225.214v72.732M583.986 377.016c-12.678.667-46.042 6.673-64.058 22.687-15.68 14.013-19.35 20.018-31.361 42.705"/>
+  <path fill="#8AB4F8" d="M657.385 480.775c-4.671 1.335-10.677 2.336-15.014 4.004-7.006 2.669-12.344 4.004-16.014 8.007 7.673 1.335 9.675 6.673 15.013 12.678 3.003 3.336 2.336 4.337 3.003 8.675.667 4.337 1.001 7.673-2.002 11.009 4.004 2.002 7.674 13.012 7.674 17.683 0 4.671-3.003 9.008-7.007 11.01 1.669 3.002 3.337 6.005 5.339 9.008.333.667.667 1.334 1.334 1.668.334.333 1.001 0 1.335 0 41.036-2.669 72.398-9.008 108.43-28.692 1.001-.668 2.335-1.335 2.335-2.67 0-1-.334-1.668-1.001-2.335-14.346-19.351-30.36-37.033-47.709-53.381-5.338-5.004-7.34-6.339-14.346-4.003-6.006 2.001-8.675 2.001-15.014 3.002-12.678 1.335-14.346.667-26.356 4.337zM717.772 217.54c-.334.334-.668 1.001-1.001 1.335-.334.334-1.001.334-1.335.334-7.34.667-14.346 0-21.686 1.334-1.001.334-2.002.667-2.669 1.335-1.334 1.334-.333 3.67.334 5.338 1.001 2.669 1.668 5.338 3.002 7.673 4.671 10.676 16.015 17.015 27.025 20.352 14.679 4.671 30.694 5.338 45.04 0s26.357-17.683 29.359-32.696c-10.009-2.669-20.018-4.337-30.36-5.005-3.003-6.005-5.338-12.678-6.673-19.35.334 2.002-23.02 2.669-25.022 2.669-1.335 0-4.337-1.001-5.338-.334-1.335.668-2.669 4.004-3.337 5.338-2.669 4.004-5.004 8.008-7.339 11.677z"/>
+  <path fill="#D2E3FC" d="M592.994 359.334c-2.669 6.339-5.672 13.011-8.341 19.35 10.676 6.673 24.021 9.342 36.366 6.339 2.669-.667 5.338-1.668 7.673-3.002 1.001-.668 1.668-1.001 2.336-2.002 1.668-2.336 0-5.672-1.335-8.007-2.335-4.338-3.67-9.008-4.337-13.679-5.338 1.668-11.01 3.336-16.348 3.67-5.338.667-11.343.333-16.014-2.669z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M537.277 145.476l-9.675-31.027-36.032-4.004s-12.011 29.026-12.011 30.027"/>
+  <path fill="#fff" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M512.255 121.121c20.085 0 36.366-16.281 36.366-36.366 0-20.084-16.281-36.365-36.366-36.365-20.084 0-36.365 16.281-36.365 36.365 0 20.085 16.281 36.366 36.365 36.366z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M517.593 95.432c2.002 3.336 5.672 5.671 9.676 5.671 4.003 0 8.007-2.001 9.341-5.671"/>
+  <path fill="#4285F4" d="M538.278 62.069c-4.671-8.008-13.679-12.345-22.687-12.678-9.008-.334-17.015-1.335-24.689 3.67-4.67 3.002-9.675 11.01-13.011 15.68-1.668 2.335-3.003 5.005-4.004 8.007-1.001 4.337.334 3.67 4.004 3.337 13.345-1.001 26.69-4.004 39.368-8.675 7.34-2.669 14.346-5.672 21.019-9.341z"/>
+  <path fill="#4285F4" d="M503.581 55.062c-3.67.668-7.674 7.007-12.345 8.007.668 0-5.671-7.006-1.668-10.009 4.004-3.002 9.008-4.67 13.345-6.339 5.339-2.001 11.01-4.003 16.348-6.338 5.338-2.002 10.677-4.671 16.015-6.673 2.335-1.001 4.67-1.668 6.672-2.002 2.669-.667 5.672-1 8.675-.333 2.669.667 5.338 2.669 6.339 5.671 1.001 3.67-1.001 7.34-3.337 10.01 3.67-1.002 7.34-1.002 11.01-.668 2.002.334 4.337 1 5.672 2.669 1.334 1.668 1.334 4.003 1.001 6.339-1.335 8.674-9.008 14.68-16.348 20.018-.334.333-4.004 2.001-4.671 2.001-1.001 0-3.67-8.007-5.672-10.342-8.674-10.009-12.01-16.014-41.036-12.01z"/>
+  <path fill="#8AB4F8" d="M689.747 223.212s3.002 36.366 50.712 36.366c47.709 0 53.381-36.032 53.381-36.032"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M689.747 223.212s3.002 36.366 50.712 36.366c47.709 0 53.381-36.032 53.381-36.032"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.639" d="M719.774 218.208s-107.763-11.344-130.45 122.776"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M719.774 218.208l10.342-23.354"/>
+  <path fill="#8AB4F8" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="6.106" d="M742.46 202.193c17.505 0 31.695-14.19 31.695-31.694 0-17.505-14.19-31.695-31.695-31.695-17.504 0-31.695 14.19-31.695 31.695 0 17.504 14.191 31.694 31.695 31.694z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M745.13 178.172c-2.002 3.67-6.006 6.339-10.343 6.339s-8.341-2.335-10.009-6.339"/>
+  <path fill="#4285F4" d="M770.819 157.487h-58.386l8.008-7.674 15.68-11.009 12.011.333 13.679 9.008 9.008 9.342zM743.461 125.792c4.671 4.671 6.006 14.346 11.677 17.015 6.006 2.669 14.013-3.002 20.352-3.002s14.012 6.005 20.018 3.669c6.005-2.335 7.34-12.01 12.344-16.347 4.671-4.671 14.346-6.006 17.015-11.678 2.669-6.005-3.003-14.012-3.003-20.351 0-6.339 6.006-14.013 3.67-20.018-2.335-6.005-12.01-7.34-16.347-12.344-4.671-4.671-6.006-14.346-11.678-17.015-6.005-2.67-14.012 3.002-20.351 3.002-6.339 0-14.013-6.005-20.018-3.67-6.005 2.336-7.34 12.011-12.344 16.348-4.671 4.671-14.346 6.006-17.015 11.677-2.669 6.006 3.002 14.013 3.002 20.352s-6.005 14.012-3.67 20.018c2.002 6.005 11.677 7.34 16.348 12.344z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M538.612 537.826c31.361 5.338 63.723 11.01 89.079 30.027 2.669 2.002 5.005 4.337 5.338 7.34.334 4.003-3.336 7.34-7.34 8.341-4.003.667-8.007-.334-11.677-1.335-34.364-10.009-69.061-15.68-104.426-23.02-57.385-12.345-116.437-37.033-161.144-75.735-64.391-55.382-69.062-157.473-36.699-231.206 29.026-66.392 89.413-117.772 164.813-113.434 7.007 10.342 19.685 17.682 32.363 18.349 12.678.334 24.688-4.67 32.695-14.346 20.352 1.335 59.72 13.012 76.736 24.355 16.681 10.676 36.032 35.365 43.705 62.723"/>
+  <path fill="#D2E3FC" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M609.008 366.006c17.873 0 32.362-14.489 32.362-32.362s-14.489-32.362-32.362-32.362-32.362 14.489-32.362 32.362 14.489 32.362 32.362 32.362z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M588.99 335.98c1.668 2.335 4.337 4.003 7.34 4.337 3.003.333 6.005-1.001 8.007-3.337"/>
+  <path fill="#4285F4" stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M608.341 322.301l32.028 6.672c-.667-6.672-4.337-13.679-9.008-18.349-4.671-4.671-11.01-7.674-17.682-8.675-3.67-.333-14.346 0-17.015 2.669-2.336 2.336 4.003 6.339 5.671 9.008 2.336 2.669 6.006 5.338 6.006 8.675z"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M583.985 377.35l6.339-13.679"/>
+  <path fill="#255FDB" d="M607.34 303.951c-4.671-7.34-8.341-13.679-15.347-19.684-8.341-7.34-20.685-11.01-27.358-4.004l-.333.334c-3.337 3.67-4.004 9.675-1.669 15.68 1.335 3.003 3.003 5.672 4.671 8.341l9.342 15.347 46.041 8.341-15.347-24.355z"/>
+  <path fill="#D2E3FC" d="M583.985 377.35c1.669 3.336 4.671 4.337 8.341 6.005 7.006 3.003 15.014 4.004 22.354 3.67 7.006-.667 15.347-4.003 20.351-8.674"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M583.985 377.35c1.669 3.336 4.671 4.337 8.341 6.005 7.006 3.003 15.014 4.004 22.354 3.67 7.006-.667 15.347-4.003 20.351-8.674M627.358 362.003l5.004 14.346M435.52 226.549c-15.347 56.383-24.689 93.083-39.035 147.464 11.344 7.007 34.03 25.356 57.051 41.704 16.682 12.011 41.704 32.029 62.723 47.709-8.008 26.691-21.353 64.058-29.694 90.748M627.691 567.853c4.337 3.003 15.681 4.004 18.016-.667 1.669-3.67 1.001-8.007-1.001-11.344-2.001-3.336-5.004-6.005-8.34-8.34-27.024-21.019-57.051-29.694-91.082-35.032M552.291 490.451c15.68 3.336 31.694 7.006 47.041 12.344 15.347 5.338 30.027 13.012 42.038 24.021 3.67 3.337 7.006 7.007 8.341 11.678 1.001 4.67-1.001 10.676-5.672 12.01"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M642.371 524.815c2.669-3.337 3.337-7.674 2.336-11.677-1.001-4.004-3.337-7.674-6.006-10.677-10.342-11.343-25.689-15.68-40.035-19.684-20.686-5.672-41.704-11.343-63.057-15.347-5.671-1.001-11.677-2.002-17.349-3.003M645.707 567.186c77.736-7.34 141.126-34.364 187.834-87.412 23.688-27.024 39.035-60.72 45.708-96.085 12.678-66.393-2.335-130.116-72.732-157.808-11.343-4.337-40.703-7.34-40.703-7.34l-6.672-18.349"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M702.759 463.427c3.669 7.673 14.346 16.348 20.017 22.353 13.012 13.345 28.359 31.695 38.702 47.042M702.759 463.427c6.005-6.673 93.083-62.723 91.081-152.803"/>
+  <path fill="#fff" d="M724.778 445.077c-13.345-28.025-23.688-44.373-45.04-54.716-11.343-5.338-28.025-11.009-45.374-13.011"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M724.778 445.077c-13.345-28.025-23.688-44.373-45.04-54.716-11.343-5.338-28.025-11.009-45.374-13.011M705.094 470.433c-14.013 5.338-27.692 5.338-42.705 9.341-17.015 4.338-23.688 6.673-36.032 13.012M642.371 507.132c15.013-7.673 28.359-11.343 45.374-12.678M642.371 524.815c14.012-7.007 34.364-12.345 48.71-14.346M652.046 541.83c14.347-5.005 29.026-9.008 43.706-12.011"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.973" d="M418.171 291.94c1.335 15.347 3.67 32.029 6.673 48.043l-12.678 44.707"/>
+  <path stroke="#4285F4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5.911" d="M425.511 338.649h151.468"/>
+  <path stroke="#34A853" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="6.673" d="M205.648 81.42c12.011-12.012 31.695-11.678 43.372.666l50.378 51.38c12.011 12.01 11.677 31.694-.667 43.372-12.011 12.01-31.695 11.677-43.372-.668l-50.378-51.379c-11.677-12.011-11.677-31.361.667-43.372z"/>
+  <path fill="#EA4335" d="M236.008 138.47l-49.043 13.345c-5.338 1.335-7.007 8.007-3.003 11.677l36.032 36.032c4.004 3.67 10.343 2.002 11.677-3.336l13.012-49.044c1.334-5.338-3.337-10.009-8.675-8.674z"/>
+  <path fill="#4285F4" d="M999.69 179.84c.67 3.67.67 7.674.33 11.677-2.332 24.355-24.352 42.038-48.373 39.702-24.022-2.335-42.038-24.355-39.702-48.376 2.335-24.022 24.355-42.038 48.376-39.702 20.352 2.002 36.032 17.349 39.369 36.699z"/>
+  <path fill="#FFBA00" d="M175.955 262.247c.667 1.335 1.001 3.003 1.334 4.337 1.335 9.676-5.338 18.35-14.679 19.685-9.676 1.334-18.35-5.339-19.685-14.68-1.334-9.676 5.339-18.35 14.68-19.684 7.674-1.335 15.347 3.336 18.35 10.342z"/>
+  <path fill="#EA4335" d="M236.008 138.47l-49.043 13.345c-5.338 1.335-7.007 8.007-3.003 11.677l36.032 36.032c4.004 3.67 10.343 2.002 11.677-3.336l13.012-49.044c1.334-5.338-3.337-10.009-8.675-8.674z"/>
+  <path stroke="#34A853" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="6.673" d="M205.648 81.42c12.011-12.012 31.695-11.678 43.372.666l50.378 51.38c12.011 12.01 11.677 31.694-.667 43.372-12.011 12.01-31.695 11.677-43.372-.668l-50.378-51.379c-11.677-12.011-11.677-31.361.667-43.372z"/>
+  <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="6.673" d="M982.007 270.588c6.339 3.003 13.345 4.671 20.013 6.672 9.35 3.003 17.02 9.342 21.36 18.017 2.33 4.67 4.67 9.675 7.67 14.346 10.68 15.68 32.7 19.35 46.71 6.339 12.68-11.344 13.68-32.696 1-44.373-5.67-5.338-13.35-8.675-19.68-13.679-6.68-5.338-11.35-12.344-13.35-20.685-1.67-7.006-2.33-14.346-5-21.353-2.34-6.672-6.34-12.678-11.68-17.682-16.02-14.346-40.37-15.013-57.052-1.668-20.018 16.014-22.019 45.374-5.004 64.057 4.671 4.671 9.675 7.673 15.013 10.009z"/>
+  <path stroke="#FBBC05" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="6.673" d="M982.007 270.588c6.339 3.003 13.345 4.671 20.013 6.672 9.35 3.003 17.02 9.342 21.36 18.017 2.33 4.67 4.67 9.675 7.67 14.346 10.68 15.68 32.7 19.35 46.71 6.339 12.68-11.344 13.68-32.696 1-44.373-5.67-5.338-13.35-8.675-19.68-13.679-6.68-5.338-11.35-12.344-13.35-20.685-1.67-7.006-2.33-14.346-5-21.353-2.34-6.672-6.34-12.678-11.68-17.682-16.02-14.346-40.37-15.013-57.052-1.668-20.018 16.014-22.019 45.374-5.004 64.057 4.671 4.671 9.675 7.673 15.013 10.009z"/>
+  <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="6.673" d="M334.096 101.437L311.409 78.75c-2.669-2.669-2.669-7.34 0-10.009l22.687-22.687c2.669-2.669 7.34-2.669 10.009 0l22.687 22.687c2.669 2.67 2.669 7.34 0 10.01l-22.687 22.686c-2.669 2.669-7.34 2.669-10.009 0z"/>
+</svg>
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
@@ -1360,7 +1360,8 @@ Polymer({
    if (this.screenMode_ == AuthMode.AD_AUTH)
      chrome.send('cancelAdAuthentication');
-    if (this.isClosable_())
+    // Only close oobe dialog when it is the first screen in add user flow.
+    if (this.isClosable_() && !this.childSpecificSigninFeatureEnabled_)
      Oobe.showUserPods();
    else
      Oobe.resetSigninUI(true);

--- a/chrome/browser/resources/chromeos/login/user_creation.html
+++ b/chrome/browser/resources/chromeos/login/user_creation.html
@@ -11,10 +11,12 @@ found in the LICENSE file. -->
    <style include="oobe-dialog-host">
      cr-card-radio-button {
        border-radius: 16px;
+        height: 210px;
        --cr-button-edge-spacing: 0;
        --cr-card-radio-button-height: 100%;
        --cr-card-radio-button-padding: 0;
        --cr-card-radio-button-margin: 0;
+        --cr-radio-button-ink-size: 0;
        --cr-radio-group-item-padding: 8px;
      }
@@ -43,8 +45,8 @@ found in the LICENSE file. -->
        padding-top: 16px;
      }
-      .footer-container {
+      oobe-dialog {
-        padding-bottom: 20px;
+        --oobe-dialog-content-padding-top: 0;
      }
      .next-button {
@@ -57,14 +59,13 @@ found in the LICENSE file. -->
      <hd-iron-icon icon1x="oobe-32:googleg" icon2x="oobe-64:googleg"
        slot="oobe-icon">
      </hd-iron-icon>
-      <div slot="footer" class="footer-container flex layout vertical
+      <div slot="footer" class="flex layout vertical center-justified">
-          center-justified">
        <cr-radio-group id="userType" class="layout horizontal"
            selected="{{selectedUserType}}">
          <cr-card-radio-button id="selfButton" class="flex" name="self">
            <div class="card-container layout vertical center">
-              <hd-iron-icon class="card-icon" icon1x="oobe-48:self"
+              <hd-iron-icon class="card-icon" icon1x="oobe-48:avatar"
-                  icon2x="oobe-96:self">
+                  icon2x="oobe-96:avatar">
              </hd-iron-icon>
              <div class="card-label">
                [[i18nDynamic(locale, 'createForSelfLabel')]]
@@ -76,8 +77,8 @@ found in the LICENSE file. -->
          </cr-card-radio-button>
          <cr-card-radio-button id="childButton" class="flex" name="child">
            <div class="card-container layout vertical center">
-              <hd-iron-icon class="card-icon" icon1x="oobe-32:avatar"
+              <hd-iron-icon class="card-icon" icon1x="oobe-48:child-user"
-                icon2x="oobe-64:avatar">
+                icon2x="oobe-96:child-user">
              </hd-iron-icon>
              <div class="card-label">
                [[i18nDynamic(locale, 'createForChildLabel')]]
@@ -102,7 +103,7 @@ found in the LICENSE file. -->
    <oobe-dialog id="childSignInDialog" role="dialog" has-buttons
        title-key="childSignInTitle" subtitle-key="childSignInSubtitle"
        for-step="child">
-      <hd-iron-icon icon1x="oobe-32:googleg" icon2x="oobe-64:googleg"
+      <hd-iron-icon icon1x="oobe-32:family" icon2x="oobe-64:family"
        slot="oobe-icon">
      </hd-iron-icon>
      <div slot="footer" class="footer-container flex layout vertical
@@ -123,8 +124,8 @@ found in the LICENSE file. -->
          <cr-card-radio-button id="childSignInButton" name="signin"
              class="flex">
            <div class="card-container layout vertical center">
-              <hd-iron-icon class="card-icon" icon1x="oobe-48:child-account"
+              <hd-iron-icon class="card-icon" icon1x="oobe-48:supervised-user"
-                  icon2x="oobe-96:child-account">
+                  icon2x="oobe-96:supervised-user">
              </hd-iron-icon>
              <div class="card-label">
                [[i18nDynamic(locale, 'signInForChildLabel')]]

--- a/chrome/browser/resources/chromeos/login/user_creation.js
+++ b/chrome/browser/resources/chromeos/login/user_creation.js
@@ -101,6 +101,12 @@ Polymer({
    this.isBackButtonVisible_ = isVisible;
  },
+  cancel() {
+    if (this.isBackButtonVisible_) {
+      this.onBackClicked_();
+    }
+  },
  onBackClicked_() {
    if (this.uiStep === UIState.CHILD) {
      chrome.send('updateOobeUIState', [OOBE_UI_STATE.USER_CREATION]);

--- a/ui/login/oobe.css
+++ b/ui/login/oobe.css
@@ -49,6 +49,7 @@ html {
  --oobe-dialog-footer-height: 96px;
  --oobe-dialog-footer-padding: 32px;
  --oobe-dialog-content-padding: 64px;
+  --oobe-dialog-content-padding-top: 20px;
  /* This size fits 675px screen with docked magnifier and shelf. Basically this
   * is calc(675px * (1 - 1 / 3) - 10px - var(--shelf-area-height-base)) where

--- a/ui/webui/resources/cr_elements/cr_radio_button/cr_card_radio_button.html
+++ b/ui/webui/resources/cr_elements/cr_radio_button/cr_card_radio_button.html
@@ -27,6 +27,7 @@
      }
      #button {
+        height: var(--cr-card-radio-button-height, auto);
        padding: var(--cr-card-radio-button-padding, 24px);
        position: relative;
        width: 100%;