diff --git a/src/js/client.js b/src/js/client.js
index 73c091198..54dfde278 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1448,7 +1448,7 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
     };
 
     Client.prototype.renewCerts = function (domain, callback) {
-        post('/api/v1/domains/' + domain + '/renew_certs', { }).success(function (data, status) {
+        post('/api/v1/cloudron/renew_certs', { domain: domain || null }).success(function (data, status) {
             if (status !== 202) return callback(new ClientError(status, data));
             callback(null);
         }).error(defaultErrorHandler(callback));
diff --git a/src/views/domains.html b/src/views/domains.html
index ba7000606..4dbbeae46 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -199,19 +199,19 @@
   </div>
 
   <!-- Modal renew certs -->
-<div class="modal fade" id="domainRenewCertsModal" tabindex="-1" role="dialog">
+<div class="modal fade" id="renewCertsModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Renew certs of {{ domainRenewCerts.domain.domain }} ?</h4>
+        <h4 class="modal-title">Renew certs for all domains?</h4>
       </div>
       <div class="modal-body">
-        <p>This will renew certs of apps installed under this domain. Only certs that are expiring in next 30 days will be renewed. It can take ~5 minutes to renew and install the certificates. Check the <a href="/#/activity">activity log</a> for renewal status. </p>
+        <p>This will renew certs of all apps installed. Only certs that are expiring in next 30 days will be renewed. It can take ~5 minutes to renew and install the certificates. Check the <a href="/#/activity">activity log</a> for renewal status. </p>
         <br/>
       </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="domainRenewCerts.submit()" ng-disabled="domainRenewCerts.busy"><i class="fa fa-circle-notch fa-spin" ng-show="domainRenewCerts.busy"></i> Renew Certs</button>
+          <button type="button" class="btn  btn-success" ng-click="renewCerts.submit()" ng-disabled="renewCerts.busy"><i class="fa fa-circle-notch fa-spin" ng-show="renewCerts.busy"></i> Renew Certs</button>
       </div>
     </div>
   </div>
@@ -254,44 +254,46 @@
   </div>
 
   <div class="card card-large">
-    <div class="grid-item-top">
-      <div class="row ng-hide" ng-show="!ready">
-        <div class="col-lg-12 text-center">
-          <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
-        </div>
+    <div class="row ng-hide" ng-show="!ready">
+      <div class="col-lg-12 text-center">
+        <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
       </div>
-      <div class="row animateMeOpacity ng-hide" ng-show="ready">
-        <div class="col-lg-12">
-          <table class="table table-hover">
-            <thead>
-              <tr>
-                <th style="width: 10px"></th>
-                <th>Domain</th>
-                <th class="text-left hidden-xs hidden-sm">Provider</th>
-                <th style="width: 100px" class="text-right">Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr ng-repeat="domain in domains">
-                <td>
-                  <i class="fa fa-lock" ng-show="domain.locked" uib-tooltip="This domain is locked and cannot be edited"></i>
-                </td>
-                <td class="elide-table-cell hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
-                  {{ domain.domain }}
-                </td>
-                <td class="text-left elide-table-cell hidden-xs hidden-sm hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
-                  {{ prettyProviderName(domain) }}
-                </td>
-                <td class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.adminDomain && domain.provider !== 'caas' && provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
-                  <button class="btn btn-xs btn-default" ng-click="domainRenewCerts.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" title="Renew Certs"><i class="fa fa-certificate"></i></button>
-                  <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" 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' && !domain.locked" title="Remove Domain"><i class="far fa-trash-alt"></i></button>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
+    </div>
+    <div class="row animateMeOpacity ng-hide" ng-show="ready">
+      <div class="col-lg-12">
+        <table class="table table-hover" style="margin-top: 10px;">
+          <thead>
+            <tr>
+              <th style="width: 10px"></th>
+              <th>Domain</th>
+              <th class="text-left hidden-xs hidden-sm">Provider</th>
+              <th style="width: 100px" class="text-right">Actions</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr ng-repeat="domain in domains">
+              <td>
+                <i class="fa fa-lock" ng-show="domain.locked" uib-tooltip="This domain is locked and cannot be edited"></i>
+              </td>
+              <td class="elide-table-cell hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
+                {{ domain.domain }}
+              </td>
+              <td class="text-left elide-table-cell hidden-xs hidden-sm hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
+                {{ prettyProviderName(domain) }}
+              </td>
+              <td class="text-right no-wrap" style="vertical-align: bottom">
+                <button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.adminDomain && domain.provider !== 'caas' && provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
+                <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" 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' && !domain.locked" title="Remove Domain"><i class="far fa-trash-alt"></i></button>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+    <div class="row animateMeOpacity ng-hide" ng-show="ready && domain.provider !== 'caas'">
+      <div class="col-lg-12">
+        <button class="btn btn-primary pull-right" ng-click="renewCerts.show()" title="Renew Certs for all Domains">Renew Certs</button>
       </div>
     </div>
   </div>
diff --git a/src/views/domains.js b/src/views/domains.js
index 81d1dd964..eac546e39 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -352,39 +352,34 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
         }
     };
 
-    $scope.domainRenewCerts = {
+    $scope.renewCerts = {
         busy: false,
         error: null,
-        domain: null,
 
-        show: function (domain) {
-            $scope.domainRenewCerts.reset();
-
-            $scope.domainRenewCerts.domain = domain;
-
-            $('#domainRenewCertsModal').modal('show');
+        show: function () {
+            $scope.renewCerts.reset();
+            $('#renewCertsModal').modal('show');
         },
 
         submit: function () {
-            $scope.domainRenewCerts.busy = true;
-            $scope.domainRenewCerts.error = null;
+            $scope.renewCerts.busy = true;
+            $scope.renewCerts.error = null;
 
-            Client.renewCerts($scope.domainRenewCerts.domain.domain, function (error) {
+            Client.renewCerts(null /* all domains */, function (error) {
                 if (error) {
                     Client.error(error);
                 } else {
-                    $('#domainRenewCertsModal').modal('hide');
-                    $scope.domainRenewCerts.reset();
+                    $('#renewCertsModal').modal('hide');
+                    $scope.renewCerts.reset();
                 }
 
-                $scope.domainRenewCerts.busy = false;
+                $scope.renewCerts.busy = false;
             });
         },
 
         reset: function () {
-            $scope.domainRenewCerts.busy = false;
-            $scope.domainRenewCerts.error = null;
-            $scope.domainRenewCerts.domain = null;
+            $scope.renewCerts.busy = false;
+            $scope.renewCerts.error = null;
         }
     };