diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 20a17c560e8..f3816a326c0 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -602,5 +602,17 @@
   "lost2FAApp": {
     "message": "Lost authenticator app?",
     "description": "Lost authenticator app?"
+  },
+  "credits": {
+    "message": "Credits",
+    "description": "Credits (giving thanks to people that helped)"
+  },
+  "thankYou": {
+    "message": "Thank You",
+    "description": "Thank You"
+  },
+  "translations": {
+    "message": "Translations",
+    "description": "Translations"
   }
 }
diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index ab602e4e674..bda90498c05 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -131,6 +131,13 @@
                 data: { authorize: true },
                 params: { animation: null }
             })
+            .state('credits', {
+                url: '/credits',
+                templateUrl: 'app/settings/views/settingsCredits.html',
+                controller: 'settingsCreditsController',
+                data: { authorize: true },
+                params: { animation: null }
+            })
             .state('help', {
                 url: '/help',
                 templateUrl: 'app/settings/views/settingsHelp.html',
diff --git a/src/popup/app/settings/settingsCreditsController.js b/src/popup/app/settings/settingsCreditsController.js
new file mode 100644
index 00000000000..223fdc68b49
--- /dev/null
+++ b/src/popup/app/settings/settingsCreditsController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.settings')
+
+    .controller('settingsCreditsController', function ($scope, i18nService) {
+        $scope.i18n = i18nService;
+    });
diff --git a/src/popup/app/settings/views/settingsAbout.html b/src/popup/app/settings/views/settingsAbout.html
index d7db1d5d10e..c60074af489 100644
--- a/src/popup/app/settings/views/settingsAbout.html
+++ b/src/popup/app/settings/views/settingsAbout.html
@@ -10,4 +10,14 @@
         {{i18n.version}} {{version}}<br />
         &copy; 8bit Solutions LLC 2015-{{year}}
     </div>
+    <div class="list">
+        <div class="list-section">
+            <div class="list-section-items">
+                <a class="list-section-item" ui-sref="credits({animation: 'in-slide-left'})">
+                    {{i18n.credits}}
+                    <i class="fa fa-chevron-right fa-lg"></i>
+                </a>
+            </div>
+        </div>
+    </div>
 </div>
diff --git a/src/popup/app/settings/views/settingsCredits.html b/src/popup/app/settings/views/settingsCredits.html
new file mode 100644
index 00000000000..f5a17710c5c
--- /dev/null
+++ b/src/popup/app/settings/views/settingsCredits.html
@@ -0,0 +1,25 @@
+<div class="header">
+    <div class="left">
+        <a ui-sref="about({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i> {{i18n.about}}</a>
+    </div>
+    <div class="title">{{i18n.thankYou}}</div>
+</div>
+<div class="content">
+    <div class="list">
+        <div class="list-section">
+            <div class="list-section-header">
+                {{i18n.translations}}
+            </div>
+            <div class="list-section-items">
+                <div class="list-section-item">
+                    <b>@sersoftin</b> - Russian<br />
+                    <b>@lbel</b> - Dutch<br />
+                    <b>@KarimGeiger</b> - German<br />
+                    <b>@Primokorn</b> - French<br />
+                    <b>@felixqu</b> - Chinese<br />
+                    <b>@Igetin</b> - Finnish
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/popup/index.html b/src/popup/index.html
index e8234fc05d7..d7fc0456e94 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -69,6 +69,7 @@
     <script src="app/settings/settingsController.js"></script>
     <script src="app/settings/settingsHelpController.js"></script>
     <script src="app/settings/settingsAboutController.js"></script>
+    <script src="app/settings/settingsCreditsController.js"></script>
     <script src="app/settings/settingsSyncController.js"></script>
     <script src="app/settings/settingsFoldersController.js"></script>
     <script src="app/settings/settingsAddFolderController.js"></script>
diff --git a/src/popup/less/pages.less b/src/popup/less/pages.less
index 4b18c2eb35b..efdcb870392 100644
--- a/src/popup/less/pages.less
+++ b/src/popup/less/pages.less
@@ -12,7 +12,7 @@
 }
 
 .about-page {
-    padding-top: 50px;
+    padding: 50px 0 20px;
     text-align: center;
 
     img {