diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html
index 3f4f04d9bf6..21956cb39a6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html
@@ -48,7 +48,7 @@
               class="bold">Features</td>
           <td>
             <span *ngFor="let feature of selectedItem.features_name">
-              <span class="badge badge-pill badge-dark mr-2">{{ feature }}</span>
+              <span class="badge badge-dark mr-2">{{ feature }}</span>
             </span>
           </td>
         </tr>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.html
index df6ff98cce4..1ceac7b25da 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.html
@@ -58,7 +58,7 @@
           <td>
             <span *ngFor="let flag of selectedItem.flags">
               <span title="{{ flags[flag] }}">
-                <span class="badge badge-pill badge-dark mr-2">{{ flag | uppercase }}</span>
+                <span class="badge badge-dark mr-2">{{ flag | uppercase }}</span>
               </span>
             </span>
           </td>
@@ -68,7 +68,7 @@
               class="bold">Services</td>
           <td>
             <span *ngFor="let service of selectedItem.services">
-              <span class="badge badge-pill badge-dark mr-2">{{ service }}</span>
+              <span class="badge badge-dark mr-2">{{ service }}</span>
             </span>
           </td>
         </tr>
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 0f535cb810a..94ba92f099a 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
@@ -86,7 +86,7 @@
           <div class="col-sm-9">
             <span *ngFor="let service of configForm.getValue('services')"
                   class="form-component-badge">
-              <span class="badge badge-pill badge-dark">{{ service }}</span>
+              <span class="badge badge-dark">{{ service }}</span>
             </span>
           </div>
         </div>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html
index 33eeb80ffc9..0f23aee87aa 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html
@@ -11,7 +11,7 @@
 </cd-select>
 
 <span *ngFor="let dataItem of data">
-  <span class="badge badge-pill badge-dark mr-2">
+  <span class="badge badge-dark mr-2">
     <span class="mr-2">{{ dataItem }}</span>
     <a class="badge-remove"
        (click)="cdSelect.removeItem(dataItem)">
diff --git a/src/pybind/mgr/dashboard/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss
index 4554edfc3a0..60d5651e05f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/styles.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles.scss
@@ -122,15 +122,6 @@ option {
   }
 }
 
-.btn-secondary,
-.btn-light {
-  border-radius: $button-radius;
-}
-
-form .input-group .btn-light {
-  border-radius: $border-radius;
-}
-
 // We have some inputs that don't have a corresponding formControlName,
 // to be able to get the same styling and no JS errors we need use a different
 // class name
diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/defaults.scss b/src/pybind/mgr/dashboard/frontend/src/styles/defaults.scss
index 145937fc2d3..288730d040a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/styles/defaults.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles/defaults.scss
@@ -77,9 +77,6 @@ $color-error-btn-border: $color-pink !default;
 $color-noscript-text: $color-mild-gray !default;
 $color-required-text: $color-pink !default;
 
-/*Button*/
-$button-radius: 1.875rem !default;
-
 /*Login*/
 $color-login-row-text: $color-solid-white !default;
 $color-login-row-bg: $color-secondary !default;