diff --git a/assets/toolkit/toolkit.css b/assets/toolkit/toolkit.css
index eb19b21..7aae740 100644
--- a/assets/toolkit/toolkit.css
+++ b/assets/toolkit/toolkit.css
@@ -806,6 +806,10 @@
 .kit-button__icon:empty {
     display: none;
 }
+.kit-button__label ~ .kit-button__icon {
+    margin-right: 0;
+    margin-left: 0.4em;
+}
 .kit-button__label {
     --line-clamp: 1;
     --line-clamp-height: 1em;
@@ -874,7 +878,8 @@
 }
 
 .kit-button.kit-button--icon {
-    padding: 0 0.75em;
+    padding-left: 0.75em;
+    padding-right: 0.75em;
     flex-shrink: 0;
     justify-content: center;
 }
@@ -1418,6 +1423,7 @@ select.kit-field__input:disabled ~.kit-field__hr {
     order: 110;
     position: relative;
     flex: 0 0 auto;
+    padding: 0.2em;
 }
 .kit-field__label .kit-field__arrow {
     position: absolute;
@@ -1438,13 +1444,6 @@ select.kit-field__input:disabled ~.kit-field__hr {
     transition: transform .25s cubic-bezier(0.4,0.0,0.2,1), -webkit-transform .25s cubic-bezier(0.4,0.0,0.2,1);
 }
 .kit-field__arrow-svg {
-    position: absolute;
-    right: 0;
-    top: calc(50% + 0.01em * 6);
-    transform: translate(0, -50%);
-    height: 24px;
-    width: 100%;
-    pointer-events: none;
 }
 .kit-select--open .kit-field__arrow-half-left
 {
diff --git a/templates/select.php b/templates/select.php
index aba9752..401135c 100644
--- a/templates/select.php
+++ b/templates/select.php
@@ -117,9 +117,14 @@ foreach ($arParams['OPTIONS'] as $option) {
     if($arParams['HINT']){
         app()->service()->templater()->render('kit:field/hint', ['TITLE' => $arParams['HINT']]);
     }?>
-    <?if(!$arrowInLabel){?><span class="kit-field__arrow"><?=app()->service()->templater()->get('kit:svg/chevronAnimate')?></span><?}?>
+    <?if(!$arrowInLabel){?><span class="kit-field__arrow kit-icon"><?=app()->service()->templater()->get('kit:svg/chevronAnimate')?></span><?}?>
     <span class="kit-field__display"><?=Type\Arr::get($optionSelectedArray, $arParams['OPTIONS_TEXT_KEY'])?:$arParams['PLACEHOLDER']?></span>
-    <span class="kit-field__label"><?=$arParams['LABEL']?:$arParams['NAME']?:''?><?if($arrowInLabel){?><span class="kit-field__arrow"><?=app()->service()->templater()->get('svg/chevronAnimate')?></span><?}?></span>
+    <span class="kit-field__label"><?php
+        echo $arParams['LABEL']?:$arParams['NAME']?:'';
+        if($arrowInLabel){
+            ?><span class="kit-field__arrow kit-icon-line"><?=app()->service()->templater()->get('kit:svg/chevronAnimate')?></span><?php
+        }
+        ?></span>
     <span class="kit-field__error"></span>
     <span class="kit-field__hr"></span>
     <?if($arParams['AREA_LEFT']){?><div class="kit-field__area-left"><?=$arParams['AREA_LEFT']?></div><?}?>
diff --git a/templates/svg/chevronAnimate.php b/templates/svg/chevronAnimate.php
index e7ecb2a..8850a02 100644
--- a/templates/svg/chevronAnimate.php
+++ b/templates/svg/chevronAnimate.php
@@ -1 +1 @@
-<svg class="kit-field__arrow-svg" viewBox="0 0 24 24" stroke="currentColor" focusable="false"><g transform="translate(9.7,12) rotate(45)"><path class="kit-field__arrow-half-left" d="M-4.2 0 L4.2 0" stroke-width="2"></path></g><g transform="translate(14.3,12) rotate(-45)"><path class="kit-field__arrow-half-right" d="M-4.2 0 L4.2 0" stroke-width="2"></path></g></svg>
\ No newline at end of file
+<svg class="kit-field__arrow-svg" viewBox="0 0 24 24" stroke="currentColor" focusable="false"><g transform="translate(7.1,12) rotate(45)"><path class="kit-field__arrow-half-left" d="M-8 0 L8 0" stroke-width="2.4"></path></g><g transform="translate(16.8,12) rotate(-45)"><path class="kit-field__arrow-half-right" d="M-8 0 L8 0" stroke-width="2.4"></path></g></svg>
\ No newline at end of file