diff --git a/src/assets/stylesheets/Button.scss b/src/assets/stylesheets/Button.scss
index 1cdf50081..4d507c1af 100644
--- a/src/assets/stylesheets/Button.scss
+++ b/src/assets/stylesheets/Button.scss
@@ -35,7 +35,7 @@
 
   &--primary {
     background-color: var(--rpf-button-primary-background-color);
-    border-radius: $space-0-5;
+    border-radius: var(--rpf-primary-button-radius, $space-0-5);
 
     color: var(--rpf-button-primary-text-color);
 
@@ -56,7 +56,7 @@
     &:hover,
     .btn-outer:hover & {
       background-color: var(--rpf-button-primary-background-color-hover);
-      border-radius: $space-0-5;
+      border-radius: var(--rpf-primary-button-radius, $space-0-5);
     }
 
     &:disabled {
@@ -237,11 +237,15 @@
       }
 
       &:hover {
-        background-color: var(--rpf-button-tertiary-danger-background-color-hover);
+        background-color: var(
+          --rpf-button-tertiary-danger-background-color-hover
+        );
       }
 
       &:active {
-        background-color: var(--rpf-button-tertiary-danger-background-color-active);
+        background-color: var(
+          --rpf-button-tertiary-danger-background-color-active
+        );
       }
     }
   }
diff --git a/src/assets/stylesheets/ProjectBar.scss b/src/assets/stylesheets/ProjectBar.scss
index 6041e50cb..16c1e7702 100644
--- a/src/assets/stylesheets/ProjectBar.scss
+++ b/src/assets/stylesheets/ProjectBar.scss
@@ -16,6 +16,24 @@
     justify-content: left;
   }
 
+  .btn {
+    border-radius: var(--project-bar-button-radius, $space-0-5);
+    &:hover,
+    &:active,
+    &:focus-visible,
+    &::before {
+      border-radius: var(--project-bar-button-radius, $space-0-5);
+    }
+  }
+
+  .btn--save {
+    @container (min-width: 560px) {
+      .icon {
+        display: none;
+      }
+    }
+  }
+
   .project-name {
     border-inline-end: 1px solid var(--editor-color-outline);
     margin-inline-end: -1px;
@@ -28,18 +46,9 @@
     }
   }
 
-  .btn--save {
-    border-radius: $space-0-5;
-    @container (min-width: 560px) {
-      .icon {
-        display: none;
-      }
-    }
-  }
-
   .project-bar__btn-wrapper {
     display: flex;
-    block-size:  100%;
+    block-size: 100%;
   }
 
   .project-bar__btn-wrapper:not(:last-child) {