diff --git a/src/app/views/apps/modals/app-settings-modal.html b/src/app/views/apps/modals/app-settings-modal.html
index 9e492fce..2609bd4a 100755
--- a/src/app/views/apps/modals/app-settings-modal.html
+++ b/src/app/views/apps/modals/app-settings-modal.html
@@ -38,8 +38,8 @@ <h3><b>{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }}
             {{ 'mno_enterprise.templates.impac.dock.settings.free_trial' | translate }}: {{ app.free_trial_end_at }}
         </div>
         <div ng-show="!app.free_trial_end_at && app.per_user_licence">
-          <ng-pluralize count="app.licences_count" when="{'0': 'No users', '1': '1 user', 'other': '{{app.licences_count | number}} users'}"
-             tooltip-placement="bottom" tooltip="{{'mno_enterprise.templates.impac.dock.settings.number_of_people' | translate:{ app.name} }}"></ng-pluralize>
+          <ng-pluralize count="app.licences_count" when="{'0': '{{ &quot;mno_enterprise.templates.impac.dock.settings.no_users&quot; | translate }}', '1': '{{ &quot;mno_enterprise.templates.impac.dock.settings.1_user&quot; | translate }}', 'other': '{{app.licences_count | number}} {{ &quot;mno_enterprise.templates.impac.dock.settings.users&quot; | translate }}'}"
+             tooltip-placement="bottom" uib-tooltip="{{ 'mno_enterprise.templates.impac.dock.settings.number_of_people_tooltip' | translate:{ appname: app.name} }}"></ng-pluralize>
         </div>
         <div ng-show="!app.app.free_trial_end_at  && !app.per_user_licence">{{ 'mno_enterprise.templates.impac.dock.settings.pricing_details' | translate }}</div>
       </div>
@@ -93,8 +93,8 @@ <h4>{{ 'mno_enterprise.templates.impac.dock.settings.confirm_app_deletion' | tra
           </div>
           <div class="buttons">
             <button class="btn btn-default" ng-click="app.showDelete=false" >{{ 'mno_enterprise.templates.impac.dock.settings.cancel' | translate}}</button>
-            <button class="btn btn-danger" ng-click="deleteApp()" ng-disabled="sentence != sentenceCheck || modal.loading">
-              <span ng-show="modal.loading"><i class="fa fa-spinner fa-pulse"></i>&nbsp;</span>
+            <button class="btn btn-danger" ng-click="deleteApp()" ng-disabled="sentence != sentenceCheck">
+              <span ng-show="modal.loading"><i class="fa fa-spinner fa-spin"></i>&nbsp;</span>
               {{ 'mno_enterprise.templates.impac.dock.settings.delete' | translate }} </button>
           </div>
         </div>
diff --git a/src/locales/en.locale.json b/src/locales/en.locale.json
index 0d05b4af..275b29f2 100644
--- a/src/locales/en.locale.json
+++ b/src/locales/en.locale.json
@@ -429,7 +429,7 @@
   "mno_enterprise.templates.dashboard.marketplace.app_selection.cancel": "Cancel",
   "mno_enterprise.templates.dashboard.marketplace.app_selection.select_orga": "Select an organization",
   "mno_enterprise.templates.dashboard.marketplace.app_selection.no_orga_authorized": "Invalid purchase",
-  "mno_enterprise.templates.dashboard.marketplace.app_selection.unauthorized_to_add_app": "Unfortunately you do not have permission to purchase products for this organization. Please select another organization.",
+  "mno_enterprise.templates.dashboard.marketplace.app_selection.unauthorized_to_add_app": "Unfortunately you do not have permission to purchase products for this organization.",
   "mno_enterprise.templates.dashboard.organization.arrears.title": "Sorry we couldn't process this payment",
   "mno_enterprise.templates.dashboard.organization.arrears.explanation": "Your account is currently in arrears as we were unable to charge your designated credit card.",
   "mno_enterprise.templates.dashboard.organization.arrears.recommendation": "Please make sure your credit card details are up to date, then click the button below.",
@@ -551,8 +551,11 @@
   "mno_enterprise.templates.impac.dock.settings.disconnect_link": "Disconnect Link",
   "mno_enterprise.templates.impac.dock.settings.delete": "Delete",
   "mno_enterprise.templates.impac.dock.settings.pricing_details": "Pricing details inside your app",
-  "mno_enterprise.templates.impac.dock.settings.number_of_people": "mno_enterprise.templates.impac.dock.settings.free_trial": "Free Trial",
-  "This is the total number of people in your organization using",
+  "mno_enterprise.templates.impac.dock.settings.free_trial": "Free Trial",
+  "mno_enterprise.templates.impac.dock.settings.number_of_people_tooltip": "This is the total number of people in your organization using",
+  "mno_enterprise.templates.impac.dock.settings.1_user": "1 user",
+  "mno_enterprise.templates.impac.dock.settings.no_users": "No users",
+  "mno_enterprise.templates.impac.dock.settings.users": "users",
   "mno_enterprise.templates.impac.dock.settings.confirm_app_deletion": "Confirm app deletion",
   "mno_enterprise.templates.impac.dock.settings.please_note_this_app": "Please note this app is on a monthly plan. Your billing for this app will be calculated pro rata.",
   "mno_enterprise.templates.impac.dock.settings.delete_instructions": "In order to delete your app, please enter the following statement in the box below.",
diff --git a/src/locales/id.locale.json b/src/locales/id.locale.json
index e4d2434f..52888978 100644
--- a/src/locales/id.locale.json
+++ b/src/locales/id.locale.json
@@ -314,6 +314,32 @@
   "mno_enterprise.templates.dashboard.teams.team_list.tbl_email": "Email",
   "mno_enterprise.templates.dashboard.teams.team_list.tbl_role": "Jabatan",
   "mno_enterprise.templates.dashboard.teams.team_list.remove": "Hapus",
+  "mno_enterprise.templates.impac.dock.launch": "Launch",
+  "mno_enterprise.templates.impac.dock.connect": "Connect",
+  "mno_enterprise.templates.impac.dock.settings.settings": "Settings",
+  "mno_enterprise.templates.impac.dock.settings.status": "Status",
+  "mno_enterprise.templates.impac.dock.settings.app_name": "Name",
+  "mno_enterprise.templates.impac.dock.settings.access_add-on_settings": "Access add-on Settings",
+  "mno_enterprise.templates.impac.dock.settings.manual_data_sharing": "Data sharing",
+  "mno_enterprise.templates.impac.dock.settings.manual_data_sync": "Manual Data Sync",
+  "mno_enterprise.templates.impac.dock.settings.disconnect_link": "Disconnect Link",
+  "mno_enterprise.templates.impac.dock.settings.delete": "Delete",
+  "mno_enterprise.templates.impac.dock.settings.pricing_details": "Pricing details inside your app",
+  "mno_enterprise.templates.impac.dock.settings.free_trial": "Free Trial",
+  "mno_enterprise.templates.impac.dock.settings.number_of_people_tooltip": "This is the total number of people in your organization using",
+  "mno_enterprise.templates.impac.dock.settings.1_user": "1 user",
+  "mno_enterprise.templates.impac.dock.settings.no_users": "No users",
+  "mno_enterprise.templates.impac.dock.settings.users": "users",
+  "mno_enterprise.templates.impac.dock.settings.confirm_app_deletion": "Confirm app deletion",
+  "mno_enterprise.templates.impac.dock.settings.please_note_this_app": "Please note this app is on a monthly plan. Your billing for this app will be calculated pro rata.",
+  "mno_enterprise.templates.impac.dock.settings.delete_instructions": "In order to delete your app, please enter the following statement in the box below.",
+  "mno_enterprise.templates.impac.dock.settings.cancel": "Cancel",
+  "mno_enterprise.templates.impac.dock.settings.developer_details": "developer details",
+  "mno_enterprise.templates.impac.dock.settings.linked_to": "Linked to",
+  "mno_enterprise.templates.impac.dock.settings.organization_id": "Organization id",
+  "mno_enterprise.templates.impac.dock.settings.group_id": "Group id (uid)",
+  "mno_enterprise.templates.impac.dock.add_more_apps": "Add more apps",
+  "mno_enterprise.templates.impac.dock.cancel": "Cancel",
   "mno_enterprise.templates.impac.index.dashboard": "Dasbor",
   "mno_enterprise.templates.impac.index.new_dashboard": "Dasbor Baru",
   "mno_enterprise.templates.impac.index.source": "Sumber",
diff --git a/src/locales/zh.locale.json b/src/locales/zh.locale.json
index e9ec2450..aa50ad70 100644
--- a/src/locales/zh.locale.json
+++ b/src/locales/zh.locale.json
@@ -338,6 +338,32 @@
   "mno_enterprise.templates.modals.new_organization.enter_new_company_name": "为您的新公司输入一个名称",
   "mno_enterprise.templates.modals.new_organization.cancel": "取消",
   "mno_enterprise.templates.modals.new_organization.create": "创建",
+  "mno_enterprise.templates.impac.dock.launch": "Launch",
+  "mno_enterprise.templates.impac.dock.connect": "Connect",
+  "mno_enterprise.templates.impac.dock.settings.settings": "Settings",
+  "mno_enterprise.templates.impac.dock.settings.status": "Status",
+  "mno_enterprise.templates.impac.dock.settings.app_name": "Name",
+  "mno_enterprise.templates.impac.dock.settings.access_add-on_settings": "Access add-on Settings",
+  "mno_enterprise.templates.impac.dock.settings.manual_data_sharing": "Data sharing",
+  "mno_enterprise.templates.impac.dock.settings.manual_data_sync": "Manual Data Sync",
+  "mno_enterprise.templates.impac.dock.settings.disconnect_link": "Disconnect Link",
+  "mno_enterprise.templates.impac.dock.settings.delete": "Delete",
+  "mno_enterprise.templates.impac.dock.settings.pricing_details": "Pricing details inside your app",
+  "mno_enterprise.templates.impac.dock.settings.free_trial": "Free Trial",
+  "mno_enterprise.templates.impac.dock.settings.number_of_people_tooltip": "This is the total number of people in your organization using",
+  "mno_enterprise.templates.impac.dock.settings.1_user": "1 user",
+  "mno_enterprise.templates.impac.dock.settings.no_users": "No users",
+  "mno_enterprise.templates.impac.dock.settings.users": "users",
+  "mno_enterprise.templates.impac.dock.settings.confirm_app_deletion": "Confirm app deletion",
+  "mno_enterprise.templates.impac.dock.settings.please_note_this_app": "Please note this app is on a monthly plan. Your billing for this app will be calculated pro rata.",
+  "mno_enterprise.templates.impac.dock.settings.delete_instructions": "In order to delete your app, please enter the following statement in the box below.",
+  "mno_enterprise.templates.impac.dock.settings.cancel": "Cancel",
+  "mno_enterprise.templates.impac.dock.settings.developer_details": "developer details",
+  "mno_enterprise.templates.impac.dock.settings.linked_to": "Linked to",
+  "mno_enterprise.templates.impac.dock.settings.organization_id": "Organization id",
+  "mno_enterprise.templates.impac.dock.settings.group_id": "Group id (uid)",
+  "mno_enterprise.templates.impac.dock.add_more_apps": "Add more apps",
+  "mno_enterprise.templates.impac.dock.cancel": "Cancel",
   "mno_enterprise.templates.impac.widgets.common.data_not_found.data_not_found": "找不到数据",
   "mno_enterprise.templates.impac.widgets.common.data_not_found.are_you_missing_an_app": "您是否丢失了一个应用程序？",
   "mno_enterprise.templates.impac.widgets.settings.account.title": "应监控的帐户",