diff --git a/src/defaultV2-theme/blocks/sd-progress-buttons.scss b/src/defaultV2-theme/blocks/sd-progress-buttons.scss
index ccb55e3792..d80b4daa30 100644
--- a/src/defaultV2-theme/blocks/sd-progress-buttons.scss
+++ b/src/defaultV2-theme/blocks/sd-progress-buttons.scss
@@ -18,12 +18,12 @@
   padding: calcSize(4) calcSize(5) calcSize(2) calcSize(5);
   display: flex;
   flex-direction: column;
-  transition: 0.25s padding ease-out;
 }
 
 .sd-progress-buttons__list-container {
   display: flex;
   overflow: hidden;
+  margin: 0 calcSize(-0.75);
 }
 
 .sd-progress-buttons__connector {
@@ -81,14 +81,14 @@
 
       .sd-progress-buttons__button-background {
         position: absolute;
-        width: 100%;
-        height: 100%;
+        width: calcSize(2.5);
+        height: calcSize(2);
         top: calcSize(-0.5);
-        left: calcSize(-0.5);
+        left: calcSize(-1.25);
         background-color: $background-dim;
         z-index: -2;
-        border: calcSize(0.5) solid $background-dim;
-        border-radius: 50%;
+        // border: calcSize(0.5) solid $background-dim;
+        // border-radius: 50%;
       }
 
       .sd-progress-buttons__button-content {
@@ -109,11 +109,15 @@
 
   li:hover .sd-progress-buttons__button {
     color: $primary;
-    padding: calcSize(0.25);
+    padding: calcSize(0.5);
     margin: calcSize(0.25);
-    border: calcSize(0.75) solid $primary;
+    border: calcSize(0.5) solid $primary;
     background-color: $primary-foreground;
 
+    .sd-progress-buttons__button-background {
+      left: calcSize(-0.75);
+    }
+
     .sd-progress-buttons__button-content {
       top: calcSize(-0.75);
       left: calcSize(-0.75);
@@ -149,8 +153,12 @@
       border: calcSize(0.5) solid $primary;
       background-color: $primary-foreground;
       color: $primary;
-      padding: calcSize(0.25);
-      margin: calcSize(0.5);
+      padding: calcSize(0.5);
+      margin: calcSize(0.25);
+
+      .sd-progress-buttons__button-background {
+        left: calcSize(-0.75);
+      }
 
       .sd-progress-buttons__button-content {
         border: calcSize(0.5) solid $primary;
@@ -225,6 +233,10 @@
 }
 
 .sd-progress-buttons--numbered {
+  .sd-progress-buttons__list-container {
+    margin: 0 calcSize(-1);
+  }
+
   .sd-progress-buttons__list {
     li {
       &:not(:first-child)>.sd-progress-buttons__connector {
@@ -236,15 +248,27 @@
       .sd-progress-buttons__button {
         width: calcSize(2);
         height: calcSize(2);
+
+        .sd-progress-buttons__button-background {
+          height: calcSize(3);
+          width: calcSize(4.5);
+        }
+
       }
 
       &:hover .sd-progress-buttons__button {
-        padding: calcSize(0.25);
+        padding: calcSize(0.5);
       }
     }
   }
 }
 
+.sd-progress-buttons--with-titles {
+  .sd-progress-buttons__list-container {
+    margin: 0;
+  }
+}
+
 .sd-root-modern--mobile,
 .sd-progress-buttons--no-titles {
   .sd-progress-buttons__list {
diff --git a/src/progress-buttons.ts b/src/progress-buttons.ts
index 0afad2842d..cb6c4992d5 100644
--- a/src/progress-buttons.ts
+++ b/src/progress-buttons.ts
@@ -97,7 +97,7 @@ export class ProgressButtons extends Base {
   }
   public get progressWidth(): string {
     if (this.isFitToSurveyWidth) {
-      return this.survey.width;
+      return this.survey.renderedWidth;
     }
     return "";
   }
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-custom-navigation.png b/visualRegressionTests/tests/defaultV2/etalons/survey-custom-navigation.png
index 50aa5381ed..4565e3edbf 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-custom-navigation.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-custom-navigation.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bootstrap.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bootstrap.png
index 3c7cf9bfec..92fbebc7ce 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bootstrap.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bootstrap.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom-brand.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom-brand.png
index eb2113e326..12a3883491 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom-brand.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom-brand.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom.png
index ea024d5414..ec876b5e48 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-bottom.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-current.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-current.png
index f43ba0c8d6..d13a5dffc1 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-current.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-current.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-next.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-next.png
index 6754c0657b..b21a71710a 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-next.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-next.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-visited.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-visited.png
index 78cbc183cc..9e7002905a 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-visited.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-buttons-hover-visited.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-current.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-current.png
index 17f0117f90..5110996160 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-current.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-current.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-next.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-next.png
index 2f56ce3f5a..f243d540ee 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-next.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-next.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-visited.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-visited.png
index 4e1ca8dda7..f83d1e8721 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-visited.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-hover-visited.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-and-toc.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-and-toc.png
index caecced8de..85eab01f5a 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-and-toc.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-and-toc.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons-mobile.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons-mobile.png
index 33ad02c6d3..849ae3e54a 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons-mobile.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons-mobile.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons.png
index aff86b85f5..81014b8f24 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-bottom-buttons.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons-mobile.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons-mobile.png
index 47688ef392..4272d70fd2 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons-mobile.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons-mobile.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons.png
index a736e210a4..1fadfd0d54 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-buttons.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons-mobile.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons-mobile.png
index bd397365b7..db37ffa6f8 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons-mobile.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons-mobile.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons.png
index f2a4165f09..46efd2a9fe 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-numbered-buttons.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-pages-sticky.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-pages-sticky.png
index b39f02866d..4dc110e2ae 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-pages-sticky.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-pages-sticky.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-rtl.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-rtl.png
index 44ec98a54d..d8cfb28d8d 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-rtl.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-rtl.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static-1400.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static-1400.png
index 0a234c9262..0116d19858 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static-1400.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static-1400.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static.png
index 5c7e5b913c..a8f727e07b 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top-survey-width-static.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top.png b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top.png
index c4db37b343..14098e7dc4 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-progress-bar-top.png differ
diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-without-tilte-and-with-progress.png b/visualRegressionTests/tests/defaultV2/etalons/survey-without-tilte-and-with-progress.png
index d334cbb0ad..927dfaa4c3 100644
Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-without-tilte-and-with-progress.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-without-tilte-and-with-progress.png differ