diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss
index 8010c1ed8f..4a0099ccae 100644
--- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss
+++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss
@@ -24,11 +24,11 @@
 }
 .spg-dropdown_chevron-button {
     width: var(--ctr-editor-button-icon-width, calcSize(3));
-    height: var(--ctr-editor-button-icon-height, calcSize(3));
     padding: var(--ctr-editor-button-padding-top, calcSize(1)) var(--ctr-editor-button-padding-right, calcSize(1))
         var(--ctr-editor-button-padding-bottom, calcSize(1)) var(--ctr-editor-button-padding-left, calcSize(1));
     inset-block-start: var(--ctr-editor-padding-top, calcSize(0.5));
     inset-inline-end: var(--ctr-editor-padding-right, calcSize(0.5));
+    inset-block-end: var(--ctr-editor-padding-bottom, calcSize(0.5));
 
     &:hover,
     &:focus {
diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss
index 3aac98bf82..84026b2d0b 100644
--- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss
+++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss
@@ -61,6 +61,10 @@ input.spg-input:read-only::placeholder {
     var(--ctr-editor-button-padding-bottom, calcSize(1)) var(--ctr-editor-button-padding-left, calcSize(1));
   line-height: 0;
   transition: background $creator-transition-duration, opacity $creator-transition-duration;
+  align-self: stretch;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 
   &:focus,
   &:hover {
@@ -78,6 +82,10 @@ input.spg-input:read-only::placeholder {
   }
 }
 
+.spg-input-container--multiline .spg-input__edit-button {
+  align-self: flex-end;
+}
+
 .spg-input__edit-button--disabled,
 .spg-input__edit-button:disabled {
   opacity: var(--ctr-editor-button-icon-opacity-disabled, 0.25);