diff --git a/templates/cassiopeia/scss/vendor/choicesjs/choices.scss b/templates/cassiopeia/scss/vendor/choicesjs/choices.scss
index a4c2c997f1..4780f06cc8 100644
--- a/templates/cassiopeia/scss/vendor/choicesjs/choices.scss
+++ b/templates/cassiopeia/scss/vendor/choicesjs/choices.scss
@@ -40,23 +40,43 @@
 }
 
 .choices[data-type*="select-one"] {
+  .choices__inner {
+    padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
+    background: url("../../../images/select-bg.svg") no-repeat right center / $custom-select-bg-size;
+    background-color: $custom-select-bg;
+
+    [dir=rtl] & {
+      padding: $custom-select-padding-y $custom-select-padding-x $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding);
+      background: url("../../../images/select-bg-rtl.svg") no-repeat left center / $custom-select-bg-size;
+      background-color: $custom-select-bg;
+    }
+  }
+}
+
+
+.choices[data-type*="select-one"],
+.choices[data-type*="select-multiple"],
+.choices[data-type*="text"] {
+  .choices__item {
+    position: relative;
+    font-size: 1rem;
+    line-height: 1;
+  }
+
   .choices__button_joomla {
     position: absolute;
-    top: 50%;
-    right: 0;
-    width: 20px;
-    height: 20px;
+    right: -1em;
     padding: 0;
-    margin-top: -10px;
-    margin-right: 45px;
-    border-radius: 10em;
+    width: 1em;
+    height: 1em;
+    font-size: 1rem;
+    line-height: 1;
+    border-radius: $border-radius;
     opacity: .5;
 
     [dir=rtl] & {
       right: auto;
-      left: 0;
-      margin-right: 0;
-      margin-left: 45px;
+      left: -1em;
     }
 
     &:hover,
@@ -72,34 +92,18 @@
   &::after {
     display: none;
   }
-
-  .choices__inner {
-    padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
-    background: url("../../../images/select-bg.svg") no-repeat right center / $custom-select-bg-size;
-    background-color: $custom-select-bg;
-
-    [dir=rtl] & {
-      padding: $custom-select-padding-y $custom-select-padding-x $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding);
-      background: url("../../../images/select-bg-rtl.svg") no-repeat left center / $custom-select-bg-size;
-      background-color: $custom-select-bg;
-    }
-  }
 }
 
 .choices[data-type*="select-multiple"],
 .choices[data-type*="text"] {
+
   .choices__button_joomla {
     position: relative;
     display: inline-block;
-    width: 8px;
-    padding-left: 16px;
-    margin-top: 0;
-    margin-right: -4px;
-    margin-bottom: 0;
-    margin-left: 8px;
-    line-height: 1;
+    right: 0;
+    margin-left: .25em;
+    border-radius: 0;
     border-left: 1px solid hsl(187, 100%, 32%);
-    opacity: .75;
 
     &:hover,
     &:focus {
@@ -109,6 +113,13 @@
     &::before {
       color: $white;
     }
+
+    [dir=rtl] & {
+      right: auto;
+      left: 0;
+      margin-right: .25em;
+      margin-left: unset;
+    }
   }
 }