diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 5c829cec4..5bf91f351 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -122,6 +122,7 @@
         .dialog {
             & > div {
                 background-color: @cp_alertify-bg;
+                border-radius: @variables_radius_L;
                 &.half {
                     width: 50%;
                     max-width: 50%;
@@ -205,6 +206,8 @@
                         box-sizing: border-box;
                         padding: 0 15px;
                         cursor: pointer;
+                        border-top-left-radius: @variables_radius;
+                        border-top-right-radius: @variables_radius;
                         &:not(.disabled):hover {
                             background-color: @cp_alertify-hover;
                         }
diff --git a/customize.dist/src/less2/include/checkmark.less b/customize.dist/src/less2/include/checkmark.less
index f638cb8cf..f41f1bcb8 100644
--- a/customize.dist/src/less2/include/checkmark.less
+++ b/customize.dist/src/less2/include/checkmark.less
@@ -1,5 +1,6 @@
 @import (reference) "./colortheme-all.less";
 @import (reference) "./tools.less";
+@import (reference) "./variables.less";
 
 .checkmark_vars(
     @size: 20px
@@ -39,6 +40,9 @@
         align-items: center;
         position: relative;
         .tools_unselectable();
+        .cp-checkmark-mark {
+            border-radius: @variables_radius;
+        }
 
         & > a {
             margin-left: 0.25em;
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 30c2e9197..5d6b334fa 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -14,6 +14,7 @@
         color: @cp_forms-fg;
         background-color: @cp_forms-bg;
         border: 1px solid @cp_forms-border;
+        border-radius: @variables_radius;
         font-size: 100%;
         padding: @alertify_padding-base;
         &:not(.tui-full-calendar-content) {
@@ -79,11 +80,15 @@
         }
         button {
             margin: 0 !important;
+            border-bottom-left-radius: 0px;
+            border-bottom-right-radius: 0px;
         }
         .cp-button-timer {
             height: 3px;
             & > div {
                 height: 100%;
+                border-bottom-left-radius: 3px;
+                border-bottom-right-radius: 3px;
                 background-color: @cp_buttons-primary;
                 &.danger, &.btn-danger, &.danger-alt, &.btn-danger-alt {
                     background-color: @cp_buttons-red;
@@ -109,7 +114,7 @@
         font-size: 14px;
         text-decoration: none;
         cursor: pointer;
-        border-radius: 0;
+        border-radius: @variables_radius;
         transition: none;
 
         i, .fa, .cptools {
@@ -230,7 +235,7 @@
         margin: 0px 0px @alertify_padding-base 0px;
         font-size: 12px;
         padding: 5px;
-        border-radius: 0px;
+        border-radius: @variables_radius;
         i {
             margin-right: 10px;
         }
@@ -303,7 +308,7 @@
         .flatpickr-calendar {
             background: @cp_flatpickr-bg;
             color: @cryptpad_text_col;
-            border-radius: 0;
+            border-radius: @variables_radius;
             box-shadow: @variables_shadow;
             -webkit-box-shadow: @variables_shadow;
             &.arrowTop::before, &.arrowTop::after {
diff --git a/customize.dist/src/less2/include/tokenfield.less b/customize.dist/src/less2/include/tokenfield.less
index e71d43c96..306176842 100644
--- a/customize.dist/src/less2/include/tokenfield.less
+++ b/customize.dist/src/less2/include/tokenfield.less
@@ -35,6 +35,12 @@
                 flex: 1;
                 min-width: 0 !important;
             }
+            button {
+                // no radius in input + button combo
+                // input .token-input is styled at the bottom of this file
+                border-top-left-radius: 0px;
+                border-bottom-left-radius: 0px;
+            }
         }
         .token {
             box-sizing: border-box;
@@ -92,6 +98,8 @@
             max-width: 100%;
             width: 100%;
             min-width: 100% !important;
+            border-top-right-radius: 0px !important;
+            border-bottom-right-radius: 0px !important;
             &:focus {
                 outline: 0;
                 box-shadow: none;