diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index e33d654006..a6c14580fb 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -190,6 +190,10 @@
   "passGen": {
     "message": "Password Generator"
   },
+  "generator": {
+    "message": "Generator",
+    "description": "Short for 'Password Generator'."
+  },
   "passGenInfo": {
     "message": "Automatically generate strong, unique passwords for your logins."
   },
diff --git a/src/popup/accounts/environment.component.html b/src/popup/accounts/environment.component.html
index 4f28521fdc..cbd543abe2 100644
--- a/src/popup/accounts/environment.component.html
+++ b/src/popup/accounts/environment.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/accounts/hint.component.html b/src/popup/accounts/hint.component.html
index 4045c022db..af69c6d32d 100644
--- a/src/popup/accounts/hint.component.html
+++ b/src/popup/accounts/hint.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html
index 33bc206fbc..b88b1c65d3 100644
--- a/src/popup/accounts/login.component.html
+++ b/src/popup/accounts/login.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'login' | i18n}}</span>
-                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/accounts/register.component.html b/src/popup/accounts/register.component.html
index a31e2d3030..fcb9d4e1c7 100644
--- a/src/popup/accounts/register.component.html
+++ b/src/popup/accounts/register.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'submit' | i18n}}</span>
-                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/accounts/two-factor.component.html b/src/popup/accounts/two-factor.component.html
index bd2021e1da..adbadc3728 100644
--- a/src/popup/accounts/two-factor.component.html
+++ b/src/popup/accounts/two-factor.component.html
@@ -11,7 +11,7 @@
                     *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo &&
                         selectedProviderType !== providerType.OrganizationDuo">
                 <span [hidden]="form.loading">{{'continue' | i18n}}</span>
-                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
             </button>
         </div>
     </header>
diff --git a/src/popup/app-routing.animations.ts b/src/popup/app-routing.animations.ts
index 877854230a..58b136466f 100644
--- a/src/popup/app-routing.animations.ts
+++ b/src/popup/app-routing.animations.ts
@@ -117,14 +117,14 @@ export const routerTransition = trigger('routerTransition', [
     transition('tabs => add-cipher, ciphers => add-cipher', inSlideUp),
     transition('add-cipher => tabs, add-cipher => ciphers', outSlideDown),
 
-    transition('generator => generator-history', inSlideLeft),
-    transition('generator-history => generator', outSlideRight),
+    transition('generator => generator-history, tabs => generator-history', inSlideLeft),
+    transition('generator-history => generator, generator-history => tabs', outSlideRight),
 
-    transition('add-cipher => generator, edit-cipher => generator, tabs => generator', inSlideUp),
-    transition('generator => add-cipher, generator => edit-cipher, generator => tabs', outSlideDown),
+    transition('add-cipher => generator, edit-cipher => generator', inSlideUp),
+    transition('generator => add-cipher, generator => edit-cipher', outSlideDown),
 
-    transition('tabs => export', inSlideUp),
-    transition('export => tabs', outSlideDown),
+    transition('tabs => export', inSlideLeft),
+    transition('export => tabs', outSlideRight),
 
     transition('tabs => lock', inSlideDown),
     transition('lock => tabs', outSlideUp),
diff --git a/src/popup/app-routing.module.ts b/src/popup/app-routing.module.ts
index e7c624e31e..bd9ffa0ed3 100644
--- a/src/popup/app-routing.module.ts
+++ b/src/popup/app-routing.module.ts
@@ -21,7 +21,6 @@ import { TabsComponent } from './tabs.component';
 import { ExportComponent } from './tools/export.component';
 import { PasswordGeneratorComponent } from './tools/password-generator.component';
 import { PasswordGeneratorHistoryComponent } from './tools/password-generator-history.component';
-import { ToolsComponent } from './tools/tools.component';
 import { AddEditComponent } from './vault/add-edit.component';
 import { CiphersComponent } from './vault/ciphers.component';
 import { CurrentTabComponent } from './vault/current-tab.component';
@@ -151,10 +150,10 @@ const routes: Routes = [
                 data: { state: 'tabs_vault' },
             },
             {
-                path: 'tools',
-                component: ToolsComponent,
+                path: 'generator',
+                component: PasswordGeneratorComponent,
                 canActivate: [AuthGuardService],
-                data: { state: 'tabs_tools' },
+                data: { state: 'tabs_generator' },
             },
             {
                 path: 'settings',
diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts
index bda3710a23..8fc0307e35 100644
--- a/src/popup/app.module.ts
+++ b/src/popup/app.module.ts
@@ -28,7 +28,6 @@ import { TabsComponent } from './tabs.component';
 import { ExportComponent } from './tools/export.component';
 import { PasswordGeneratorComponent } from './tools/password-generator.component';
 import { PasswordGeneratorHistoryComponent } from './tools/password-generator-history.component';
-import { ToolsComponent } from './tools/tools.component';
 import { AddEditComponent } from './vault/add-edit.component';
 import { CiphersComponent } from './vault/ciphers.component';
 import { CurrentTabComponent } from './vault/current-tab.component';
@@ -96,7 +95,6 @@ import { IconComponent } from 'jslib/angular/components/icon.component';
         StopClickDirective,
         StopPropDirective,
         TabsComponent,
-        ToolsComponent,
         TwoFactorOptionsComponent,
         TwoFactorComponent,
         ViewComponent,
diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html
index c3bc610e3c..a45ca42938 100644
--- a/src/popup/settings/settings.component.html
+++ b/src/popup/settings/settings.component.html
@@ -69,7 +69,7 @@
                 <div class="row-main">{{'importItems' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default" routerLink="/export">
                 <div class="row-main">{{'exportVault' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
diff --git a/src/popup/tabs.component.html b/src/popup/tabs.component.html
index 2c56388031..013324c169 100644
--- a/src/popup/tabs.component.html
+++ b/src/popup/tabs.component.html
@@ -13,8 +13,8 @@
                 </a>
             </li>
             <li routerLinkActive="active">
-                <a routerLink="tools" title="{{'tools' | i18n}}">
-                    <i class="fa fa-wrench fa-2x"></i>{{'tools' | i18n}}
+                <a routerLink="generator" title="{{'passGen' | i18n}}">
+                    <i class="fa fa-refresh fa-2x"></i>{{'generator' | i18n}}
                 </a>
             </li>
             <li routerLinkActive="active">
diff --git a/src/popup/tools/export.component.html b/src/popup/tools/export.component.html
index e348acadcd..de5063bf01 100644
--- a/src/popup/tools/export.component.html
+++ b/src/popup/tools/export.component.html
@@ -1,8 +1,9 @@
 <form (ngSubmit)="submit()">
     <header>
         <div class="left">
-            <button appBlurClick type="button" (click)="close()">
-                {{'close' | i18n}}
+            <button type="button" appBlurClick (click)="close()">
+                <span class="header-icon"><i class="fa fa-chevron-left"></i></span>
+                <span>{{'back' | i18n}}</span>
             </button>
         </div>
         <div class="center">
diff --git a/src/popup/tools/password-generator.component.html b/src/popup/tools/password-generator.component.html
index e27a3f8f3c..01cdba3a3a 100644
--- a/src/popup/tools/password-generator.component.html
+++ b/src/popup/tools/password-generator.component.html
@@ -1,6 +1,6 @@
 <header>
     <div class="left">
-        <button type="button" appBlurClick (click)="close()">{{closeText}}</button>
+        <button type="button" appBlurClick (click)="close()" *ngIf="showSelect">{{'cancel' | i18n}}</button>
     </div>
     <div class="center">
         <span class="title">{{'passGen' | i18n}}</span>
diff --git a/src/popup/tools/password-generator.component.ts b/src/popup/tools/password-generator.component.ts
index 79b94025df..771f786f57 100644
--- a/src/popup/tools/password-generator.component.ts
+++ b/src/popup/tools/password-generator.component.ts
@@ -21,8 +21,6 @@ import {
     templateUrl: 'password-generator.component.html',
 })
 export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
-    closeText: string;
-
     private cipherState: CipherView;
 
     constructor(passwordGenerationService: PasswordGenerationService, analytics: Angulartics2,
@@ -36,7 +34,6 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
         await super.ngOnInit();
         this.cipherState = await this.stateService.get<CipherView>('addEditCipher');
         this.showSelect = this.cipherState != null;
-        this.closeText = this.showSelect ? this.i18nService.t('cancel') : this.i18nService.t('close');
     }
 
     select() {
diff --git a/src/popup/tools/tools.component.html b/src/popup/tools/tools.component.html
deleted file mode 100644
index a9dd023e36..0000000000
--- a/src/popup/tools/tools.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<header>
-    <div class="left">
-        <app-pop-out></app-pop-out>
-    </div>
-    <div class="center">
-        <span class="title">{{'tools' | i18n}}</span>
-    </div>
-    <div class="right"></div>
-</header>
-<content>
-    <div class="box">
-        <div class="box-content">
-            <a routerLink="/generator" class="box-content-row box-content-row-flex text-default">
-                <div class="row-main">{{'passGen' | i18n}}</div>
-                <i class="fa fa-chevron-right row-sub-icon"></i>
-            </a>
-            <a routerLink="/export" class="box-content-row box-content-row-flex text-default">
-                <div class="row-main">{{'exportVault' | i18n}}</div>
-                <i class="fa fa-chevron-right row-sub-icon"></i>
-            </a>
-        </div>
-    </div>
-</content>
diff --git a/src/popup/tools/tools.component.ts b/src/popup/tools/tools.component.ts
deleted file mode 100644
index d5ffd9f356..0000000000
--- a/src/popup/tools/tools.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-    selector: 'app-tools',
-    templateUrl: 'tools.component.html',
-})
-export class ToolsComponent { }
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index aac81019e6..0f390d0f24 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -9,7 +9,7 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
                 <span [hidden]="form.loading">{{'save' | i18n}}</span>
-                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+                <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
             </button>
         </div>
     </header>