diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 87053c0160..5c29bd96f8 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -618,5 +618,9 @@
   "searchFolder": {
     "message": "Search folder",
     "description": "Search folder"
+  },
+  "noneFolder": {
+    "message": "(none)",
+    "description": "(none) - this is the folder for uncategorized sites"
   }
 }
diff --git a/src/_locales/sv/messages.json b/src/_locales/sv/messages.json
index e6b9d08c19..0a9dff35ad 100644
--- a/src/_locales/sv/messages.json
+++ b/src/_locales/sv/messages.json
@@ -192,7 +192,7 @@
     "description": "There are no folders to list."
   },
   "helpFeedback": {
-    "message": "Hjälp & återkoppling",
+    "message": "Hjälp",
     "description": "Help & Feedback"
   },
   "emailUs": {
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index 7e74416a1c..2ee32b753e 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -9,7 +9,7 @@
         <div class="list">
             <div class="list-grouped">
                 <a href="javascript:void(0)" ng-click="fillSite(site)" class="list-grouped-item condensed"
-                   title="Auto-fill {{site.name}}" ng-repeat="site in theSites = (sites | orderBy: ['name', 'username'])">
+                   title="{{i18n.autoFill}} {{site.name}}" ng-repeat="site in theSites = (sites | orderBy: ['name', 'username'])">
                     <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="{{i18n.copyPassword}}"
                           ngclipboard ngclipboard-error="clipboardError(e)"
                           ngclipboard-success="clipboardSuccess(e, i18n.password)"
diff --git a/src/popup/app/vault/vaultViewFolderController.js b/src/popup/app/vault/vaultViewFolderController.js
index 34f683c71c..0846bb6c6d 100644
--- a/src/popup/app/vault/vaultViewFolderController.js
+++ b/src/popup/app/vault/vaultViewFolderController.js
@@ -14,7 +14,7 @@
 
         $scope.folder = {
             id: !state.folderId || state.folderId === '0' ? null : state.folderId,
-            name: '(none)'
+            name: i18nService.noneFolder
         };
         $scope.i18n = i18nService;
         $('#search').focus();
diff --git a/src/services/folderService.js b/src/services/folderService.js
index 757cf82a63..7622188f3d 100644
--- a/src/services/folderService.js
+++ b/src/services/folderService.js
@@ -82,7 +82,7 @@ function initFolderService() {
             var promises = [];
             var decFolders = [{
                 id: null,
-                name: '(none)'
+                name: i18nService.noneFolder
             }];
             self.getAll(function (folders) {
                 for (var i = 0; i < folders.length; i++) {