diff --git a/src/translation/en.json b/src/translation/en.json
index be031a6a0..278007163 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -319,7 +319,72 @@
         "filterAllEvents": "All Events"
     },
     "domains": {
-        "title": "Domains & Certs"
+        "title": "Domains & Certs",
+        "addDomain": "Add Domain",
+        "domain": "Domain",
+        "provider": "Provider",
+        "tooltipEdit": "Edit Domain",
+        "tooltipRemove": "Remove Domain",
+        "renewCerts": {
+            "title": "Renew certificates",
+            "description": "Cloudron renews Let's Encrypt certificates automatically. Use this option to trigger a renewal immediately.",
+            "renewAllAction": "Renew All Certs",
+            "showLogsAction": "Show Logs"
+        },
+        "changeDashboardDomain": {
+            "title": "Change Dashboard Domain",
+            "description": "This will move the dashboard and the email server to the <code>my</code>subdomain of the selected domain.",
+            "changeAction": "Change Domain",
+            "cancelAction": "Cancel",
+            "showLogsAction": "Show Logs"
+        },
+        "subscriptionRequired": {
+            "title": "Subscription required",
+            "description": "To add more domains, please setup a paid plan.",
+            "setupAction": "Setup Subscription"
+        },
+        "domainDialog": {
+            "addTitle": "Add Domain",
+            "editTitle": "Configure {{ domain }}",
+            "addDescription": "Adding a domain lets you install apps on subdomains of this domain. Email settings for the domain can be configured in the Email view.",
+            "domain": "Domain",
+            "provider": "DNS Provider",
+            "route53AccessKeyId": "Access Key Id",
+            "route53SecretAccessKey": "Secret Access Key",
+            "gcdnsServiceAccountKey": "Service Account Key",
+            "digitalOceanToken": "DigitalOcean Token",
+            "gandiApiKey": "Gandi API Key",
+            "goDaddyApiKey": "API Key",
+            "goDaddyApiSecret": "API Secret",
+            "cloudflareTokenType": "Token Type",
+            "cloudflareTokenTypeGlobalApiKey": "Global API Key",
+            "cloudflareTokenTypeApiToken": "API Token",
+            "cloudflareEmail": "Cloudflare Email",
+            "linodeToken": "Linode Token",
+            "nameComUsername": "Name.com Username",
+            "nameComApiToken": "API Token",
+            "namecheapUsername": "Namecheap Username",
+            "namecheapApiKey": "API Key",
+            "namecheapInfo": "The server IP needs to be whitelisted for this API Key.",
+            "linodeInfo": "Linode DNS average <a target=\"_blank\" ng-href=\"{{ linodeDocsLink }}\">propagation time</a> is 30 minutes. Installing apps &amp; and getting a Let's Encrypt certificate will take a while.",
+            "manualInfo": "All DNS records have to be setup manually before each app installation.",
+            "wildcardInfo": "Setup <i>A</i> records for <b>*.{{ newDomain || domain.domain }}</b> and <b>{{ newDomain || domain.domain }}</b> to this server's IP.",
+            "letsEncryptInfo": "Let's Encrypt requires your server to be reachable on port 80",
+            "advancedAction": "Advanced settings...",
+            "zoneName": "Zone Name (Optional)",
+            "certProvider": "Certificate Provider",
+            "fallbackCert": "Fallback Certificate (optional)",
+            "fallbackCertInfo": "Certificates are automatically obtained and renewed from <a href=\"https://letsencrypt.org/\" target=\"_blank\">Let’s Encrypt</a>. See the current rate limit <a href=\"https://letsencrypt.org/docs/rate-limits/\" target=\"_blank\">here</a>.\nThis wildcard certificate will be used should getting a Let’s Encrypt certificate fail. If not provided, an automatically generated self-signed certificate will be used as fallback.",
+            "fallbackCertCustomCert": "Custom Certificate",
+            "fallbackCertCustomCertInfo": "This <a ng-href=\"{{ customCertLink }}\" target=\"_blank\">wildcard certificate</a> will be used for all apps on this domain. If not provided, a self-signed certificate will be automatically generated.",
+            "fallbackCertKeyPlaceholder": "Key",
+            "fallbackCertCertificatePlaceholder": "Certificate"
+        },
+        "removeDialog": {
+            "title": "Really remove {{ domain }}?",
+            "description": "This will delete the domain <code>{{ domain }}</code>.",
+            "removeAction": "Remove"
+        }
     },
     "notifications": {
         "title": "Notifications",
diff --git a/src/views/domains.html b/src/views/domains.html
index 1027f7b7a..b33902022 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -3,14 +3,14 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Subscription required</h4>
+        <h4 class="modal-title">{{ 'domains.subscriptionRequired.title' | tr }}</h4>
       </div>
       <div class="modal-body">
-        <p>To add more domains, please setup a paid plan.</p>
+        <p ng-bind-html="'domains.subscriptionRequired.description' | tr"></p>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-success" ng-click="openSubscriptionSetup()">Setup Subscription</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-click="openSubscriptionSetup()">{{ 'domains.subscriptionRequired.setupAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -21,190 +21,166 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title" ng-show="domainConfigure.adding">Add Domain</h4>
-        <h4 class="modal-title" ng-hide="domainConfigure.adding">Configure {{ domainConfigure.domain.domain }}</h4>
+        <h4 class="modal-title" ng-show="domainConfigure.adding">{{ 'domains.domainDialog.addTitle' | tr }}</h4>
+        <h4 class="modal-title" ng-hide="domainConfigure.adding">{{ 'domains.domainDialog.editTitle' | tr:domainConfigure.domain }}</h4>
       </div>
       <div class="modal-body">
-        <p ng-show="domainConfigure.adding">Adding a domain lets you install apps on subdomains of this domain. Email settings for the domain can be configured in the Email view.</p>
+        <p ng-show="domainConfigure.adding" ng-bind-html="'domains.domainDialog.addDescription' | tr"></p>
 
         <form name="domainConfigureForm" role="form" novalidate ng-submit="domainConfigure.submit()" autocomplete="off">
-          <fieldset>
-            <p class="has-error text-center" ng-show="domainConfigure.error">{{ domainConfigure.error }}</p>
+          <p class="has-error text-center" ng-show="domainConfigure.error">{{ domainConfigure.error }}</p>
 
-            <div class="form-group" ng-show="domainConfigure.adding">
-              <label class="control-label">Domain name</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.newDomain" name="newDomain" ng-disabled="domainConfigure.busy" placeholder="example.com" ng-required="domainConfigure.adding" autofocus>
+          <div class="form-group" ng-show="domainConfigure.adding">
+            <label class="control-label">{{ 'domains.domainDialog.domain' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.newDomain" name="newDomain" ng-disabled="domainConfigure.busy" placeholder="example.com" ng-required="domainConfigure.adding" autofocus>
+          </div>
+
+          <div class="form-group">
+            <label class="control-label">{{ 'domains.domainDialog.provider' | tr }} <sup><a ng-href="https://docs.cloudron.io/domains/#dns-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <select class="form-control" ng-model="domainConfigure.provider" ng-options="a.value as a.name for a in dnsProvider" ng-change="domainConfigure.setDefaultTlsProvider()"></select>
+          </div>
+
+          <!-- Route53 -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'route53'">
+            <label class="control-label">{{ 'domains.domainDialog.route53AccessKeyId' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.accessKeyId" name="accessKeyId" ng-disabled="domainConfigure.busy" ng-minlength="16" ng-maxlength="32" ng-required="domainConfigure.provider === 'route53'">
+          </div>
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'route53'">
+            <label class="control-label">{{ 'domains.domainDialog.route53SecretAccessKey' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.secretAccessKey" name="secretAccessKey" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'route53'">
+          </div>
+
+          <!-- Google Cloud DNS -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'gcdns'">
+            <label class="control-label">{{ 'domains.domainDialog.gcdnsServiceAccountKey' | tr }}</label>
+            <div class="input-group">
+              <input type="file" id="gcdnsKeyFileInput" style="display:none"/>
+              <input type="text" class="form-control" placeholder="Service Account Key" ng-model="domainConfigure.gcdnsKey.keyFileName" id="gcdnsKeyInput" name="cert" onclick="getElementById('gcdnsKeyFileInput').click();" style="cursor: pointer;" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'gcdns'">
+              <span class="input-group-addon">
+                <i class="fa fa-upload" onclick="getElementById('gcdnsKeyFileInput').click();"></i>
+              </span>
+            </div>
+          </div>
+
+          <!-- DigitalOcean -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'digitalocean'">
+            <label class="control-label">{{ 'domains.domainDialog.digitalOceanToken' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.digitalOceanToken" name="digitalOceanToken" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'digitalocean'">
+          </div>
+
+          <!-- Gandi -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'gandi'">
+            <label class="control-label">{{ 'domains.domainDialog.gandiApiKey' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.gandiApiKey" name="gandiApiKey" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'gandi'">
+          </div>
+
+          <!-- GoDaddy -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'godaddy'">
+            <label class="control-label">{{ 'domains.domainDialog.goDaddyApiKey' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.godaddyApiKey" name="apiKey" ng-disabled="domainConfigure.busy" ng-minlength="1" ng-required="domainConfigure.provider === 'godaddy'">
+          </div>
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'godaddy'">
+            <label class="control-label">{{ 'domains.domainDialog.goDaddyApiSecret' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.godaddyApiSecret" name="apiSecret" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'godaddy'">
+          </div>
+
+          <!-- Cloudflare -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
+            <label class="control-label">{{ 'domains.domainDialog.cloudflareTokenType' | tr }}</label>
+            <select class="form-control" ng-model="domainConfigure.cloudflareTokenType">
+              <option value="GlobalApiKey">{{ 'domains.domainDialog.cloudflareTokenTypeGlobalApiKey' | tr }}</option>
+              <option value="ApiToken">{{ 'domains.domainDialog.cloudflareTokenTypeApiToken' | tr }}</option>
+            </select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
+            <label class="control-label" ng-show="domainConfigure.cloudflareTokenType === 'GlobalApiKey'">{{ 'domains.domainDialog.cloudflareTokenTypeGlobalApiKey' | tr }}</label>
+            <label class="control-label" ng-show="domainConfigure.cloudflareTokenType === 'ApiToken'">{{ 'domains.domainDialog.cloudflareTokenTypeApiToken' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.cloudflareToken" name="cloudflareToken" ng-required="domainConfigure.provider === 'cloudflare'" ng-disabled="domainConfigure.busy">
+          </div>
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare' && domainConfigure.cloudflareTokenType === 'GlobalApiKey'">
+            <label class="control-label">{{ 'domains.domainDialog.cloudflareEmail' | tr }}</label>
+            <input type="email" class="form-control" ng-model="domainConfigure.cloudflareEmail" name="cloudflareEmail" ng-required="domainConfigure.provider === 'cloudflare' && domainConfigure.cloudflareTokenType === 'GlobalApiKey'" ng-disabled="domainConfigure.busy">
+          </div>
+
+          <!-- Linode -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'linode'">
+            <label class="control-label">{{ 'domains.domainDialog.linodeToken' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.linodeToken" name="linodeToken" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'linode'">
+          </div>
+
+          <!-- Name.com -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecom'">
+            <label class="control-label">{{ 'domains.domainDialog.nameComUsername' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.nameComUsername" name="nameComUsername" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'namecom'">
+          </div>
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecom'">
+            <label class="control-label">{{ 'domains.domainDialog.nameComApiToken' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.nameComToken" name="nameComToken" ng-disabled="domainConfigure.busy" ng-minlength="1" ng-required="domainConfigure.provider === 'namecom'">
+          </div>
+
+          <!-- Namecheap -->
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecheap'">
+            <label class="control-label">{{ 'domains.domainDialog.namecheapUsername' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.namecheapUsername" name="namecheapUsername" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'namecheap'">
+          </div>
+          <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecheap'">
+            <label class="control-label">{{ 'domains.domainDialog.namecheapApiKey' | tr }}</label>
+            <input type="text" class="form-control" ng-model="domainConfigure.namecheapApiKey" name="namecheapApiKey" ng-disabled="domainConfigure.busy" ng-minlength="1" ng-required="domainConfigure.provider === 'namecheap'">
+          </div>
+
+          <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'namecheap'" ng-bind-html="'domains.domainDialog.namecheapInfo' | tr"></p>
+          <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'linode'" ng-bind-html="'domains.domainDialog.linodeInfo' | tr:translationLinks"></p>
+          <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'wildcard'" ng-bind-html="'domains.domainDialog.wildcardInfo' | tr:domainConfigure"></p>
+          <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'manual'" ng-bind-html="'domains.domainDialog.manualInfo' | tr:translationLinks"></p>
+          <p class="small text-info text-bold" ng-show="needsPort80(domainConfigure.provider, domainConfigure.tlsConfig.provider)" ng-bind-html="'domains.domainDialog.letsEncryptInfo' | tr:translationLinks"></p>
+
+          <a href="" ng-click="domainConfigure.advancedVisible = true" ng-hide="domainConfigure.advancedVisible">{{ 'domains.domainDialog.advancedAction' | tr }}</a>
+          <div  uib-collapse="!domainConfigure.advancedVisible">
+            <div class="form-group">
+              <label class="control-label">{{ 'domains.domainDialog.zoneName' | tr }} <sup><a ng-href="https://docs.cloudron.io/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+              <input type="text" class="form-control" ng-model="domainConfigure.zoneName" name="zoneName" ng-disabled="domainConfigure.busy">
             </div>
 
             <div class="form-group">
-              <label class="control-label">DNS Provider  <sup><a ng-href="https://docs.cloudron.io/domains/#dns-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-              <select class="form-control" ng-model="domainConfigure.provider" ng-options="a.value as a.name for a in dnsProvider" ng-change="domainConfigure.setDefaultTlsProvider()"></select>
+              <label class="control-label">{{ 'domains.domainDialog.certProvider' | tr }} <sup><a ng-href="https://docs.cloudron.io/certificates/#certificate-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+              <select class="form-control" ng-model="domainConfigure.tlsConfig.provider" ng-options="a.value as a.name for a in tlsProvider"></select>
             </div>
 
-            <!-- Route53 -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'route53'">
-              <label class="control-label">Access Key Id</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.accessKeyId" name="accessKeyId" ng-disabled="domainConfigure.busy" ng-minlength="16" ng-maxlength="32" ng-required="domainConfigure.provider === 'route53'">
-            </div>
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'route53'">
-              <label class="control-label">Secret Access Key</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.secretAccessKey" name="secretAccessKey" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'route53'">
+            <!-- Fallback certificate -->
+            <div ng-show="domainConfigure.tlsConfig.provider !== 'fallback'">
+              <label class="control-label">{{ 'domains.domainDialog.fallbackCert' | tr }}</label>
+              <p ng-bind-html="'domains.domainDialog.fallbackCertInfo' | tr"></p>
             </div>
 
-            <!-- Google Cloud DNS -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'gcdns'">
-              <label class="control-label">Service Account Key</label>
+            <div ng-show="domainConfigure.tlsConfig.provider === 'fallback'">
+              <label class="control-label">{{ 'domains.domainDialog.fallbackCertCustomCert' | tr }}</label>
+              <p ng-bind-html="'domains.domainDialog.fallbackCertCustomCertInfo' | tr:translationLinks"></p>
+            </div>
+
+            <div class="form-group" ng-class="{ 'has-error': (!fallbackCert.cert.$dirty && fallbackCert.error) }">
               <div class="input-group">
-                <input type="file" id="gcdnsKeyFileInput" style="display:none"/>
-                <input type="text" class="form-control" placeholder="Service Account Key" ng-model="domainConfigure.gcdnsKey.keyFileName" id="gcdnsKeyInput" name="cert" onclick="getElementById('gcdnsKeyFileInput').click();" style="cursor: pointer;" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'gcdns'">
-                <span class="input-group-addon">
-                  <i class="fa fa-upload" onclick="getElementById('gcdnsKeyFileInput').click();"></i>
-                </span>
+                <input type="file" id="fallbackCertFileInput" style="display:none"/>
+                <input type="text" class="form-control" placeholder="{{ 'domains.domainDialog.fallbackCertCertificatePlaceholder' | tr }}" ng-model="domainConfigure.fallbackCert.certificateFileName" name="cert" onclick="getElementById('fallbackCertFileInput').click();" style="cursor: pointer;" ng-disabled="domainConfigure.busy">
+                <span class="input-group-addon"><i class="fa fa-upload" onclick="getElementById('fallbackCertFileInput').click();"></i></span>
+              </div>
+            </div>
+            <div class="form-group" ng-class="{ 'has-error': (!fallbackCert.key.$dirty && fallbackCert.error) }">
+              <div class="input-group">
+                <input type="file" id="fallbackKeyFileInput" style="display:none"/>
+                <input type="text" class="form-control" placeholder="{{ 'domains.domainDialog.fallbackCertKeyPlaceholder' | tr }}" ng-model="domainConfigure.fallbackCert.keyFileName" id="fallbackKeyInput" name="key" onclick="getElementById('fallbackKeyFileInput').click();" style="cursor: pointer;" ng-disabled="domainConfigure.busy">
+                <span class="input-group-addon"><i class="fa fa-upload" onclick="getElementById('fallbackKeyFileInput').click();"></i></span>
               </div>
             </div>
 
-            <!-- DigitalOcean -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'digitalocean'">
-              <label class="control-label">DigitalOcean Token</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.digitalOceanToken" name="digitalOceanToken" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'digitalocean'">
-            </div>
+          </div> <!-- advanced -->
 
-            <!-- Gandi -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'gandi'">
-              <label class="control-label">Gandi API Key</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.gandiApiKey" name="gandiApiKey" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'gandi'">
-            </div>
-
-            <!-- GoDaddy -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'godaddy'">
-              <label class="control-label">API Key</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.godaddyApiKey" name="apiKey" ng-disabled="domainConfigure.busy" ng-minlength="1" ng-required="domainConfigure.provider === 'godaddy'">
-            </div>
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'godaddy'">
-              <label class="control-label">API Secret</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.godaddyApiSecret" name="apiSecret" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'godaddy'">
-            </div>
-
-            <!-- Cloudflare -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
-              <label class="control-label">Token Type</label>
-              <select class="form-control" ng-model="domainConfigure.cloudflareTokenType">
-                <option value="GlobalApiKey">Global API Key</option>
-                <option value="ApiToken">API Token</option>
-              </select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare'">
-              <label class="control-label" ng-show="domainConfigure.cloudflareTokenType === 'GlobalApiKey'">Global API Key</label>
-              <label class="control-label" ng-show="domainConfigure.cloudflareTokenType === 'ApiToken'">Api Token</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.cloudflareToken" name="cloudflareToken" placeholder="API Key/Token" ng-required="domainConfigure.provider === 'cloudflare'" ng-disabled="domainConfigure.busy">
-            </div>
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'cloudflare' && domainConfigure.cloudflareTokenType === 'GlobalApiKey'">
-              <label class="control-label">Cloudflare Email</label>
-              <input type="email" class="form-control" ng-model="domainConfigure.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="domainConfigure.provider === 'cloudflare' && domainConfigure.cloudflareTokenType === 'GlobalApiKey'" ng-disabled="domainConfigure.busy">
-            </div>
-
-            <!-- Linode -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'linode'">
-              <label class="control-label">Linode Token</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.linodeToken" name="linodeToken" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'linode'">
-            </div>
-
-            <!-- Name.com -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecom'">
-              <label class="control-label">Name.com Username</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.nameComUsername" name="nameComUsername" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'namecom'">
-            </div>
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecom'">
-              <label class="control-label">API Token</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.nameComToken" name="nameComToken" ng-disabled="domainConfigure.busy" ng-minlength="1" ng-required="domainConfigure.provider === 'namecom'">
-            </div>
-
-            <!-- Namecheap -->
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecheap'">
-              <label class="control-label">Namecheap Username</label>
-              <input type="text" class="form-control" ng-model="domainConfigure.namecheapUsername" name="namecheapUsername" ng-disabled="domainConfigure.busy" ng-required="domainConfigure.provider === 'namecheap'">
-            </div>
-            <div class="form-group" ng-class="{ 'has-error': false }" ng-show="domainConfigure.provider === 'namecheap'">
-              <label class="control-label">API Key</label>
-              <p class="small text-info">
-                <b>The server IP needs to be whitelisted for this API Key.</b>
-              </p>
-              <input type="text" class="form-control" ng-model="domainConfigure.namecheapApiKey" name="namecheapApiKey" ng-disabled="domainConfigure.busy" ng-minlength="1" ng-required="domainConfigure.provider === 'namecheap'">
-            </div>
-
-            <p class="small text-warning" ng-show="domainConfigure.provider === 'linode'">
-              <b>Linode DNS average <a target="_blank" ng-href="https://docs.cloudron.io/domains/#linode-dns">propagation time</a> is 30 minutes. Installing apps &amp; and getting a Let's Encrypt certificate will take a while.</b>
-            </p>
-
-            <p class="small text-info" ng-show="domainConfigure.provider === 'wildcard'">
-                Setup <i>A</i> records for <b>*.{{ domainConfigure.newDomain || domainConfigure.domain.domain }}</b> and <b>{{ domainConfigure.newDomain || domainConfigure.domain.domain }}</b> to this server's IP.
-            </p>
-
-            <p class="small text-info" ng-show="domainConfigure.provider === 'manual'">
-                <b>All DNS records have to be setup manually before each app installation.</b>
-            </p>
-
-            <p class="small text-info" ng-show="needsPort80(domainConfigure.provider, domainConfigure.tlsConfig.provider)">Let's Encrypt requires your server to be reachable on port 80</p>
-
-            <a href="" ng-click="domainConfigure.advancedVisible = true" ng-hide="domainConfigure.advancedVisible">Advanced settings...</a>
-            <div  uib-collapse="!domainConfigure.advancedVisible">
-              <div class="form-group">
-                <label class="control-label">Zone Name (Optional) <sup><a ng-href="https://docs.cloudron.io/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-                <input type="text" class="form-control" ng-model="domainConfigure.zoneName" name="zoneName" ng-disabled="domainConfigure.busy">
-              </div>
-
-              <div class="form-group">
-                <label class="control-label">Certificate Provider <sup><a ng-href="https://docs.cloudron.io/certificates/#certificate-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-                <select class="form-control" ng-model="domainConfigure.tlsConfig.provider" ng-options="a.value as a.name for a in tlsProvider"></select>
-              </div>
-
-              <!-- Fallback certificate -->
-              <div ng-show="domainConfigure.tlsConfig.provider !== 'fallback'">
-                <label class="control-label">Fallback Certificate (optional)</label>
-                <p>
-                    Certificates are automatically obtained and renewed from <a href="https://letsencrypt.org/" target="_blank">Let’s Encrypt</a>. See the current rate limit <a href="https://letsencrypt.org/docs/rate-limits/" target="_blank">here</a>.
-                    This wildcard certificate will be used should getting a Let’s Encrypt certificate fail. If not provided, an automatically generated self-signed certificate will be used as fallback.
-                </p>
-              </div>
-
-              <div ng-show="domainConfigure.tlsConfig.provider === 'fallback'">
-                <label class="control-label">Custom Certificate</label>
-                <p>
-                  This <a ng-href="https://docs.cloudron.io/certificates/#custom-certificates" target="_blank">wildcard certificate</a> will be used for all apps on this domain. If not provided, a self-signed certificate will be automatically generated.
-                </p>
-              </div>
-
-              <div class="form-group" ng-class="{ 'has-error': (!fallbackCert.cert.$dirty && fallbackCert.error) }">
-                  <div class="input-group">
-                      <input type="file" id="fallbackCertFileInput" style="display:none"/>
-                      <input type="text" class="form-control" placeholder="Certificate" ng-model="domainConfigure.fallbackCert.certificateFileName" name="cert" onclick="getElementById('fallbackCertFileInput').click();" style="cursor: pointer;" ng-disabled="domainConfigure.busy">
-                      <span class="input-group-addon">
-                          <i class="fa fa-upload" onclick="getElementById('fallbackCertFileInput').click();"></i>
-                      </span>
-                  </div>
-              </div>
-              <div class="form-group" ng-class="{ 'has-error': (!fallbackCert.key.$dirty && fallbackCert.error) }">
-                  <div class="input-group">
-                      <input type="file" id="fallbackKeyFileInput" style="display:none"/>
-                      <input type="text" class="form-control" placeholder="Key" ng-model="domainConfigure.fallbackCert.keyFileName" id="fallbackKeyInput" name="key" onclick="getElementById('fallbackKeyFileInput').click();" style="cursor: pointer;" ng-disabled="domainConfigure.busy">
-                      <span class="input-group-addon">
-                          <i class="fa fa-upload" onclick="getElementById('fallbackKeyFileInput').click();"></i>
-                      </span>
-                  </div>
-              </div>
-
-            </div> <!-- advanced -->
-
-            <input class="ng-hide" type="submit" ng-disabled="domainConfigureForm.$invalid || domainConfigure.busy"/>
-          </fieldset>
+          <input class="ng-hide" type="submit" ng-disabled="domainConfigureForm.$invalid || domainConfigure.busy"/>
         </form>
       </div>
       <div class="modal-footer ">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="domainConfigure.submit()" ng-disabled="domainConfigureForm.$invalid || domainConfigure.busy">
-          <i class="fa fa-circle-notch fa-spin" ng-show="domainConfigure.busy"></i> Save
-        </button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="domainConfigure.submit()" ng-disabled="domainConfigureForm.$invalid || domainConfigure.busy"><i class="fa fa-circle-notch fa-spin" ng-show="domainConfigure.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
     </div>
   </div>
@@ -215,18 +191,16 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Really remove {{ domainRemove.domain.domain }} ?</h4>
+        <h4 class="modal-title">{{ 'domains.removeDialog.title' | tr:domainRemove.domain }}</h4>
       </div>
       <div class="modal-body">
-        This will delete the domain <code>{{ domainRemove.domain.domain }}</code>.
-        <div>
-          <br/>
-          <span class="has-error" ng-show="domainRemove.error">{{ domainRemove.error }}</span>
-        </div>
+        <p ng-bind-html="'domains.removeDialog.description' | tr:domainRemove.domain"></p>
+        <br/>
+        <span class="has-error" ng-show="domainRemove.error">{{ domainRemove.error }}</span>
       </div>
       <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-          <button type="button" class="btn btn-danger" ng-click="domainRemove.submit()" ng-disabled="domainRemove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="domainRemove.busy"></i> Remove</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-click="domainRemove.submit()" ng-disabled="domainRemove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="domainRemove.busy"></i> {{ 'domains.removeDialog.removeAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -234,7 +208,7 @@
 
 <div class="content">
   <div class="text-left">
-    <h1>{{ 'domains.title' | tr }} <button class="btn btn-primary btn-outline pull-right" ng-click="domainAdd.show()"><i class="fa fa-plus"></i> Add Domain</button></h1>
+    <h1>{{ 'domains.title' | tr }} <button class="btn btn-primary btn-outline pull-right" ng-click="domainAdd.show()"><i class="fa fa-plus"></i> {{ 'domains.addDomain' | tr }}</button></h1>
   </div>
 
   <div class="card card-large">
@@ -248,9 +222,9 @@
         <table class="table table-hover" style="margin-top: 10px;">
           <thead>
             <tr>
-              <th>Domain</th>
-              <th class="text-left hidden-xs hidden-sm">Provider</th>
-              <th style="width: 100px" class="text-right">Actions</th>
+              <th>{{ 'domains.domain' | tr }}</th>
+              <th class="text-left hidden-xs hidden-sm">{{ 'domains.provider' | tr }}</th>
+              <th style="width: 100px" class="text-right">{{ 'main.actions' | tr }}</th>
             </tr>
           </thead>
           <tbody>
@@ -262,8 +236,8 @@
                 {{ prettyProviderName(domain) }}
               </td>
               <td class="text-right no-wrap" style="vertical-align: bottom">
-                <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas'" title="Edit Domain"><i class="fa fa-pencil-alt"></i></button>
-                <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" ng-show="domain.provider !== 'caas'" title="Remove Domain" ng-disabled="domain.domain === config.adminDomain"><i class="far fa-trash-alt"></i></button>
+                <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas'" title="{{ 'domains.tooltipEdit' | tr }}"><i class="fa fa-pencil-alt"></i></button>
+                <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" ng-show="domain.provider !== 'caas'" title="{{ 'domains.tooltipRemove' | tr }}" ng-disabled="domain.domain === config.adminDomain"><i class="far fa-trash-alt"></i></button>
               </td>
             </tr>
           </tbody>
@@ -273,15 +247,13 @@
   </div>
 
   <div class="text-left">
-      <h3>Renew certificates</h3>
+    <h3>{{ 'domains.renewCerts.title' | tr }}</h3>
   </div>
 
   <div class="card">
     <div class="row">
       <div class="col-md-12">
-        <p>
-          Cloudron renews Let's Encrypt certificates automatically. Use this option to trigger a renewal immediately.
-        </p>
+        <p ng-bind-html="'domains.renewCerts.description' | tr"></p>
       </div>
     </div>
 
@@ -301,22 +273,20 @@
         </p>
       </div>
       <div class="col-md-6 text-right">
-        <button class="btn btn-outline btn-primary" ng-click="renewCerts.renew()" ng-disabled="renewCerts.busy" style="margin-right: 10px">Renew All Certs</button>
-        <a class="btn btn-primary pull-right" ng-href="/logs.html?taskId={{renewCerts.taskId}}" ng-disabled="!renewCerts.taskId" target="_blank">Show Logs</a>
+        <button class="btn btn-outline btn-primary" ng-click="renewCerts.renew()" ng-disabled="renewCerts.busy" style="margin-right: 10px">{{ 'domains.renewCerts.renewAllAction' | tr }}</button>
+        <a class="btn btn-primary pull-right" ng-href="/logs.html?taskId={{renewCerts.taskId}}" ng-disabled="!renewCerts.taskId" target="_blank">{{ 'domains.renewCerts.showLogsAction' | tr }}</a>
       </div>
     </div>
   </div>
 
   <div class="text-left">
-    <h3>Change Dashboard Domain</h3>
+    <h3>{{ 'domains.changeDashboardDomain.title' | tr }}</h3>
   </div>
 
   <div class="card">
     <div class="row">
-        <div class="col-md-8">
-          <p>
-            This will move the dashboard and the email server to the <code>my</code>subdomain of the selected domain.
-          </p>
+      <div class="col-md-8">
+        <p ng-bind-html="'domains.changeDashboardDomain.description' | tr"></p>
       </div>
       <div class="col-md-4">
         <select class="form-control pull-right" style="display: inline-block; width: 200px;" ng-model="changeDashboard.selectedDomain" ng-options="a.domain for a in domains"></select>
@@ -339,9 +309,9 @@
         </p>
       </div>
       <div class="col-md-6 text-right">
-        <button class="btn btn-outline btn-primary" ng-click="changeDashboard.change()" ng-hide="changeDashboard.busy" ng-disabled="changeDashboard.selectedDomain.domain === changeDashboard.adminDomain.domain">Change Domain</button>
-        <button class="btn btn-outline btn-danger" ng-click="changeDashboard.stop()" ng-show="changeDashboard.busy" style="margin-right: 10px">Cancel</button>
-        <a class="btn btn-primary pull-right" ng-href="/logs.html?taskId={{changeDashboard.taskId}}" ng-show="changeDashboard.busy" target="_blank">Show Logs</a>
+        <button class="btn btn-outline btn-primary" ng-click="changeDashboard.change()" ng-hide="changeDashboard.busy" ng-disabled="changeDashboard.selectedDomain.domain === changeDashboard.adminDomain.domain">{{ 'domains.changeDashboardDomain.changeAction' | tr }}</button>
+        <button class="btn btn-outline btn-danger" ng-click="changeDashboard.stop()" ng-show="changeDashboard.busy" style="margin-right: 10px">{{ 'domains.changeDashboardDomain.cancelAction' | tr }}</button>
+        <a class="btn btn-primary pull-right" ng-href="/logs.html?taskId={{changeDashboard.taskId}}" ng-show="changeDashboard.busy" target="_blank">{{ 'domains.changeDashboardDomain.showLogsAction' | tr }}Show Logs</a>
       </div>
     </div>
   </div>
diff --git a/src/views/domains.js b/src/views/domains.js
index 92d9a5913..a0b3f3584 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -11,6 +11,11 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
     $scope.domains = [];
     $scope.ready = false;
 
+    $scope.translationLinks = {
+        linodeDocsLink: 'https://docs.cloudron.io/domains/#linode-dns',
+        customCertLink: 'https://docs.cloudron.io/certificates/#custom-certificates'
+    };
+
     $scope.openSubscriptionSetup = function () {
         Client.openSubscriptionSetup($scope.$parent.subscription);
     };