diff --git a/src/translation/en.json b/src/translation/en.json
index d1d49304a..f8e37acd9 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -23,7 +23,10 @@
             "sso": "Log in with Cloudron credentials",
             "nosso": "Log in with dedicated account",
             "email": "Log in with email address"
-        }
+        },
+        "addAppAction": "Add App",
+        "addAppproxyAction": "Add Appproxy",
+        "addApplinkAction": "Add Applink"
     },
     "main": {
         "offline": "Cloudron is offline. Reconnecting…",
@@ -1630,7 +1633,20 @@
             },
             "description": "Custom app-specific cron jobs can be added here. Note that cron jobs required for the app to function are already integrated into the app package and don't need to be configured here."
         },
-        "forumUrlAction": "Need help? Ask in the forum"
+        "forumUrlAction": "Need help? Ask in the forum",
+        "addApplinkDialog": {
+            "title": "Add external app link"
+        },
+        "editApplinkDialog": {
+            "title": "Edit external app link",
+            "deleteAction": "Delete"
+        },
+        "applinks": {
+            "upstreamUri": "External URL",
+            "label": "Label",
+            "clearIconAction": "Clear Icon",
+            "clearIconDescription": "This will fetch the app's favicon."
+        }
     },
     "login": {
         "loginTo": "Login to",
diff --git a/src/views/apps.html b/src/views/apps.html
index 6f32af111..d28dd83e8 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -36,17 +36,17 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Add external app link</h4>
+        <h4 class="modal-title">{{ 'app.addApplinkDialog.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="applinksAddForm" role="form" ng-submit="applinksAdd.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (applinksAddForm.upstreamUri.$dirty && applinksAddForm.upstreamUri.$invalid) || (!applinksAddForm.upstreamUri.$dirty && applinksAdd.error.upstreamUri) }">
-            <label class="control-label">UpstreamURI</label>
+            <label class="control-label">{{ 'app.applinks.upstreamUri' | tr }}</label>
             <input type="text" class="form-control" ng-model="applinksAdd.upstreamUri" name="upstreamUri" id="inputUpstreamUri" autofocus autocomplete="off" required>
           </div>
 
           <div class="form-group">
-            <label class="control-label">Label</label>
+            <label class="control-label">{{ 'app.applinks.label' | tr }}</label>
             <input type="text" class="form-control" ng-model="applinksAdd.label" name="label" id="inputLabel" autocomplete="off" placeholder="Leave empty for autodetection">
           </div>
 
@@ -98,17 +98,17 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Edit external app link</h4>
+        <h4 class="modal-title">{{ 'app.editApplinkDialog.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="applinksEditForm" role="form" ng-submit="applinksEdit.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (applinksEditForm.upstreamUri.$dirty && applinksEditForm.upstreamUri.$invalid) || (!applinksEditForm.upstreamUri.$dirty && applinksEdit.error.upstreamUri) }">
-            <label class="control-label">UpstreamURI</label>
+            <label class="control-label">{{ 'app.applinks.upstreamUri' | tr }}</label>
             <input type="text" class="form-control" ng-model="applinksEdit.upstreamUri" name="upstreamUri" id="inputUpstreamUri" autofocus autocomplete="off" required>
           </div>
 
           <div class="form-group">
-            <label class="control-label">Label</label>
+            <label class="control-label">{{ 'app.applinks.label' | tr }}</label>
             <input type="text" class="form-control" ng-model="applinksEdit.label" name="label" id="inputLabel" autocomplete="off">
           </div>
 
@@ -120,7 +120,7 @@
               <img ng-src="{{ applinksEdit.iconUrl() || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)"/>
               <div class="overlay"></div>
             </div>
-            <a href="" style="font-weight: normal;" ng-click="applinksEdit.resetCustomIcon()">Clear Icon.</a> This will fetch the app's favicon.
+            <a href="" style="font-weight: normal;" ng-click="applinksEdit.resetCustomIcon()">{{ 'app.applinks.clearIconAction' | tr }}</a><span class="text-small">{{ 'app.applinks.clearIconDescription' | tr }}</span>
             <input type="file" id="applinksEditIconFileInput" style="display: none" accept="image/png"/>
           </div>
 
@@ -160,7 +160,7 @@
         </form>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-danger pull-left" ng-click="applinksEdit.remove()" ng-disabled="applinksEdit.busyRemove || applinksEdit.busyEdit"><i class="fa fa-circle-notch fa-spin" ng-show="applinksEdit.busyRemove"></i> Delete</button>
+        <button type="button" class="btn btn-danger pull-left" ng-click="applinksEdit.remove()" ng-disabled="applinksEdit.busyRemove || applinksEdit.busyEdit"><i class="fa fa-circle-notch fa-spin" ng-show="applinksEdit.busyRemove"></i> {{ 'app.editApplinkDialog.deleteAction' | tr }}</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
         <button type="button" class="btn btn-success" ng-click="applinksEdit.submit()" ng-disabled="applinksEditForm.$invalid || applinksEdit.busyRemove || applinksEdit.busyEdit"><i class="fa fa-circle-notch fa-spin" ng-show="applinksEdit.busyEdit"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
@@ -197,9 +197,9 @@
         <div class="btn-group">
           <button type="button" class="btn btn-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-plus"></i></button>
           <ul class="dropdown-menu">
-            <li><a href="/#/appstore">Add App</a></li>
-            <li><a href="/#/appstore/io.cloudron.builtin.appproxy?version=0.1.0">Add External Appproxy</a></li>
-            <li><a href="" ng-click="applinksAdd.show()">Add Applink</a></li>
+            <li><a href="/#/appstore"><i class="fa fa-cloud-download-alt fa-fw"></i> {{ 'apps.addAppAction' | tr }}</a></li>
+            <li><a href="/#/appstore/io.cloudron.builtin.appproxy?version=0.1.0"><i class="fas fa-map-signs fa-fw"></i> {{ 'apps.addAppproxyAction' | tr }}</a></li>
+            <li><a href="" ng-click="applinksAdd.show()"><i class="fas fa-link fa-fw"></i> {{ 'apps.addApplinkAction' | tr }}</a></li>
           </ul>
         </div>
         <div class="pull-right">
@@ -218,8 +218,8 @@
       <div class="app-grid">
         <div class="grid-item" ng-class="{ 'stopped': app.runState === 'stopped' }" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'" ng-class="{ 'admin-action': app.manifest.configurePath && (app | applicationLink) }">
           <div class="grid-item-content" uib-tooltip="{{ app.fqdn }}">
-            <a ng-show="app.type !== 'applink' && isOperator(app)" ng-href="#/app/{{ app.id}}/display" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></a>
-            <div ng-show="app.type === 'applink' && isOperator(app)" ng-click="applinksEdit.show(app)" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></div>
+            <a ng-show="app.type !== APP_TYPES.LINK && isOperator(app)" ng-href="#/app/{{ app.id}}/display" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></a>
+            <div ng-show="app.type === APP_TYPES.LINK && isOperator(app)" ng-click="applinksEdit.show(app)" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></div>
             <a ng-href="{{ app | applicationLink }}" ng-click="isOperator(app) && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError)  || (app | installationActive)}">
               <div class="grid-item-top">
                 <div class="row">
diff --git a/src/views/apps.js b/src/views/apps.js
index 6d8f0a64e..f1605fbf1 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -2,6 +2,7 @@
 
 /* global angular:false */
 /* global $:false */
+/* global APP_TYPES */
 
 angular.module('Application').controller('AppsController', ['$scope', '$translate', '$interval', '$location', 'Client', function ($scope, $translate, $interval, $location, Client) {
     var ALL_DOMAINS_DOMAIN = { _alldomains: true, domain: 'All Domains' }; // dummy record for the single select filter
@@ -26,6 +27,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$translat
     $scope.domains = [];
     $scope.appSearch = '';
     $scope.groups = [ GROUP_ACCESS_UNSET ];
+    $scope.APP_TYPES = APP_TYPES;
 
     $scope.allUsers = [];
     $scope.allGroups = [];