From a50ac60f74e7e47344c7efcd712d48105b59d59b Mon Sep 17 00:00:00 2001
From: Ernesto Puerta <epuertat@redhat.com>
Date: Tue, 10 May 2022 19:14:10 +0200
Subject: [PATCH] mgr/dashboard: fix overlapping icons in forms

Fixes: https://tracker.ceph.com/issues/55604
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
---
 .../iscsi-setting/iscsi-setting.component.html     |  2 +-
 ...scsi-target-image-settings-modal.component.html |  2 +-
 .../bootstrap-import-modal.component.html          |  2 +-
 .../pool-edit-mode-modal.component.html            |  2 +-
 .../ceph/block/rbd-form/rbd-form.component.html    | 10 +++++-----
 .../rbd-namespace-form-modal.component.html        |  2 +-
 .../rbd-trash-purge-modal.component.html           |  2 +-
 .../configuration-form.component.html              |  2 +-
 .../src/app/ceph/cluster/logs/logs.component.html  |  2 +-
 .../mgr-module-form/mgr-module-form.component.html |  2 +-
 .../osd-recv-speed-modal.component.html            |  2 +-
 .../service-form/service-form.component.html       | 14 +++++++-------
 .../nfs-form-client/nfs-form-client.component.html |  4 ++--
 .../app/ceph/nfs/nfs-form/nfs-form.component.html  | 10 +++++-----
 .../crush-rule-form-modal.component.html           |  6 +++---
 .../erasure-code-profile-form-modal.component.html | 14 +++++++-------
 .../ceph/pool/pool-form/pool-form.component.html   | 12 ++++++------
 .../rgw-bucket-form/rgw-bucket-form.component.html |  6 +++---
 .../rgw-user-capability-modal.component.html       |  4 ++--
 .../rgw/rgw-user-form/rgw-user-form.component.html |  2 +-
 .../rgw-user-s3-key-modal.component.html           |  2 +-
 .../rgw-user-subuser-modal.component.html          |  2 +-
 .../ceph/shared/feedback/feedback.component.html   |  4 ++--
 .../form-modal/form-modal.component.html           |  2 +-
 .../refresh-selector.component.html                |  2 +-
 25 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.html
index f3a1d5dc2f57c..b1e60fbbefa37 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.html
@@ -5,7 +5,7 @@
   <select id="{{ setting }}"
           name="{{ setting }}"
           *ngIf="limits['type'] === 'enum'"
-          class="form-control custom-select"
+          class="custom-select"
           [formControlName]="setting">
     <option [ngValue]="null"></option>
     <option *ngFor="let opt of limits['values']"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
index 3c34a2b85f28d..561de8ee63a94 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
@@ -58,7 +58,7 @@
                    i18n>Backstore</label>
             <select id="backstore"
                     name="backstore"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="backstore">
               <option *ngFor="let bs of backstores"
                       [value]="bs">{{ bs | iscsiBackstore }}</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
index 3770ef099a6b6..26c4380c8d274 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
@@ -40,7 +40,7 @@
           </label>
           <select id="direction"
                   name="direction"
-                  class="form-control custom-select"
+                  class="custom-select"
                   formControlName="direction">
             <option *ngFor="let direction of directions"
                     [value]="direction.key">{{ direction.desc }}</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
index 2e88059ba0c64..cd6dd2af0893d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
@@ -22,7 +22,7 @@
           </label>
           <select id="mirrorMode"
                   name="mirrorMode"
-                  class="form-control custom-select"
+                  class="custom-select"
                   formControlName="mirrorMode">
             <option *ngFor="let mirrorMode of mirrorModes"
                     [value]="mirrorMode.id">{{ mirrorMode.name }}</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
index 75c004fabe9d3..330c2552f139e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
@@ -66,7 +66,7 @@
                    *ngIf="mode === 'editing' || !poolPermission.read">
             <select id="pool"
                     name="pool"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="pool"
                     *ngIf="mode !== 'editing' && poolPermission.read">
               <option *ngIf="pools === null"
@@ -110,7 +110,7 @@
                    *ngIf="mode === 'editing' || !poolPermission.read">
             <select id="namespace"
                     name="namespace"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="namespace"
                     *ngIf="mode !== 'editing' && poolPermission.read">
               <option *ngIf="pools === null"
@@ -169,7 +169,7 @@
                    *ngIf="mode === 'editing' || !poolPermission.read">
             <select id="dataPool"
                     name="dataPool"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="dataPool"
                     (change)="onDataPoolChange($event.target.value)"
                     *ngIf="mode !== 'editing' && poolPermission.read">
@@ -266,7 +266,7 @@
               <div class="cd-col-form-input">
                 <select id="obj_size"
                         name="obj_size"
-                        class="form-control custom-select"
+                        class="custom-select"
                         formControlName="obj_size">
                   <option *ngFor="let objectSize of objectSizes"
                           [value]="objectSize">{{ objectSize }}</option>
@@ -283,7 +283,7 @@
               <div class="cd-col-form-input">
                 <select id="stripingUnit"
                         name="stripingUnit"
-                        class="form-control custom-select"
+                        class="custom-select"
                         formControlName="stripingUnit">
                   <option i18n
                           [ngValue]="null">-- Select stripe unit --</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html
index debbf8643a3c2..6d1f03d121fd8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html
@@ -24,7 +24,7 @@
                    *ngIf="!poolPermission.read">
             <select id="pool"
                     name="pool"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="pool"
                     *ngIf="poolPermission.read">
               <option *ngIf="pools === null"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
index 6acbbb08622e5..8ba46477f3c6b 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
@@ -25,7 +25,7 @@
                  *ngIf="!poolPermission.read">
           <select id="poolName"
                   name="poolName"
-                  class="form-control custom-select"
+                  class="custom-select"
                   formControlName="poolName"
                   *ngIf="poolPermission.read">
             <option value=""
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
index 27225e5b0e043..9fdb99f3ad6e0 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
@@ -105,7 +105,7 @@
               <div class="cd-col-form-input">
                 <select id="pool"
                         name="pool"
-                        class="form-control custom-select"
+                        class="custom-select"
                         [formControlName]="section">
                   <option [ngValue]="null"
                           i18n>-- Default --</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
index 64175f1a4772d..6db47e4a2ca1c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
@@ -78,7 +78,7 @@
       <label for="logs-priority"
              i18n>Priority:</label>
       <select id="logs-priority"
-              class="form-control custom-select"
+              class="custom-select"
               [(ngModel)]="priority"
               (ngModelChange)="filterLogs()">
         <option *ngFor="let prio of priorities"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html
index 89cb7b4d7ee02..465f45ce165e8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html
@@ -43,7 +43,7 @@
                    formControlName="{{ moduleOption.value.name }}"
                    *ngIf="moduleOption.value.enum_allowed.length === 0">
             <select id="{{ moduleOption.value.name }}"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="{{ moduleOption.value.name }}"
                     *ngIf="moduleOption.value.enum_allowed.length > 0">
               <option *ngFor="let value of moduleOption.value.enum_allowed"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
index 6544872726ea2..25a98ad5c41f0 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
@@ -14,7 +14,7 @@
                  for="priority"
                  i18n>Priority</label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     formControlName="priority"
                     id="priority"
                     (change)="onPriorityChange($event.target.value)">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
index 22b401ec86a61..df06fbc6c6afb 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
@@ -16,7 +16,7 @@
           <div class="cd-col-form-input">
             <select id="service_type"
                     name="service_type"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="service_type">
               <option i18n
                       [ngValue]="null">-- Select a service type --</option>
@@ -41,7 +41,7 @@
             <div class="cd-col-form-input">
               <select id="backend_service"
                       name="backend_service"
-                      class="form-control custom-select"
+                      class="custom-select"
                       formControlName="backend_service"
                       (change)="prePopulateId()">
                 <option *ngIf="services === null"
@@ -107,7 +107,7 @@
                  i18n>Placement</label>
           <div class="cd-col-form-input">
             <select id="placement"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="placement">
               <option i18n
                       value="hosts">Hosts</option>
@@ -212,7 +212,7 @@
             <div class="cd-col-form-input">
               <select id="pool"
                       name="pool"
-                      class="form-control custom-select"
+                      class="custom-select"
                       formControlName="pool">
                 <option *ngIf="pools === null"
                         [ngValue]="null"
@@ -435,7 +435,7 @@
             <div class="cd-col-form-input">
               <select id="snmp_version"
                       name="snmp_version"
-                      class="form-control custom-select"
+                      class="custom-select"
                       formControlName="snmp_version"
                       (change)="clearValidations()">
                 <option i18n
@@ -502,7 +502,7 @@
             <div class="cd-col-form-input">
               <select id="auth_protocol"
                       name="auth_protocol"
-                      class="form-control custom-select"
+                      class="custom-select"
                       formControlName="auth_protocol">
                 <option i18n
                         [ngValue]="null">-- Select auth protocol --</option>
@@ -525,7 +525,7 @@
             <div class="cd-col-form-input">
               <select id="privacy_protocol"
                       name="privacy_protocol"
-                      class="form-control custom-select"
+                      class="custom-select"
                       formControlName="privacy_protocol">
                 <option i18n
                         [ngValue]="null">-- Select privacy protocol --</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
index 074bb8d79ce94..be24ac262b688 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
@@ -55,7 +55,7 @@
                      class="cd-col-form-label"
                      for="access_type">Access Type</label>
               <div class="cd-col-form-input">
-                <select class="form-control custom-select"
+                <select class="custom-select"
                         name="access_type"
                         id="access_type"
                         formControlName="access_type">
@@ -78,7 +78,7 @@
                 <ng-container *ngTemplateOutlet="squashHelperTpl"></ng-container>
               </label>
               <div class="cd-col-form-input">
-                <select class="form-control custom-select"
+                <select class="custom-select"
                         name="squash"
                         id="squash"
                         formControlName="squash">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
index 97a59ae326065..65232c7e8708d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
@@ -20,7 +20,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     formControlName="cluster_id"
                     name="cluster_id"
                     id="cluster_id">
@@ -52,7 +52,7 @@
                    for="name"
                    i18n>Storage Backend</label>
             <div class="cd-col-form-input">
-              <select class="form-control custom-select"
+              <select class="custom-select"
                       formControlName="name"
                       name="name"
                       id="name"
@@ -86,7 +86,7 @@
                    for="fs_name"
                    i18n>Volume</label>
             <div class="cd-col-form-input">
-              <select class="form-control custom-select"
+              <select class="custom-select"
                       formControlName="fs_name"
                       name="fs_name"
                       id="fs_name"
@@ -267,7 +267,7 @@
                  for="access_type"
                  i18n>Access Type</label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     formControlName="access_type"
                     name="access_type"
                     id="access_type"
@@ -309,7 +309,7 @@
             <ng-container *ngTemplateOutlet="squashHelper"></ng-container>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     name="squash"
                     formControlName="squash"
                     id="squash">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html
index 3329742f41369..bd0c6b0492189 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html
@@ -43,7 +43,7 @@
             <span class="required"></span>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="root"
                     name="root"
                     formControlName="root">
@@ -71,7 +71,7 @@
             <span class="required"></span>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="failure_domain"
                     name="failure_domain"
                     formControlName="failure_domain">
@@ -98,7 +98,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="device_class"
                     name="device_class"
                     formControlName="device_class">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.html
index cb55e02a35b62..f919c51b77f2a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.html
@@ -40,7 +40,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="plugin"
                     name="plugin"
                     formControlName="plugin">
@@ -239,7 +239,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="crushFailureDomain"
                     name="crushFailureDomain"
                     formControlName="crushFailureDomain">
@@ -263,7 +263,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="crushLocality"
                     name="crushLocality"
                     formControlName="crushLocality">
@@ -290,7 +290,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="scalar_mds"
                     name="scalar_mds"
                     formControlName="scalar_mds">
@@ -311,7 +311,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="technique"
                     name="technique"
                     formControlName="technique">
@@ -353,7 +353,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="crushRoot"
                     name="crushRoot"
                     formControlName="crushRoot">
@@ -376,7 +376,7 @@
             </cd-helper>
           </label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="crushDeviceClass"
                     name="crushDeviceClass"
                     formControlName="crushDeviceClass">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
index 5b8b1459ea69e..b95672c5feccc 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
@@ -45,7 +45,7 @@
                  for="poolType"
                  i18n>Pool type</label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="poolType"
                     formControlName="poolType"
                     name="poolType">
@@ -69,7 +69,7 @@
                    class="cd-col-form-label"
                    for="pgAutoscaleMode">PG Autoscale</label>
             <div class="cd-col-form-input">
-              <select class="form-control custom-select"
+              <select class="custom-select"
                       id="pgAutoscaleMode"
                       name="pgAutoscaleMode"
                       formControlName="pgAutoscaleMode">
@@ -204,7 +204,7 @@
                    for="erasureProfile">Erasure code profile</label>
             <div class="cd-col-form-input">
               <div class="input-group">
-                <select class="form-control custom-select"
+                <select class="custom-select"
                         id="erasureProfile"
                         name="erasureProfile"
                         formControlName="erasureProfile">
@@ -313,7 +313,7 @@
               </ng-template>
               <div *ngIf="current.rules.length > 0; else noRules">
                 <div class="input-group">
-                  <select class="form-control custom-select"
+                  <select class="custom-select"
                           id="crushRule"
                           formControlName="crushRule"
                           name="crushSet">
@@ -429,7 +429,7 @@
                    class="cd-col-form-label"
                    for="mode">Mode</label>
             <div class="cd-col-form-input">
-              <select class="form-control custom-select"
+              <select class="custom-select"
                       id="mode"
                       name="mode"
                       formControlName="mode">
@@ -447,7 +447,7 @@
                      class="cd-col-form-label"
                      for="algorithm">Algorithm</label>
               <div class="cd-col-form-input">
-                <select class="form-control custom-select"
+                <select class="custom-select"
                         id="algorithm"
                         name="algorithm"
                         formControlName="algorithm">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
index 4cdb9935ddac1..b67a11a828a37 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
@@ -76,7 +76,7 @@
           <div class="cd-col-form-input">
             <select id="owner"
                     name="owner"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="owner"
                     [autofocus]="editing">
               <option i18n
@@ -105,7 +105,7 @@
               <select id="placement-target"
                       name="placement-target"
                       formControlName="placement-target"
-                      class="form-control custom-select">
+                      class="custom-select">
                 <option i18n
                         *ngIf="placementTargets === null"
                         [ngValue]="null">Loading...</option>
@@ -243,7 +243,7 @@
                    for="lock_mode"
                    i18n>Mode</label>
             <div class="cd-col-form-input">
-              <select class="form-control custom-select"
+              <select class="custom-select"
                       formControlName="lock_mode"
                       name="lock_mode"
                       id="lock_mode">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.html
index 288297c25b334..3f116acf6d7ca 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.html
@@ -21,7 +21,7 @@
                    [readonly]="true"
                    formControlName="type">
             <select id="type"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="type"
                     *ngIf="!editing"
                     autofocus>
@@ -44,7 +44,7 @@
                  i18n>Permission</label>
           <div class="cd-col-form-input">
             <select id="perm"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="perm">
               <option i18n
                       [ngValue]="null">-- Select a permission --</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
index 8d9a557811c05..a9a6919456d1a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
@@ -113,7 +113,7 @@
                  for="max_buckets_mode"
                  i18n>Max. buckets</label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     formControlName="max_buckets_mode"
                     name="max_buckets_mode"
                     id="max_buckets_mode"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html
index e51bc813f08df..5b44b9603736b 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html
@@ -22,7 +22,7 @@
                    [readonly]="true"
                    formControlName="user">
             <select id="user"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="user"
                     *ngIf="!viewing"
                     autofocus>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html
index 716342c9e6c9a..a94516a320391 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html
@@ -50,7 +50,7 @@
                  i18n>Permission</label>
           <div class="cd-col-form-input">
             <select id="perm"
-                    class="form-control custom-select"
+                    class="custom-select"
                     formControlName="perm">
               <option i18n
                       [ngValue]="null">-- Select a permission --</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html
index 57050d005205c..077c8ed98ad65 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html
@@ -38,7 +38,7 @@
                  for="project"
                  i18n>Project name</label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="project"
                     formControlName="project">
               <option ngValue=""
@@ -58,7 +58,7 @@
                  for="tracker"
                  i18n>Tracker</label>
           <div class="cd-col-form-input">
-            <select class="form-control custom-select"
+            <select class="custom-select"
                     id="tracker"
                     formControlName="tracker">
               <option ngValue=""
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
index 061747f113010..ff29dc4efcbbe 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
@@ -32,7 +32,7 @@
                      [formControlName]="field.name"
                      cdDimlessBinary>
               <select *ngIf="field.type === 'select'"
-                      class="form-control custom-select"
+                      class="custom-select"
                       [id]="field.name"
                       [formControlName]="field.name">
                 <option *ngIf="field?.typeConfig?.placeholder"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html
index c4a5c38d672a0..46f58660ffd3f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html
@@ -7,7 +7,7 @@
                i18n>Refresh</label>
         <select id="refreshInterval"
                 name="refreshInterval"
-                class="form-control custom-select"
+                class="custom-select"
                 (change)="changeRefreshInterval($event.target.value)"
                 [(ngModel)]="selectedInterval">
           <option *ngFor="let key of intervalKeys"
-- 
2.39.5