diff --git a/src/defaultV2-theme/blocks/sd-context-btn.scss b/src/defaultV2-theme/blocks/sd-context-btn.scss
index ce8ffc80f8..0dc7e3ed8e 100644
--- a/src/defaultV2-theme/blocks/sd-context-btn.scss
+++ b/src/defaultV2-theme/blocks/sd-context-btn.scss
@@ -48,17 +48,29 @@
   }
 }
 .sd-context-btn--with-border {
-  border: 1px solid $border-inside;
+  --box-shadow-color: #{$border-inside};
+  box-shadow: 0 0 0 1px var(--box-shadow-color);
+}
+.sd-context-btn--colorful {
+  use {
+    fill: $primary;
+  }
+  &.sd-context-btn--negative {
+    use {
+      fill: red;
+    }
+  }
 }
 .sd-context-btn--colorful:focus,
 .sd-context-btn--colorful:hover {
-  border-color: $primary;
   background: linear-gradient($primary-light, $primary-light), linear-gradient($background, $background);
-  &.sd-context-btn--with-border {
-    border-color: $primary;
-  }
   &.sd-context-btn--negative {
-    border-color: $red;
     background: linear-gradient($red-light, $red-light), linear-gradient($background, $background);
   }
+  &.sd-context-btn--with-border {
+    --box-shadow-color: #{$primary};
+    &.sd-context-btn--negative {
+      --box-shadow-color: #{$red};
+    }
+  }
 }
diff --git a/src/defaultV2-theme/variables.scss b/src/defaultV2-theme/variables.scss
index 84900dbf85..50f6fe4417 100644
--- a/src/defaultV2-theme/variables.scss
+++ b/src/defaultV2-theme/variables.scss
@@ -168,7 +168,7 @@ $matrix-row-fade-out-duration: var(--sjs-matrix-row-fade-out-duration, 100ms);
 $matrix-row-move-out-duration: var(--sjs-matrix-row-move-out-duration, 250ms);
 $matrix-row-move-out-delay: var(--sjs-matrix-row-move-out-delay, 100ms);
 
-$matrix-detail-row-fade-in-duration: var(--sjs--fade-in-duration, 500ms);
+$matrix-detail-row-fade-in-duration: var(--sjs-matrix-detail-row-fade-in-duration, 500ms);
 $matrix-detail-row-move-in-duration: var(--sjs-matrix-detail-row-move-in-duration, 150ms);
 $matrix-detail-row-fade-in-delay: var(--sjs-matrix-detail-row-fade-in-delay, 150ms);
 $matrix-detail-row-fade-out-duration: var(--sjs-matrix-detail-row-fade-out-duration, 150ms);
@@ -195,7 +195,6 @@ $pd-tab-remove-fade-out-duration: var(--sjs-pd-tab-remove-fade-out-duration, 150
 $pd-tab-remove-fade-out-delay: var(--sjs-pd-tab-remove-fade-out-delay, 0ms);
 $pd-tab-remove-fade-in-delay: var(--sjs-pd-tab-remove-fade-in-delay, 150ms);
 
-
 $pd-list-fade-in-duration: var(--sjs-pd-list-fade-in-duration, 500ms);
 $pd-list-move-in-duration: var(--sjs-pd-list-move-in-duration, 250ms);
 $pd-list-fade-in-delay: var(--sjs-pd-list-fade-in-delay, 250ms);
diff --git a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-big-images.png b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-big-images.png
index 4b215204d3..1f86efa1e4 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-big-images.png and b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-big-images.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-mobile.png b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-mobile.png
index ddd0db0776..3630f62430 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-mobile.png and b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-mobile.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-remove-hovered.png b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-remove-hovered.png
index a49964f6d0..5ddc7ffffa 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-remove-hovered.png and b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-remove-hovered.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-small-images.png b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-small-images.png
index c71be63e0e..ada4829514 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-small-images.png and b/visualRegressionTests/tests/defaultV2/etalons/file-question-multiple-small-images.png differ