diff --git a/jslib b/jslib
index 4f79addb8a0..cd1828da231 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 4f79addb8a05fd829c4aebc5999e1cf9ba510410
+Subproject commit cd1828da23129bd8a53d2891313c6b71ac5c22e3
diff --git a/package-lock.json b/package-lock.json
index 4f37c2e2185..82e77b4d475 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -223,12 +223,6 @@
       "integrity": "sha512-O66D2B9OZDP+vTvfDJUJnk/HfOueeerLXNZQtVY+1ICbp6hO0ySkOtt+N+MGa24YS48JzavN6C2BjYBnKTGwiw==",
       "dev": true
     },
-    "@types/papaparse": {
-      "version": "4.1.31",
-      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-4.1.31.tgz",
-      "integrity": "sha512-8+d1hk3GgF+NJ6mMZZ5zKimqIOc+8OTzpLw4RQ8wnS1NkJh/dMH3NEhSud4Ituq2SGXJjOG6wIczCBAKsSsBdQ==",
-      "dev": true
-    },
     "@types/safari-extension": {
       "version": "0.0.27",
       "resolved": "https://registry.npmjs.org/@types/safari-extension/-/safari-extension-0.0.27.tgz",
diff --git a/package.json b/package.json
index 7365c64f478..8513a35b101 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,6 @@
     "@types/lunr": "2.1.5",
     "@types/node": "8.0.19",
     "@types/node-forge": "0.6.10",
-    "@types/papaparse": "4.1.31",
     "@types/safari-extension": "^0.0.27",
     "@types/safari-extension-content": "^0.0.14",
     "@types/tldjs": "1.7.1",
diff --git a/src/popup2/app-routing.animations.ts b/src/popup2/app-routing.animations.ts
index b20d1b1caf5..84f24021dc7 100644
--- a/src/popup2/app-routing.animations.ts
+++ b/src/popup2/app-routing.animations.ts
@@ -109,4 +109,7 @@ export const routerTransition = trigger('routerTransition', [
 
     transition('add-cipher => generator, edit-cipher => generator, tabs => generator', inSlideUp),
     transition('generator => add-cipher, generator => edit-cipher, generator => tabs', outSlideDown),
+
+    transition('tabs => export', inSlideUp),
+    transition('export => tabs', outSlideDown),
 ]);
diff --git a/src/popup2/app-routing.module.ts b/src/popup2/app-routing.module.ts
index f820513915d..ac46ea312d4 100644
--- a/src/popup2/app-routing.module.ts
+++ b/src/popup2/app-routing.module.ts
@@ -16,6 +16,7 @@ import { TwoFactorOptionsComponent } from './accounts/two-factor-options.compone
 import { TwoFactorComponent } from './accounts/two-factor.component';
 import { SettingsComponent } from './settings/settings.component';
 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';
@@ -42,6 +43,7 @@ const routes: Routes = [
     { path: 'edit-cipher', component: AddEditComponent, data: { state: 'edit-cipher' } },
     { path: 'generator', component: PasswordGeneratorComponent, data: { state: 'generator' } },
     { path: 'generator-history', component: PasswordGeneratorHistoryComponent, data: { state: 'generator-history' } },
+    { path: 'export', component: ExportComponent, data: { state: 'export' } },
     {
         path: 'tabs', component: TabsComponent,
         data: { state: 'tabs' },
diff --git a/src/popup2/app.module.ts b/src/popup2/app.module.ts
index 6faee837fe1..bda3710a23c 100644
--- a/src/popup2/app.module.ts
+++ b/src/popup2/app.module.ts
@@ -25,6 +25,7 @@ import { TwoFactorOptionsComponent } from './accounts/two-factor-options.compone
 import { TwoFactorComponent } from './accounts/two-factor.component';
 import { SettingsComponent } from './settings/settings.component';
 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';
@@ -77,6 +78,7 @@ import { IconComponent } from 'jslib/angular/components/icon.component';
         CiphersListComponent,
         CurrentTabComponent,
         EnvironmentComponent,
+        ExportComponent,
         FallbackSrcDirective,
         GroupingsComponent,
         HomeComponent,
diff --git a/src/popup2/tools/export.component.html b/src/popup2/tools/export.component.html
new file mode 100644
index 00000000000..e348acadcd2
--- /dev/null
+++ b/src/popup2/tools/export.component.html
@@ -0,0 +1,39 @@
+<form (ngSubmit)="submit()">
+    <header>
+        <div class="left">
+            <button appBlurClick type="button" (click)="close()">
+                {{'close' | i18n}}
+            </button>
+        </div>
+        <div class="center">
+            <span class="title">{{'exportVault' | i18n}}</span>
+        </div>
+        <div class="right">
+            <button appBlurClick type="submit">{{'submit' | i18n}}</button>
+        </div>
+    </header>
+    <content>
+        <div class="box">
+            <div class="box-content">
+                <div class="box-content-row box-content-row-flex" appBoxRow>
+                    <div class="row-main">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword"
+                               class="monospaced" [(ngModel)]="masterPassword" required appAutofocus>
+                    </div>
+                    <div class="action-buttons">
+                        <a class="row-btn" href="#" appStopClick appBlurClick
+                           title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                            <i class="fa fa-lg"
+                               [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer">
+                <p>{{'exportMasterPassword' | i18n}}</p>
+                <strong>{{'warning' | i18n}}</strong>: {{'exportWarning' | i18n}}
+            </div>
+        </div>
+    </content>
+</form>
diff --git a/src/popup2/tools/export.component.ts b/src/popup2/tools/export.component.ts
new file mode 100644
index 00000000000..759ce0fb3a9
--- /dev/null
+++ b/src/popup2/tools/export.component.ts
@@ -0,0 +1,38 @@
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { Location } from '@angular/common';
+import { Component } from '@angular/core';
+
+import { CipherService } from 'jslib/abstractions/cipher.service';
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { FolderService } from 'jslib/abstractions/folder.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { ExportComponent as BaseExportComponent } from 'jslib/angular/components/export.component';
+
+@Component({
+    selector: 'app-export',
+    templateUrl: 'export.component.html',
+})
+export class ExportComponent extends BaseExportComponent {
+    constructor(analytics: Angulartics2, toasterService: ToasterService,
+        cipherService: CipherService, folderService: FolderService,
+        cryptoService: CryptoService, userService: UserService,
+        i18nService: I18nService, platformUtilsService: PlatformUtilsService,
+        private location: Location) {
+        super(analytics, toasterService, cipherService, folderService, cryptoService, userService, i18nService,
+            platformUtilsService, window);
+    }
+
+    protected saved() {
+        super.saved();
+        this.close();
+    }
+
+    close() {
+        this.location.back();
+    }
+}
diff --git a/src/popup2/tools/tools.component.html b/src/popup2/tools/tools.component.html
index c089b9a8a72..a9dd023e364 100644
--- a/src/popup2/tools/tools.component.html
+++ b/src/popup2/tools/tools.component.html
@@ -8,12 +8,16 @@
     <div class="right"></div>
 </header>
 <content>
-    <div class="box list">
+    <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>