diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index d0260200709..fa70e427a8f 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -219,7 +219,7 @@ input {
     color: var(--primary);
     background-color: var(--secondary);
     border: 1px solid var(--primary-medium);
-    border-radius: 0;
+    border-radius: var(--d-input-border-radius);
     &:focus {
       @include default-focus;
     }
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 9b1b852d21c..25bdbeac1e2 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -158,7 +158,6 @@ body.invite-page {
       input,
       .select-kit-header {
         padding: 0.75em 0.77em;
-        border-radius: 0.25em;
         min-width: 250px;
         box-shadow: none;
         margin-bottom: 0.25em;
@@ -186,7 +185,6 @@ body.invite-page {
         left: 1em;
         top: 10px;
         box-shadow: 0 0 0 0px rgba(var(--tertiary-rgb), 0);
-        border-radius: 0.25em;
         transition: 0.2s ease all;
       }
       .user-field.dropdown label.control-label {
@@ -235,7 +233,6 @@ body.invite-page {
       input {
         width: 100%;
         padding: 0.75em 0.5em;
-        border-radius: 0.25em;
         min-width: 250px;
         box-shadow: none;
         margin-bottom: 2em;
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index aa341987d75..b3b68645983 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -21,6 +21,7 @@
   font-weight: normal;
   color: $text-color;
   background: $bg-color;
+  border-radius: var(--d-button-border-radius);
   cursor: pointer;
   transition: all 0.25s;
   .d-icon {
@@ -178,6 +179,7 @@
   color: #000;
   background: #fff;
   border: 1px solid transparent;
+  border-radius: var(--d-border-radius);
   &:hover,
   &:focus {
     box-shadow: shadow("card");
@@ -340,6 +342,7 @@
 }
 
 .btn-mini-toggle {
+  border-radius: var(--d-border-radius);
   padding: 0.4em 0.467em;
   .d-icon {
     color: var(--primary-high);
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 8318d105c43..89137902c8f 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -31,6 +31,7 @@
     > a,
     button {
       border: none;
+      border-radius: var(--d-nav-pill-border-radius);
       padding: 6px 12px;
       color: var(--primary);
       font-size: var(--font-up-1);
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 15ea1164be7..48fa3c633fb 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -25,6 +25,7 @@
   background-color: var(--secondary);
   position: relative;
   border: 1px solid var(--primary-medium);
+  border-radius: var(--d-input-border-radius);
   min-height: 0;
 
   textarea {
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 56d9b5b1fc1..cf8a1bc0fad 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -18,6 +18,10 @@ $reply-area-max-width: 1475px !default;
   --topic-body-width: #{$topic-body-width};
   --topic-body-width-padding: #{$topic-body-width-padding};
   --topic-avatar-width: #{$topic-avatar-width};
+  --d-border-radius: initial;
+  --d-nav-pill-border-radius: var(--d-border-radius);
+  --d-button-border-radius: var(--d-border-radius);
+  --d-input-border-radius: var(--d-border-radius);
 }
 
 $d-sidebar-width: 16em !default;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index ca5be8d47e0..f19d38e91f2 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -74,6 +74,7 @@
     display: flex;
     align-items: stretch;
     &:not(.btn) {
+      border-radius: var(--d-input-border-radius);
       padding-left: 0.5em;
       padding-right: 0.5em;
     }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 7eeb12aa2c0..39d4a028785 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -50,6 +50,7 @@
       margin-right: 0;
       font-size: var(--font-down-1);
       border: 1px solid var(--primary-medium);
+      border-radius: var(--d-input-border-radius);
     }
     > li > a {
       line-height: var(--line-height-large);