diff --git a/CHANGELOG.md b/CHANGELOG.md
index f27c206c..6fc37ee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Improved the onboarding
+
 ### Fixed
 
 - Fixed the chart on the landing page
diff --git a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts
index 944258b8..e3cacd22 100644
--- a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts
+++ b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts
@@ -1,9 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Inject
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 
 @Component({
@@ -15,18 +10,11 @@ import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 export class ShowAccessTokenDialog {
   public isAgreeButtonDisabled = true;
 
-  public constructor(
-    private changeDetectorRef: ChangeDetectorRef,
-    @Inject(MAT_DIALOG_DATA) public data: any
-  ) {}
+  public constructor(@Inject(MAT_DIALOG_DATA) public data: any) {}
 
   ngOnInit() {}
 
   public enableAgreeButton() {
-    setTimeout(() => {
-      this.isAgreeButtonDisabled = false;
-
-      this.changeDetectorRef.markForCheck();
-    }, 1500);
+    this.isAgreeButtonDisabled = false;
   }
 }
diff --git a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
index 0a35f1ec..c47e2740 100644
--- a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
+++ b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
@@ -32,11 +32,11 @@
   <button i18n mat-flat-button [mat-dialog-close]="undefined">Cancel</button>
   <button
     color="primary"
-    i18n
     mat-flat-button
     [disabled]="isAgreeButtonDisabled"
     [mat-dialog-close]="data"
   >
-    Agree and continue
+    <span i18n>Agree and continue</span>
+    <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>
   </button>
 </div>