diff --git a/src/Vault/wwwroot/_references.js b/src/Vault/wwwroot/_references.js
index b8efe7cb73..4e73814123 100644
--- a/src/Vault/wwwroot/_references.js
+++ b/src/Vault/wwwroot/_references.js
@@ -24,6 +24,7 @@
 /// <reference path="app/services/authService.js" />
 /// <reference path="app/services/cipherService.js" />
 /// <reference path="app/services/cryptoService.js" />
+/// <reference path="app/services/importservice.js" />
 /// <reference path="app/services/passwordservice.js" />
 /// <reference path="app/services/servicesModule.js" />
 /// <reference path="app/services/tokenService.js" />
diff --git a/src/Vault/wwwroot/app/services/importService.js b/src/Vault/wwwroot/app/services/importService.js
new file mode 100644
index 0000000000..22bedbce76
--- /dev/null
+++ b/src/Vault/wwwroot/app/services/importService.js
@@ -0,0 +1,134 @@
+angular
+    .module('bit.services')
+
+    .factory('importService', function () {
+        var _service = {};
+
+        _service.import = function (source, file, success, error) {
+            switch (source) {
+                case 'local':
+                    importLocal(file, success, error);
+                    break;
+                case 'lastpass':
+                    importLastPass(file, success, error);
+                    break;
+                default:
+                    error();
+                    break;
+            }
+        };
+
+        function importLocal(file, success, error) {
+            Papa.parse(file, {
+                header: true,
+                complete: function (results) {
+                    var folders = [],
+                        sites = [],
+                        siteRelationships = [];
+
+                    angular.forEach(results.data, function (value, key) {
+                        if (!value.uri || value.uri === '') {
+                            return;
+                        }
+
+                        var folderIndex = folders.length,
+                            siteIndex = sites.length,
+                            hasFolder = value.folder && value.folder !== '',
+                            addFolder = hasFolder;
+
+                        if (hasFolder) {
+                            for (var i = 0; i < folders.length; i++) {
+                                if (folders[i].name == value.folder) {
+                                    addFolder = false;
+                                    folderIndex = i;
+                                    break;
+                                }
+                            }
+                        }
+
+                        sites.push({
+                            uri: value.uri,
+                            username: value.username && value.username !== '' ? value.username : null,
+                            password: value.password,
+                            notes: value.notes && value.notes !== '' ? value.notes : null,
+                            name: value.name
+                        });
+
+                        if (addFolder) {
+                            folders.push({
+                                name: value.folder
+                            });
+                        }
+
+                        if (hasFolder) {
+                            var relationship = {
+                                key: siteIndex,
+                                value: folderIndex
+                            };
+                            siteRelationships.push(relationship);
+                        }
+                    });
+
+                    success(folders, sites, siteRelationships);
+                }
+            });
+        }
+
+        function importLastPass(file, success, error) {
+            Papa.parse(file, {
+                header: true,
+                complete: function (results) {
+                    var folders = [],
+                        sites = [],
+                        siteRelationships = [];
+
+                    angular.forEach(results.data, function (value, key) {
+                        if (!value.url || value.url === '') {
+                            return;
+                        }
+
+                        var folderIndex = folders.length,
+                            siteIndex = sites.length,
+                            hasFolder = value.grouping && value.grouping !== '' && value.grouping != '(none)',
+                            addFolder = hasFolder;
+
+                        if (hasFolder) {
+                            for (var i = 0; i < folders.length; i++) {
+                                if (folders[i].name == value.grouping) {
+                                    addFolder = false;
+                                    folderIndex = i;
+                                    break;
+                                }
+                            }
+                        }
+
+                        sites.push({
+                            uri: value.url,
+                            username: value.username && value.username !== '' ? value.username : null,
+                            password: value.password,
+                            notes: value.extra && value.extra !== '' ? value.extra : null,
+                            name: value.name
+                        });
+
+                        if (addFolder) {
+                            folders.push({
+                                name: value.grouping
+                            });
+                        }
+
+                        if (hasFolder) {
+                            var relationship = {
+                                key: siteIndex,
+                                value: folderIndex
+                            };
+                            siteRelationships.push(relationship);
+                        }
+                    });
+
+                    success(folders, sites, siteRelationships);
+                }
+            });
+        }
+
+        return _service;
+    });
diff --git a/src/Vault/wwwroot/app/services/validationService.js b/src/Vault/wwwroot/app/services/validationService.js
index d328948fb2..a724f5ebec 100644
--- a/src/Vault/wwwroot/app/services/validationService.js
+++ b/src/Vault/wwwroot/app/services/validationService.js
@@ -58,6 +58,5 @@
             }
         };
 
-
         return _service;
     });
diff --git a/src/Vault/wwwroot/app/settings/views/settingsDelete.html b/src/Vault/wwwroot/app/settings/views/settingsDelete.html
index 7b3212623d..b79cc80e30 100644
--- a/src/Vault/wwwroot/app/settings/views/settingsDelete.html
+++ b/src/Vault/wwwroot/app/settings/views/settingsDelete.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <h4 class="modal-title" id="deleteAccountModelLabel"><i class="fa fa-ban"></i> Delete Account</h4>
+    <h4 class="modal-title" id="deleteAccountModelLabel"><i class="fa fa-trash"></i> Delete Account</h4>
 </div>
 <form name="deleteAccountForm" ng-submit="deleteAccountForm.$valid && submit(model)" api-form="submitPromise">
     <div class="modal-body">
diff --git a/src/Vault/wwwroot/app/tools/toolsImportController.js b/src/Vault/wwwroot/app/tools/toolsImportController.js
index 981f109a8e..5dfe34d7f3 100644
--- a/src/Vault/wwwroot/app/tools/toolsImportController.js
+++ b/src/Vault/wwwroot/app/tools/toolsImportController.js
@@ -1,83 +1,16 @@
 angular
     .module('bit.tools')
 
-    .controller('toolsImportController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, cipherService, toastr) {
+    .controller('toolsImportController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, cipherService, toastr, importService) {
         $scope.model = { source: 'local' };
 
         $scope.import = function (model) {
             $scope.processing = true;
             var file = document.getElementById('file').files[0];
-
-            // local
-            if (model.source == 'local') {
-                Papa.parse(file, {
-                    header: true,
-                    complete: function (results) {
-                        console.log(results);
-                    }
-                });
-            } // lastpass
-            else if (model.source == 'lastpass') {
-                Papa.parse(file, {
-                    header: true,
-                    complete: function (results) {
-                        var folders = [],
-                            sites = [],
-                            siteRelationships = [];
-
-                        angular.forEach(results.data, function (value, key) {
-                            if (!value.url || value.url === '') {
-                                return;
-                            }
-
-                            var folderIndex = folders.length,
-                                siteIndex = sites.length,
-                                hasFolder = value.grouping && value.grouping !== '' && value.grouping != '(none)',
-                                addFolder = hasFolder;
-
-                            if (hasFolder) {
-                                for (var i = 0; i < folders.length; i++) {
-                                    if (folders[i].name == value.grouping) {
-                                        addFolder = false;
-                                        folderIndex = i;
-                                        break;
-                                    }
-                                }
-                            }
-
-                            sites.push({
-                                uri: value.url,
-                                username: value.username && value.username !== '' ? value.username : null,
-                                password: value.password,
-                                notes: value.extra && value.extra !== '' ? value.extra : null,
-                                name: value.name
-                            });
-
-                            if (addFolder) {
-                                folders.push({
-                                    name: value.grouping
-                                });
-                            }
-
-                            if (hasFolder) {
-                                var relationship = {
-                                    key: siteIndex,
-                                    value: folderIndex
-                                };
-                                siteRelationships.push(relationship);
-                            }
-                        });
-
-                        doImport(folders, sites, siteRelationships);
-                    }
-                });
-            }
-            else {
-                // source not supported
-            }
+            importService.import(model.source, file, importSuccess, importError);
         };
 
-        function doImport(folders, sites, siteRelationships) {
+        function importSuccess(folders, sites, siteRelationships) {
             apiService.accounts.import({
                 folders: cipherService.encryptFolders(folders, cryptoService.getKey()),
                 sites: cipherService.encryptSites(sites, cryptoService.getKey()),
@@ -87,10 +20,12 @@
                 $state.go('backend.vault').then(function () {
                     toastr.success('Data has been successfully imported into your vault.', 'Import Success');
                 });
-            }, function () {
-                $uibModalInstance.dismiss('cancel');
-                toastr.error('Something went wrong. Try again.', 'Oh No!');
-            });
+            }, importError);
+        }
+
+        function importError() {
+            $uibModalInstance.dismiss('cancel');
+            toastr.error('Something went wrong. Try again.', 'Oh No!');
         }
 
         $scope.close = function () {
diff --git a/src/Vault/wwwroot/index.html b/src/Vault/wwwroot/index.html
index 059e28be5b..d0033f129a 100644
--- a/src/Vault/wwwroot/index.html
+++ b/src/Vault/wwwroot/index.html
@@ -87,6 +87,7 @@
     <script src="app/services/cipherService.js"></script>
     <script src="app/services/validationService.js"></script>
     <script src="app/services/passwordService.js"></script>
+    <script src="app/services/importService.js"></script>
 
     <script src="app/global/globalModule.js"></script>
     <script src="app/global/mainController.js"></script>