diff --git a/src/defaultV2-theme/blocks/sd-boolean.scss b/src/defaultV2-theme/blocks/sd-boolean.scss
index be75116c82..722a1da51d 100644
--- a/src/defaultV2-theme/blocks/sd-boolean.scss
+++ b/src/defaultV2-theme/blocks/sd-boolean.scss
@@ -1,8 +1,3 @@
-.sd-boolean-root {
-  box-shadow: $shadow-inner;
-  border-radius: calcSize(12.5);
-}
-
 .sd-boolean {
   display: flex;
   width: max-content;
@@ -10,8 +5,12 @@
   gap: calcSize(0.5);
   padding: calcSize(0.5);
   background-color: $editor-background;
-  box-shadow: $shadow-inner;
   border-radius: calcSize(12.5);
+  box-shadow: $shadow-inner;
+
+  &.sd-boolean--allowhover:focus-within {
+    box-shadow: 0 0 0 2px $primary;
+  }
 }
 
 .sd-boolean__thumb,
@@ -38,10 +37,6 @@
   border-radius: calcSize(12.5);
 }
 
-.sd-boolean__control:focus~.sd-boolean__switch {
-  box-shadow: inset 0 0 0 2px $primary;
-}
-
 .sd-boolean.sd-boolean--indeterminate .sd-boolean__switch {
   display: none;
 }
diff --git a/src/defaultV2-theme/blocks/sd-question.scss b/src/defaultV2-theme/blocks/sd-question.scss
index 238f970eea..a3fdeaf43e 100644
--- a/src/defaultV2-theme/blocks/sd-question.scss
+++ b/src/defaultV2-theme/blocks/sd-question.scss
@@ -183,6 +183,6 @@
 
 .sd-scrollable-container:not(.sd-scrollable-container--compact) {
   width: max-content;
-  overflow-x: hidden;
+  overflow: visible;
   max-width: 100%;
 }
\ No newline at end of file
diff --git a/src/defaultV2-theme/blocks/sd-rating.scss b/src/defaultV2-theme/blocks/sd-rating.scss
index 68fd9593ae..466f60c269 100644
--- a/src/defaultV2-theme/blocks/sd-rating.scss
+++ b/src/defaultV2-theme/blocks/sd-rating.scss
@@ -26,10 +26,6 @@
       flex-wrap: wrap;
     }
   }
-
-  &.sd-scrollable-container:not(.sd-scrollable-container--compact) {
-    overflow: visible;
-  }
 }
 
 .sd-rating--small {
diff --git a/visualRegressionTests/tests/defaultV2/boolean.ts b/visualRegressionTests/tests/defaultV2/boolean.ts
index c889f88f80..259a92126f 100644
--- a/visualRegressionTests/tests/defaultV2/boolean.ts
+++ b/visualRegressionTests/tests/defaultV2/boolean.ts
@@ -1,5 +1,5 @@
 import { Selector, ClientFunction } from "testcafe";
-import { url, frameworks, initSurvey, setOptions, url_test, explicitErrorHandler, takeElementScreenshot, wrapVisualTest } from "../../helper";
+import { url, frameworks, initSurvey, setOptions, url_test, explicitErrorHandler, takeElementScreenshot, wrapVisualTest, resetFocusToBody } from "../../helper";
 
 const title = "Boolean Screenshot";
 
@@ -33,6 +33,7 @@ frameworks.forEach(framework => {
       });
       const questionRoot = Selector(".sd-question--boolean");
       await t.wait(1000);
+      await resetFocusToBody();
       await takeElementScreenshot("boolean-question-indeterminate.png", questionRoot, t, comparer);
 
       await t.hover(".sd-boolean__thumb-ghost");
diff --git a/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate-hovered.png b/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate-hovered.png
index a463a064d9..b94f461359 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate-hovered.png and b/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate-hovered.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate.png b/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate.png
index 9f903efb77..68e1155e98 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate.png and b/visualRegressionTests/tests/defaultV2/etalons/boolean-question-indeterminate.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/boolean-question-word-wrap.png b/visualRegressionTests/tests/defaultV2/etalons/boolean-question-word-wrap.png
index 38b2a63cea..85c013393b 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/boolean-question-word-wrap.png and b/visualRegressionTests/tests/defaultV2/etalons/boolean-question-word-wrap.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-above.png b/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-above.png
index 9cae3d2301..239bd5aee3 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-above.png and b/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-above.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-below.png b/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-below.png
index de46f8fd73..f84aa72046 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-below.png and b/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-errors-below.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-title-left-and-errors-above.png b/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-title-left-and-errors-above.png
index 6239b8bb7a..6d21b67255 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-title-left-and-errors-above.png and b/visualRegressionTests/tests/defaultV2/etalons/panel-with-question-title-left-and-errors-above.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-with-panel-compact.png b/visualRegressionTests/tests/defaultV2/etalons/survey-with-panel-compact.png
index 857b3df847..dcb8a1bc74 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-with-panel-compact.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-with-panel-compact.png differ