diff --git a/app/assets/css/vendor-override.css b/app/assets/css/vendor-override.css
index 0519029d7..747653c1b 100644
--- a/app/assets/css/vendor-override.css
+++ b/app/assets/css/vendor-override.css
@@ -288,6 +288,14 @@ json-tree .branch-preview {
 .rzslider .rz-bubble.rz-limit {
   color: var(--text-rzslider-limit-color);
 }
+
+.rz-bubble.rz-limit.rz-ceil {
+  position: absolute;
+  right: 0;
+  left: auto !important;
+  top: -26px;
+}
+
 input,
 button,
 select,
diff --git a/app/assets/ico/route.svg b/app/assets/ico/route.svg
index 45e637677..ed083802d 100644
--- a/app/assets/ico/route.svg
+++ b/app/assets/ico/route.svg
@@ -1,3 +1 @@
-<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M47.9166 20.8335H49.7266C62.4234 20.8335 68.7719 20.8335 71.1817 23.1139C73.2649 25.085 74.188 27.9888 73.6256 30.801C72.975 34.0544 67.792 37.7204 57.4261 45.0524L40.4904 57.0313C30.1245 64.3633 24.9415 68.0293 24.2909 71.2826C23.7285 74.0948 24.6517 76.9986 26.7348 78.9698C29.1447 81.2502 35.4931 81.2502 48.1899 81.2502H52.0833M33.3333 20.8335C33.3333 27.7371 27.7368 33.3335 20.8333 33.3335C13.9297 33.3335 8.33325 27.7371 8.33325 20.8335C8.33325 13.9299 13.9297 8.3335 20.8333 8.3335C27.7368 8.3335 33.3333 13.9299 33.3333 20.8335ZM91.6666 79.1668C91.6666 86.0704 86.0702 91.6668 79.1666 91.6668C72.263 91.6668 66.6666 86.0704 66.6666 79.1668C66.6666 72.2633 72.263 66.6668 79.1666 66.6668C86.0702 66.6668 91.6666 72.2633 91.6666 79.1668Z" stroke="black" stroke-width="8.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg width="auto" height="auto" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> <path d="M11.5 5H11.9344C14.9816 5 16.5053 5 17.0836 5.54729C17.5836 6.02037 17.8051 6.71728 17.6702 7.39221C17.514 8.17302 16.2701 9.05285 13.7823 10.8125L9.71772 13.6875C7.2299 15.4471 5.98599 16.327 5.82984 17.1078C5.69486 17.7827 5.91642 18.4796 6.41636 18.9527C6.99474 19.5 8.51836 19.5 11.5656 19.5H12.5M8 5C8 6.65685 6.65685 8 5 8C3.34315 8 2 6.65685 2 5C2 3.34315 3.34315 2 5 2C6.65685 2 8 3.34315 8 5ZM22 19C22 20.6569 20.6569 22 19 22C17.3431 22 16 20.6569 16 19C16 17.3431 17.3431 16 19 16C20.6569 16 22 17.3431 22 19Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/> </svg>
\ No newline at end of file
diff --git a/app/kubernetes/views/resource-pools/components/storage-class-switch/storage-class-switch.html b/app/kubernetes/views/resource-pools/components/storage-class-switch/storage-class-switch.html
index dc52f5f00..6f65e39ef 100644
--- a/app/kubernetes/views/resource-pools/components/storage-class-switch/storage-class-switch.html
+++ b/app/kubernetes/views/resource-pools/components/storage-class-switch/storage-class-switch.html
@@ -1,8 +1,9 @@
 <div class="form-group">
-  <div class="col-sm-2">
+  <div class="col-sm-12">
     <por-switch-field
       data-cy="'k8sNamespaceCreate-enableQuotaToggle'"
       label="'Enable quota'"
+      label-class="'col-sm-3 col-lg-2'"
       name="'k8s-resourcepool-storagequota'"
       feature-id="$ctrl.featureId"
       checked="$ctrl.value"
diff --git a/app/kubernetes/views/resource-pools/create/createResourcePool.html b/app/kubernetes/views/resource-pools/create/createResourcePool.html
index 17fca8c44..397aa9fdb 100644
--- a/app/kubernetes/views/resource-pools/create/createResourcePool.html
+++ b/app/kubernetes/views/resource-pools/create/createResourcePool.html
@@ -15,8 +15,8 @@
           <form class="form-horizontal" autocomplete="off" name="resourcePoolCreationForm">
             <!-- #region NAME INPUT -->
             <div class="form-group">
-              <label for="pool_name" class="col-sm-1 control-label text-left">Name</label>
-              <div class="col-sm-11">
+              <label for="pool_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
+              <div class="col-sm-8">
                 <input
                   type="text"
                   class="form-control"
@@ -29,20 +29,25 @@
                   required
                   auto-focus
                 />
+                <span class="help-block">
+                  <div class="form-group" ng-show="resourcePoolCreationForm.pool_name.$invalid || $ctrl.state.isAlreadyExist || $ctrl.state.hasPrefixKube">
+                    <div class="col-sm-12 small text-muted">
+                      <div ng-messages="resourcePoolCreationForm.pool_name.$error">
+                        <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>This field is required.</p>
+                        <p class="vertical-center" ng-message="pattern"
+                          ><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> This field must consist of lower case alphanumeric characters or '-', and
+                          contain at most 63 characters, and must start and end with an alphanumeric character.</p
+                        >
+                      </div>
+                      <p class="vertical-center" ng-if="$ctrl.state.hasPrefixKube"
+                        ><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Prefix "kube-" is reserved for Kubernetes system namespaces.</p
+                      >
+                    </div>
+                  </div>
+                </span>
               </div>
             </div>
-            <div class="form-group" ng-show="resourcePoolCreationForm.pool_name.$invalid || $ctrl.state.isAlreadyExist || $ctrl.state.hasPrefixKube">
-              <div class="col-sm-12 small text-warning">
-                <div ng-messages="resourcePoolCreationForm.pool_name.$error">
-                  <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
-                  <p ng-message="pattern"
-                    ><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field must consist of lower case alphanumeric characters or '-', and contain at most 63
-                    characters, and must start and end with an alphanumeric character.</p
-                  >
-                </div>
-                <p ng-if="$ctrl.state.hasPrefixKube"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Prefix "kube-" is reserved for Kubernetes system namespaces.</p>
-              </div>
-            </div>
+
             <!-- #endregion -->
 
             <div class="col-sm-12 form-section-title"> Quota </div>
@@ -50,31 +55,39 @@
             <!-- quotas-switch -->
             <div class="form-group">
               <div class="col-sm-12 small text-muted">
-                <p>
-                  <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
+                <p class="vertical-center">
+                  <pr-icon class="vertical-center" icon="'info'" feather="true" mode="'primary'"></pr-icon>
                   A namespace segments the underlying physical Kubernetes cluster into smaller virtual clusters. You should assign a capped limit of resources to this namespace or
                   disable for the safe operation of your platform.
                 </p>
               </div>
               <div class="col-sm-12">
-                <label class="control-label text-left"> Resource assignment </label>
-                <label class="switch" style="margin-left: 20px">
-                  <input type="checkbox" ng-model="$ctrl.formValues.HasQuota" /><i data-cy="k8sNamespaceCreate-resourceAssignmentToggle"></i>
-                </label>
+                <por-switch-field
+                  data-cy="'k8sNamespaceCreate-resourceAssignmentToggle'"
+                  label="'Resource assignment'"
+                  label-class="'col-sm-3 col-lg-2'"
+                  name="'k8s-resourcepool-resourcequota'"
+                  checked="$ctrl.formValues.HasQuota"
+                  on-change="($ctrl.onToggleResourceQuota)"
+                ></por-switch-field>
               </div>
             </div>
-            <div class="form-group" ng-if="$ctrl.formValues.HasQuota && !$ctrl.isQuotaValid()">
-              <span class="col-sm-12 text-warning small">
-                <p> <i class="fa fa-exclamation-triangle" aria-hidden="true" style="margin-right: 2px"></i> At least a single limit must be set for the quota to be valid. </p>
-              </span>
-            </div>
             <!-- !quotas-switch -->
             <div ng-if="$ctrl.formValues.HasQuota">
               <div class="col-sm-12 form-section-title"> Resource limits </div>
               <div>
+                <div class="form-group" ng-if="$ctrl.formValues.HasQuota && !$ctrl.isQuotaValid()">
+                  <span class="col-sm-12 small text-muted">
+                    <p class="vertical-center"
+                      ><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> At least a single limit must be set for the quota to be
+                      valid.
+                    </p>
+                  </span>
+                </div>
+
                 <!-- memory-limit-input -->
                 <div class="form-group">
-                  <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> Memory </label>
+                  <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left"> Memory </label>
                   <div class="col-sm-3">
                     <slider
                       model="$ctrl.formValues.MemoryLimit"
@@ -98,24 +111,28 @@
                       data-cy="k8sNamespaceCreate-memoryLimitInput"
                       required
                     />
+                    <span class="help-block">
+                      <div class="form-group" ng-show="resourcePoolCreationForm.memory_limit.$invalid">
+                        <div class="col-sm-12 small text-muted">
+                          <div ng-messages="resourcePoolCreationForm.pool_name.$error">
+                            <p class="vertical-center"
+                              ><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Value must be between
+                              {{ $ctrl.defaults.MemoryLimit }} and
+                              {{ $ctrl.state.sliderMaxMemory }}
+                            </p>
+                          </div>
+                        </div>
+                      </div>
+                    </span>
                   </div>
                   <div class="col-sm-4">
-                    <p class="small text-muted" style="margin-top: 7px"> Maximum memory usage (<b>MB</b>) </p>
-                  </div>
-                </div>
-                <div class="form-group" ng-show="resourcePoolCreationForm.memory_limit.$invalid">
-                  <div class="col-sm-12 small text-warning">
-                    <div ng-messages="resourcePoolCreationForm.pool_name.$error">
-                      <p
-                        ><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Value must be between {{ $ctrl.defaults.MemoryLimit }} and {{ $ctrl.state.sliderMaxMemory }}
-                      </p>
-                    </div>
+                    <p class="small text-muted"> Maximum memory usage (MB) </p>
                   </div>
                 </div>
                 <!-- !memory-limit-input -->
                 <!-- cpu-limit-input -->
                 <div class="form-group">
-                  <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> CPU </label>
+                  <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left"> CPU </label>
                   <div class="col-sm-5">
                     <slider
                       model="$ctrl.formValues.CpuLimit"
@@ -128,7 +145,7 @@
                     >
                     </slider>
                   </div>
-                  <div class="col-sm-4" style="margin-top: 20px">
+                  <div class="col-sm-4">
                     <p class="small text-muted"> Maximum CPU usage </p>
                   </div>
                 </div>
@@ -141,8 +158,8 @@
             <div class="col-sm-12 form-section-title"> Load balancers </div>
 
             <div class="form-group">
-              <span class="col-sm-12 text-muted small">
-                <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
+              <span class="col-sm-12 text-muted small vertical-center">
+                <pr-icon icon="'info'" feather="true" mode="'primary'"></pr-icon>
                 You can set a quota on the amount of external load balancers that can be created inside this namespace. Set this quota to 0 to effectively disable the use of load
                 balancers in this namespace.
               </span>
@@ -152,6 +169,7 @@
                 <por-switch-field
                   data-cy="'k8sNamespaceCreate-loadBalancerQuotaToggle'"
                   label="'Load Balancer quota'"
+                  label-class="'col-sm-3 col-lg-2'"
                   name="'k8s-resourcepool-lbquota'"
                   feature-id="$ctrl.LBQuotaFeatureId"
                   checked="$ctrl.formValues.UseLoadBalancersQuota"
@@ -165,14 +183,14 @@
             <div class="col-sm-12 form-section-title"> Storage </div>
 
             <div class="form-group">
-              <span class="col-sm-12 text-muted small">
-                <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
+              <span class="col-sm-12 text-muted small vertical-center">
+                <pr-icon icon="'info'" feather="true" mode="'primary'"></pr-icon>
                 Quotas can be set on each storage option to prevent users from exceeding a specific threshold when deploying applications. You can set a quota to 0 to effectively
                 prevent the usage of a specific storage option inside this namespace.
               </span>
             </div>
-            <div class="col-sm-12 form-section-title">
-              <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i>
+            <div class="col-sm-12 form-section-title vertical-center">
+              <pr-icon icon="'svg-route'"></pr-icon>
               standard
             </div>
 
@@ -192,25 +210,30 @@
 
               <div class="form-group" ng-if="$ctrl.formValues.IngressClasses.length > 0">
                 <div class="col-sm-12 small text-muted">
-                  <p>
-                    <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
+                  <p class="vertical-center">
+                    <pr-icon icon="'info'" feather="true" mode="'primary'"></pr-icon>
                     Enable and configure ingresses available to users when deploying applications.
                   </p>
                 </div>
               </div>
 
               <div class="form-group" ng-repeat-start="ic in $ctrl.formValues.IngressClasses track by ic.IngressClass.Name">
-                <div class="text-muted col-sm-12" style="width: 100%">
-                  <div style="border-bottom: 1px solid #cdcdcd; padding-bottom: 5px">
-                    <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i> {{ ic.IngressClass.Name }}
+                <div class="row">
+                  <div class="col-sm-12">
+                    <span class="text-muted vertical-center"><pr-icon icon="'svg-route'"></pr-icon> {{ ic.IngressClass.Name }}</span>
+                    <hr class="mt-2 mb-0" />
                   </div>
                 </div>
 
-                <div class="col-sm-12" style="margin-top: 10px">
-                  <label class="control-label text-left"> Allow users to use this ingress </label>
-                  <label class="switch" style="margin-left: 20px">
-                    <input type="checkbox" ng-model="ic.Selected" /><i data-cy="namespaceCreate-ingressToggle{{ ic.IngressClass.Name }}"></i>
-                  </label>
+                <div class="row">
+                  <div class="col-sm-3 col-lg-2">
+                    <label class="control-label text-left"> Allow users to use this ingress </label>
+                  </div>
+                  <div class="col-sm-8 pt-2">
+                    <label class="switch">
+                      <input type="checkbox" ng-model="ic.Selected" /><span class="slider round" data-cy="namespaceCreate-ingressToggle{{ ic.IngressClass.Name }}"></span>
+                    </label>
+                  </div>
                 </div>
               </div>
 
@@ -224,20 +247,15 @@
                       >
                       </portainer-tooltip>
                     </label>
-                    <span
-                      class="label label-default interactive"
-                      style="margin-left: 10px"
-                      ng-click="$ctrl.addHostname(ic)"
-                      data-cy="namespaceCreate-addHostButton{{ ic.IngressClass.Name }}"
-                    >
-                      <i class="fa fa-plus-circle" aria-hidden="true"></i> add hostname
+                    <span class="label label-default interactive" ng-click="$ctrl.addHostname(ic)" data-cy="namespaceCreate-addHostButton{{ ic.IngressClass.Name }}">
+                      <pr-icon icon="'plus'" feather="true"></pr-icon> add hostname
                     </span>
                   </div>
-                  <div class="col-sm-12" style="margin-top: 10px">
-                    <div ng-repeat="item in ic.Hosts track by $index" style="margin-top: 2px">
+                  <div class="col-sm-12 pt-4">
+                    <div ng-repeat="item in ic.Hosts track by $index">
                       <div class="form-inline">
-                        <div class="col-sm-10 input-group input-group-sm">
-                          <span class="input-group-addon">Hostname</span>
+                        <div class="col-sm-8 input-group input-group-sm pt-2">
+                          <span class="input-group-addon required">Hostname</span>
                           <input
                             type="text"
                             class="form-control"
@@ -251,87 +269,85 @@
                           />
                         </div>
                         <div class="col-sm-1 input-group input-group-sm" ng-if="$index > 0">
-                          <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.removeHostname(ic, $index)">
-                            <i class="fa fa-trash-alt" aria-hidden="true"></i>
+                          <button class="btn btn-md btn-light btn-only-icon !h-[30px]" type="button" ng-click="$ctrl.removeHostname(ic, $index)">
+                            <pr-icon icon="'trash-2'" size="'md'" feather="true"></pr-icon>
                           </button>
                         </div>
                       </div>
                       <div
-                        class="small text-warning"
-                        style="margin-top: 5px"
+                        class="small text-muted pt-1"
                         ng-show="
                           resourcePoolCreationForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid ||
                           $ctrl.state.duplicates.ingressHosts.refs[ic.IngressClass.Name][$index] !== undefined
                         "
                       >
                         <ng-messages for="resourcePoolCreationForm['hostname_' + ic.IngressClass.Name + '_' + $index].$error">
-                          <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Hostname is required.</p>
+                          <p ng-message="required"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Hostname is required.</p>
                           <p ng-message="pattern">
-                            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                            <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
                             This field must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com').
                           </p>
                         </ng-messages>
                         <p ng-if="$ctrl.state.duplicates.ingressHosts.refs[ic.IngressClass.Name][$index] !== undefined">
-                          <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This hostname is already used.
+                          <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> This hostname is already used.
                         </p>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
-              <div ng-repeat-end class="form-group" ng-if="ic.Selected" style="margin-bottom: 20px">
-                <div class="col-sm-12 small text-muted" style="margin-top: 5px">
-                  <p>
-                    <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
+              <div ng-repeat-end class="form-group" ng-if="ic.Selected">
+                <div class="col-sm-12 small text-muted">
+                  <p class="vertical-center">
+                    <pr-icon icon="'info'" feather="true" mode="'primary'"></pr-icon>
                     You can specify a list of annotations that will be associated to the ingress.
                   </p>
                 </div>
 
                 <div class="col-sm-12">
-                  <label class="control-label text-left">Annotations</label>
-                  <span
-                    class="label label-default interactive"
-                    style="margin-left: 10px"
-                    ng-click="$ctrl.addAnnotation(ic)"
-                    data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}"
-                  >
-                    <i class="fa fa-plus-circle" aria-hidden="true"></i> add annotation
-                  </span>
-                  <portainer-tooltip
-                    message="'Use annotations to configure options for an ingress. Review Nginx or Traefik documentation to find the annotations supported by your choice of ingress type.'"
-                  >
-                  </portainer-tooltip>
-                  <span
-                    class="label label-default interactive"
-                    ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
-                    style="margin-left: 10px"
-                    ng-click="$ctrl.addRewriteAnnotation(ic)"
-                    data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}"
-                  >
-                    <i class="fa fa-plus-circle" aria-hidden="true"></i> add rewrite annotation
-                  </span>
-                  <portainer-tooltip
-                    ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
-                    message="'When the exposed URLs for your applications differ from the specified paths in the ingress, use the rewrite target annotation to denote the path to redirect to.'"
-                  >
-                  </portainer-tooltip>
-                  <span
-                    class="label label-default interactive"
-                    ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
-                    style="margin-left: 10px"
-                    ng-click="$ctrl.addUseregexAnnotation(ic)"
-                    data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}"
-                  >
-                    <i class="fa fa-plus-circle" aria-hidden="true"></i> add regular expression annotation
-                  </span>
-                  <portainer-tooltip
-                    ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
-                    message="'Enable use of regular expressions in ingress paths (set in the ingress details of an application). Use this along with rewrite-target to specify the regex capturing group to be replaced, e.g. path regex of ^/foo/(,*) and rewrite-target of /bar/$1 rewrites example.com/foo/account to example.com/bar/account.'"
-                  >
-                  </portainer-tooltip>
+                  <label class="control-label text-left">Annotations </label>
+                  <label class="control-label text-left">
+                    <span class="label label-default interactive" ng-click="$ctrl.addAnnotation(ic)" data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}">
+                      <pr-icon icon="'plus'" feather="true"></pr-icon> add annotation
+                    </span>
+                    <portainer-tooltip
+                      message="'Use annotations to configure options for an ingress. Review Nginx or Traefik documentation to find the annotations supported by your choice of ingress type.'"
+                    >
+                    </portainer-tooltip>
+                  </label>
+                  <label class="control-label text-left">
+                    <span
+                      class="label label-default interactive"
+                      ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
+                      ng-click="$ctrl.addRewriteAnnotation(ic)"
+                      data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}"
+                    >
+                      <pr-icon icon="'plus'" feather="true"></pr-icon> add rewrite annotation
+                    </span>
+                    <portainer-tooltip
+                      ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
+                      message="'When the exposed URLs for your applications differ from the specified paths in the ingress, use the rewrite target annotation to denote the path to redirect to.'"
+                    >
+                    </portainer-tooltip>
+                  </label>
+                  <label class="control-label text-left">
+                    <span
+                      class="label label-default interactive"
+                      ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
+                      ng-click="$ctrl.addUseregexAnnotation(ic)"
+                      data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}"
+                    >
+                      <pr-icon icon="'plus'" feather="true"></pr-icon> add regular expression annotation
+                    </span>
+                    <portainer-tooltip
+                      ng-if="ic.IngressClass.Type === $ctrl.IngressClassTypes.NGINX"
+                      message="'Enable use of regular expressions in ingress paths (set in the ingress details of an application). Use this along with rewrite-target to specify the regex capturing group to be replaced, e.g. path regex of ^/foo/(,*) and rewrite-target of /bar/$1 rewrites example.com/foo/account to example.com/bar/account.'"
+                    >
+                    </portainer-tooltip>
+                  </label>
                 </div>
-                <div class="col-sm-12 form-inline" style="margin-top: 10px">
-                  <div ng-repeat="annotation in ic.Annotations track by $index" style="margin-top: 2px">
+                <div class="col-sm-12 form-inline pt-4">
+                  <div class="pt-2" ng-repeat="annotation in ic.Annotations track by $index">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">Key</span>
                       <input
@@ -347,7 +363,7 @@
                         data-cy="namespaceCreate-annotationKey{{ ic.IngressClass.Name }}"
                       />
                     </div>
-                    <div class="input-group col-sm-5 input-group-sm">
+                    <div class="input-group input-group-sm col-sm-5">
                       <span class="input-group-addon">Value</span>
                       <input
                         type="text"
@@ -358,14 +374,14 @@
                         data-cy="namespaceCreate-annotationValue{{ ic.IngressClass.Name }}"
                       />
                     </div>
-                    <div class="col-sm-1 input-group input-group-sm">
+                    <div class="input-group input-group-sm col-sm-1">
                       <button
-                        class="btn btn-sm btn-danger"
+                        class="btn btn-sm btn-light btn-only-icon !h-[30px]"
                         type="button"
                         ng-click="$ctrl.removeAnnotation(ic, $index)"
                         data-cy="namespaceCreate-deleteAnnotationButton{{ ic.IngressClass.Name }}"
                       >
-                        <i class="fa fa-trash-alt" aria-hidden="true"></i>
+                        <pr-icon icon="'trash-2'" size="'md'" feather="true"></pr-icon>
                       </button>
                     </div>
                   </div>
@@ -378,15 +394,15 @@
             <div class="col-sm-12 form-section-title"> Registries </div>
             <div class="form-group">
               <div class="col-sm-12 small text-muted">
-                <p>
-                  <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
-                  Define which registry can be used by users who have access to this namespace.
+                <p class="vertical-center">
+                  <pr-icon icon="'info'" feather="true" mode="'primary'"></pr-icon>
+                  Define which registries can be used by users who have access to this namespace.
                 </p>
               </div>
             </div>
 
             <div class="form-group">
-              <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0"> Select registries </label>
+              <label class="col-sm-3 col-lg-2 control-label text-left"> Select registries </label>
               <div class="col-sm-9 col-lg-4">
                 <span class="small text-muted" ng-if="!$ctrl.registries.length && $ctrl.state.isAdmin">
                   No registries available. Head over <a ui-sref="portainer.registries">registry view</a> to define container registry.
@@ -404,7 +420,7 @@
                   tick-property="Checked"
                   helper-elements="filter"
                   search-property="Name"
-                  translation="{nothingSelected: 'Select one or more registry', search: 'Search...'}"
+                  translation="{nothingSelected: 'Select one or more registries', search: 'Search...'}"
                   data-cy="namespaceCreate-registrySelect"
                 >
                 </span>
@@ -422,7 +438,7 @@
               <div class="col-sm-12">
                 <button
                   type="button"
-                  class="btn btn-primary btn-sm"
+                  class="btn btn-primary btn-sm !ml-0"
                   ng-disabled="!resourcePoolCreationForm.$valid || $ctrl.isCreateButtonDisabled()"
                   ng-click="$ctrl.createResourcePool()"
                   button-spinner="$ctrl.state.actionInProgress"
diff --git a/app/kubernetes/views/resource-pools/create/createResourcePoolController.js b/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
index 8088e8597..8c8987ad3 100644
--- a/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
+++ b/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
@@ -38,6 +38,7 @@ class KubernetesCreateResourcePoolController {
 
     this.onToggleStorageQuota = this.onToggleStorageQuota.bind(this);
     this.onToggleLoadBalancerQuota = this.onToggleLoadBalancerQuota.bind(this);
+    this.onToggleResourceQuota = this.onToggleResourceQuota.bind(this);
   }
   /* #endregion */
 
@@ -53,6 +54,12 @@ class KubernetesCreateResourcePoolController {
     });
   }
 
+  onToggleResourceQuota(enabled) {
+    this.$scope.$evalAsync(() => {
+      this.formValues.HasQuota = enabled;
+    });
+  }
+
   onChangeIngressHostname() {
     const state = this.state.duplicates.ingressHosts;
     const hosts = _.flatMap(this.formValues.IngressClasses, 'Hosts');