diff --git a/app/docker/components/container-capabilities/container-capabilities.controller.js b/app/docker/components/container-capabilities/container-capabilities.controller.js
new file mode 100644
index 000000000..a743f5a50
--- /dev/null
+++ b/app/docker/components/container-capabilities/container-capabilities.controller.js
@@ -0,0 +1,23 @@
+export default class ContainerCapabilitiesController {
+  /* @ngInject */
+  constructor($scope) {
+    this.$scope = $scope;
+
+    this.oldCapabilities = [];
+  }
+
+  createOnChangeHandler(capability) {
+    return (checked) => {
+      this.$scope.$evalAsync(() => {
+        capability.allowed = checked;
+      });
+    };
+  }
+
+  $doCheck() {
+    if (this.oldCapabilities.length !== this.capabilities.length) {
+      this.oldCapabilities = this.capabilities;
+      this.capabilitiesOnChange = Object.fromEntries(this.capabilities.map((cap) => [cap.capability, this.createOnChangeHandler(cap)]));
+    }
+  }
+}
diff --git a/app/docker/components/container-capabilities/container-capabilities.js b/app/docker/components/container-capabilities/container-capabilities.js
index bd8aa6463..aa13b5ac8 100644
--- a/app/docker/components/container-capabilities/container-capabilities.js
+++ b/app/docker/components/container-capabilities/container-capabilities.js
@@ -1,6 +1,9 @@
+import controller from './container-capabilities.controller';
+
 angular.module('portainer.docker').component('containerCapabilities', {
   templateUrl: './containerCapabilities.html',
   bindings: {
     capabilities: '=',
   },
+  controller,
 });
diff --git a/app/docker/components/container-capabilities/containerCapabilities.html b/app/docker/components/container-capabilities/containerCapabilities.html
index fdfd25a83..d2e0e47b2 100644
--- a/app/docker/components/container-capabilities/containerCapabilities.html
+++ b/app/docker/components/container-capabilities/containerCapabilities.html
@@ -1,18 +1,15 @@
 <form class="form-horizontal" style="margin-top: 15px">
   <div class="col-sm-12 form-section-title"> Container capabilities </div>
-  <div class="form-group">
-    <div ng-repeat="cap in $ctrl.capabilities" class="col-xs-12 col-sm-6 col-md-4">
-      <div class="row">
-        <div class="col-xs-8">
-          <label for="capability" class="control-label text-left" style="display: flex; padding: 0">
-            {{ cap.capability }}
-            <portainer-tooltip message="cap.description"></portainer-tooltip>
-          </label>
-        </div>
-        <div class="col-xs-4">
-          <label class="switch"> <input type="checkbox" name="capability" ng-model="cap.allowed" /><i></i> </label>
-        </div>
-      </div>
+  <div class="form-group flex flex-wrap gap-y-2 px-5">
+    <div ng-repeat="cap in $ctrl.capabilities" class="w-1/3 text-center">
+      <por-switch-field
+        label-class="'col-sm-6'"
+        tooltip="cap.description"
+        checked="cap.allowed"
+        label="cap.capability"
+        name="'capability'"
+        on-change="($ctrl.capabilitiesOnChange[cap.capability])"
+      ></por-switch-field>
     </div>
   </div>
 </form>
diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index d68252695..40f26b8db 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -110,6 +110,42 @@ angular.module('portainer.docker').controller('CreateContainerController', [
       settingUnlimitedResources: false,
     };
 
+    $scope.onAlwaysPullChange = onAlwaysPullChange;
+    $scope.handlePublishAllPortsChange = handlePublishAllPortsChange;
+    $scope.handleAutoRemoveChange = handleAutoRemoveChange;
+    $scope.handlePrivilegedChange = handlePrivilegedChange;
+    $scope.handleInitChange = handleInitChange;
+
+    function onAlwaysPullChange(checked) {
+      return $scope.$evalAsync(() => {
+        $scope.formValues.alwaysPull = checked;
+      });
+    }
+
+    function handlePublishAllPortsChange(checked) {
+      return $scope.$evalAsync(() => {
+        $scope.config.HostConfig.PublishAllPorts = checked;
+      });
+    }
+
+    function handleAutoRemoveChange(checked) {
+      return $scope.$evalAsync(() => {
+        $scope.config.HostConfig.AutoRemove = checked;
+      });
+    }
+
+    function handlePrivilegedChange(checked) {
+      return $scope.$evalAsync(() => {
+        $scope.config.HostConfig.Privileged = checked;
+      });
+    }
+
+    function handleInitChange(checked) {
+      return $scope.$evalAsync(() => {
+        $scope.config.HostConfig.Init = checked;
+      });
+    }
+
     $scope.handleEnvVarChange = handleEnvVarChange;
     function handleEnvVarChange(value) {
       $scope.formValues.Env = value;
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index a1e022279..ab78248dd 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -48,11 +48,15 @@
               <!-- always-pull -->
               <div class="form-group">
                 <div class="col-sm-12">
-                  <label for="ownership" class="control-label text-left">
-                    Always pull the image
-                    <portainer-tooltip message="'When enabled, Portainer will automatically try to pull the specified image before creating the container.'"></portainer-tooltip>
-                  </label>
-                  <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="formValues.alwaysPull" ng-disabled="!state.pullImageValidity" /><i></i> </label>
+                  <por-switch-field
+                    name="'alwaysPull'"
+                    label-class="'col-sm-2'"
+                    checked="formValues.alwaysPull"
+                    disabled="!state.pullImageValidity"
+                    label="'Always pull the image'"
+                    on-change="(onAlwaysPullChange)"
+                    tooltip="'When enabled, Portainer will automatically try to pull the specified image before creating the container.'"
+                  ></por-switch-field>
                 </div>
               </div>
               <!-- !always-pull -->
@@ -64,18 +68,12 @@
             <div class="col-sm-12 form-section-title"> Webhooks </div>
             <div class="form-group">
               <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Create a container webhook
-                  <portainer-tooltip
-                    position="'top'"
-                    message="'Create a webhook (or callback URI) to automate the recreate this container. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and recreate this container.'"
-                  ></portainer-tooltip>
-                </label>
-                <label class="switch box-selector-item limited business" style="margin-left: 20px">
-                  <input type="checkbox" ng-model="formValues.EnableWebhook" disabled="disabled" ng-checked="false" />
-                  <i class="orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
-                </label>
-                <be-feature-indicator feature="containerWebhookFeature"></be-feature-indicator>
+                <por-switch-field
+                  feature-id="'container-webhook'"
+                  label-class="'col-sm-2'"
+                  label="'Create a container webhook'"
+                  tooltip="'Create a webhook (or callback URI) to automate the recreate this container. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and recreate this container.'"
+                ></por-switch-field>
               </div>
             </div>
           </div>
@@ -85,13 +83,13 @@
           <!-- publish-exposed-ports -->
           <div class="form-group">
             <div class="col-sm-12">
-              <label class="control-label text-left">
-                Publish all exposed network ports to random host ports
-                <portainer-tooltip
-                  message="'When enabled, Portainer will let Docker automatically map a random port on the host to each one defined in the image Dockerfile.'"
-                ></portainer-tooltip>
-              </label>
-              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="config.HostConfig.PublishAllPorts" /><i></i> </label>
+              <por-switch-field
+                label-class="'col-sm-2'"
+                checked="config.HostConfig.PublishAllPorts"
+                label="'Publish all exposed network ports to random host ports'"
+                on-change="(handlePublishAllPortsChange)"
+                tooltip="'When enabled, Portainer will let Docker automatically map a random port on the host to each one defined in the image Dockerfile.'"
+              ></por-switch-field>
             </div>
           </div>
           <!-- !publish-exposed-ports -->
@@ -156,13 +154,13 @@
           <!-- autoremove -->
           <div class="form-group">
             <div class="col-sm-12">
-              <label for="ownership" class="control-label text-left">
-                Auto remove
-                <portainer-tooltip
-                  message="'When enabled, Portainer will automatically remove the container when it exits. This is useful when you want to use the container only once.'"
-                ></portainer-tooltip>
-              </label>
-              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="config.HostConfig.AutoRemove" /><i></i> </label>
+              <por-switch-field
+                label-class="'col-sm-2'"
+                checked="config.HostConfig.AutoRemove"
+                label="'Auto remove'"
+                on-change="(handleAutoRemoveChange)"
+                tooltip="'When enabled, Portainer will automatically remove the container when it exits. This is useful when you want to use the container only once.'"
+              ></por-switch-field>
             </div>
           </div>
           <!-- !autoremove -->
@@ -614,16 +612,19 @@
               <!-- privileged-mode -->
               <div class="form-group" ng-if="isAdmin || allowPrivilegedMode">
                 <div class="col-sm-12">
-                  <label for="privileged_mode" class="control-label text-left"> Privileged mode </label>
-                  <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="privileged_mode" ng-model="config.HostConfig.Privileged" /><i></i> </label>
+                  <por-switch-field
+                    label-class="'col-sm-2'"
+                    checked="config.HostConfig.Privileged"
+                    label="'Privileged mode'"
+                    on-change="(handlePrivilegedChange)"
+                  ></por-switch-field>
                 </div>
               </div>
               <!-- !privileged-mode -->
               <!-- init -->
               <div class="form-group" ng-if="applicationState.endpoint.apiVersion >= 1.37">
                 <div class="col-sm-12">
-                  <label for="init" class="control-label text-left"> Init </label>
-                  <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="init" ng-model="config.HostConfig.Init" /><i></i> </label>
+                  <por-switch-field label-class="'col-sm-2'" checked="config.HostConfig.Init" label="'Init'" on-change="(handleInitChange)"></por-switch-field>
                 </div>
               </div>
               <!-- !init -->
diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html
index 1f20c2b64..fc4f4cbac 100644
--- a/app/docker/views/containers/edit/container.html
+++ b/app/docker/views/containers/edit/container.html
@@ -107,17 +107,18 @@
               <td>Finished</td>
               <td>{{ container.State.FinishedAt | getisodate }}</td>
             </tr>
-            <tr ng-if="isAdmin && displayRecreateButton && applicationState.endpoint.type !== 4">
-              <td colspan="1">
-                Container webhook
-                <portainer-tooltip
-                  position="'top'"
-                  message="'Webhook (or callback URI) used to automate the recreation of this container. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and recreate this container.'"
-                ></portainer-tooltip>
-                <label class="switch box-selector-item limited business" style="margin-left: 20px">
-                  <input disable-authorization="DockerContainerUpdate" type="checkbox" ng-model="WebhookExists" disabled="disabled" ng-checked="false" /><i></i>
-                </label>
-                <be-feature-indicator feature="containerWebhookFeature"></be-feature-indicator>
+            <tr ng-if="isAdmin && displayCreateWebhookButton && applicationState.endpoint.type !== 4">
+              <td colspan="6">
+                <div class="form-group">
+                  <div class="col-sm-12">
+                    <por-switch-field
+                      tooltip="'Webhook (or callback URI) used to automate the recreation of this container. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and recreate this container.'"
+                      label-class="'col-sm-2'"
+                      label="'Container webhook'"
+                      feature-id="'container-webhook'"
+                    ></por-switch-field>
+                  </div>
+                </div>
               </td>
             </tr>
             <tr authorization="DockerContainerLogs, DockerContainerInspect, DockerContainerStats, DockerExecStart">
diff --git a/app/docker/views/containers/edit/containerController.js b/app/docker/views/containers/edit/containerController.js
index 0320d1ff2..7f84a784f 100644
--- a/app/docker/views/containers/edit/containerController.js
+++ b/app/docker/views/containers/edit/containerController.js
@@ -52,6 +52,7 @@ angular.module('portainer.docker').controller('ContainerController', [
     $scope.activityTime = 0;
     $scope.portBindings = [];
     $scope.displayRecreateButton = false;
+    $scope.displayCreateWebhookButton = false;
     $scope.containerWebhookFeature = FeatureId.CONTAINER_WEBHOOK;
 
     $scope.config = {
@@ -150,6 +151,7 @@ angular.module('portainer.docker').controller('ContainerController', [
             !allowPrivilegedModeForRegularUsers;
 
           $scope.displayRecreateButton = !inSwarm && !autoRemove && (admin || !settingRestrictsRegularUsers);
+          $scope.displayCreateWebhookButton = $scope.displayRecreateButton;
         })
         .catch(function error(err) {
           Notifications.error('Failure', err, 'Unable to retrieve container info');
diff --git a/app/docker/views/secrets/create/createSecretController.js b/app/docker/views/secrets/create/createSecretController.js
index cbd654c77..98341e338 100644
--- a/app/docker/views/secrets/create/createSecretController.js
+++ b/app/docker/views/secrets/create/createSecretController.js
@@ -23,6 +23,14 @@ angular.module('portainer.docker').controller('CreateSecretController', [
       actionInProgress: false,
     };
 
+    $scope.handleEncodeSecretChange = handleEncodeSecretChange;
+
+    function handleEncodeSecretChange(checked) {
+      return $scope.$evalAsync(() => {
+        $scope.formValues.encodeSecret = checked;
+      });
+    }
+
     $scope.addLabel = function () {
       $scope.formValues.Labels.push({ key: '', value: '' });
     };
diff --git a/app/docker/views/secrets/create/createsecret.html b/app/docker/views/secrets/create/createsecret.html
index 6aba6518c..b01219066 100644
--- a/app/docker/views/secrets/create/createsecret.html
+++ b/app/docker/views/secrets/create/createsecret.html
@@ -24,11 +24,13 @@
           <!-- encode-secret -->
           <div class="form-group">
             <div class="col-sm-12">
-              <label for="encode_secret" class="control-label text-left">
-                Encode secret
-                <portainer-tooltip message="'Secrets need to be base64 encoded. Disable this if your secret is already base64 encoded.'"></portainer-tooltip>
-              </label>
-              <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="encode_secret" ng-model="formValues.encodeSecret" /><i></i> </label>
+              <por-switch-field
+                label-class="'col-sm-2'"
+                checked="formValues.encodeSecret"
+                label="'Encode secret'"
+                on-change="(handleEncodeSecretChange)"
+                tooltip="'Secrets need to be base64 encoded. Disable this if your secret is already base64 encoded.'"
+              ></por-switch-field>
             </div>
           </div>
           <!-- !encode-secret -->
diff --git a/app/docker/views/services/create/createServiceController.js b/app/docker/views/services/create/createServiceController.js
index 2602d407d..80ebe6ac4 100644
--- a/app/docker/views/services/create/createServiceController.js
+++ b/app/docker/views/services/create/createServiceController.js
@@ -111,6 +111,14 @@ angular.module('portainer.docker').controller('CreateServiceController', [
 
     $scope.allowBindMounts = false;
 
+    $scope.handleWebHookChange = handleWebHookChange;
+
+    function handleWebHookChange(checked) {
+      return $scope.$evalAsync(() => {
+        $scope.formValues.Webhook = checked;
+      });
+    }
+
     $scope.handleEnvVarChange = handleEnvVarChange;
     function handleEnvVarChange(value) {
       $scope.formValues.Env = value;
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index f6217dc79..8a4836b00 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -96,14 +96,13 @@
             <div class="col-sm-12 form-section-title"> Webhooks </div>
             <div class="form-group">
               <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Create a service webhook
-                  <portainer-tooltip
-                    position="'top'"
-                    message="'Create a webhook (or callback URI) to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service.'"
-                  ></portainer-tooltip>
-                </label>
-                <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="formValues.Webhook" /><i></i> </label>
+                <por-switch-field
+                  label-class="'col-sm-2'"
+                  checked="$ctrl.formValues.Webhook"
+                  label="'Create a service webhook'"
+                  on-change="(handleWebHookChange)"
+                  tooltip="'Create a webhook (or callback URI) to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service.'"
+                ></por-switch-field>
               </div>
             </div>
           </div>
diff --git a/app/docker/views/services/edit/service.html b/app/docker/views/services/edit/service.html
index 636759b7d..e3ed5ca3a 100644
--- a/app/docker/views/services/edit/service.html
+++ b/app/docker/views/services/edit/service.html
@@ -67,14 +67,13 @@
             </tr>
             <tr ng-if="isAdmin && applicationState.endpoint.type !== 4">
               <td colspan="{{ webhookURL ? '1' : '2' }}">
-                Service webhook
-                <portainer-tooltip
-                  position="'top'"
-                  message="'Webhook (or callback URI) used to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service.'"
-                ></portainer-tooltip>
-                <label class="switch" style="margin-left: 20px">
-                  <input disable-authorization="DockerServiceUpdate" type="checkbox" ng-model="WebhookExists" ng-click="updateWebhook(service)" /><i></i>
-                </label>
+                <por-switch-field
+                  tooltip="'Webhook (or callback URI) used to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service.'"
+                  checked="WebhookExists"
+                  disabled="!isAdmin"
+                  on-change="(onWebhookChange)"
+                  label="'Service webhook'"
+                ></por-switch-field>
               </td>
               <td ng-if="webhookURL">
                 <span class="text-muted">{{ webhookURL | truncatelr }}</span>
diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js
index b32f62a66..8f2f00c1c 100644
--- a/app/docker/views/services/edit/serviceController.js
+++ b/app/docker/views/services/edit/serviceController.js
@@ -331,6 +331,13 @@ angular.module('portainer.docker').controller('ServiceController', [
       updateServiceArray(service, 'Hosts', service.Hosts);
     };
 
+    $scope.onWebhookChange = function (enabled) {
+      $scope.$evalAsync(() => {
+        $scope.updateWebhook($scope.service);
+        $scope.WebhookExists = enabled;
+      });
+    };
+
     $scope.updateWebhook = function updateWebhook(service) {
       if ($scope.WebhookExists) {
         WebhookService.deleteWebhook($scope.webhookID)
diff --git a/app/docker/views/swarm/visualizer/swarmVisualizerController.js b/app/docker/views/swarm/visualizer/swarmVisualizerController.js
index 0c842a07c..ccae8da77 100644
--- a/app/docker/views/swarm/visualizer/swarmVisualizerController.js
+++ b/app/docker/views/swarm/visualizer/swarmVisualizerController.js
@@ -16,6 +16,20 @@ angular.module('portainer.docker').controller('SwarmVisualizerController', [
       refreshRate: '5',
     };
 
+    $scope.handleChangeDisplayOnlyRunningTasks = function handleChangeDisplayOnlyRunningTasks(enabled) {
+      $scope.$evalAsync(() => {
+        $scope.state.DisplayOnlyRunningTasks = enabled;
+        $scope.changeDisplayOnlyRunningTasks();
+      });
+    };
+
+    $scope.handleChangeDisplayNodeLabels = function handleChangeDisplayNodeLabels(enabled) {
+      $scope.$evalAsync(() => {
+        $scope.state.DisplayNodeLabels = enabled;
+        $scope.changeDisplayNodeLabels();
+      });
+    };
+
     $scope.$on('$destroy', function () {
       stopRepeater();
     });
diff --git a/app/docker/views/swarm/visualizer/swarmvisualizer.html b/app/docker/views/swarm/visualizer/swarmvisualizer.html
index b4a377f69..0d1f0e456 100644
--- a/app/docker/views/swarm/visualizer/swarmvisualizer.html
+++ b/app/docker/views/swarm/visualizer/swarmvisualizer.html
@@ -31,14 +31,22 @@
           <div class="col-sm-12 form-section-title"> Options </div>
           <div class="form-group">
             <div class="col-sm-12">
-              <label class="control-label text-left"> Only display running tasks </label>
-              <label class="switch" style="margin-left: 20px">
-                <input type="checkbox" ng-model="state.DisplayOnlyRunningTasks" ng-change="changeDisplayOnlyRunningTasks()" /><i></i>
-              </label>
+              <por-switch-field
+                label-class="'col-sm-2'"
+                checked="state.DisplayOnlyRunningTasks"
+                label="'Only display running tasks'"
+                on-change="(handleChangeDisplayOnlyRunningTasks)"
+              ></por-switch-field>
             </div>
+          </div>
+          <div class="form-group">
             <div class="col-sm-12">
-              <label class="control-label text-left"> Display node labels </label>
-              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="state.DisplayNodeLabels" ng-change="changeDisplayNodeLabels()" /><i></i> </label>
+              <por-switch-field
+                label-class="'col-sm-2'"
+                checked="state.DisplayNodeLabels"
+                label="'Display node labels'"
+                on-change="(handleChangeDisplayNodeLabels)"
+              ></por-switch-field>
             </div>
           </div>
         </form>