diff --git a/src/framework/theme/styles/global/bootstrap/_button-group.scss b/src/framework/theme/styles/global/bootstrap/_button-group.scss
index ee5c4934e1..3f3e7d4499 100644
--- a/src/framework/theme/styles/global/bootstrap/_button-group.scss
+++ b/src/framework/theme/styles/global/bootstrap/_button-group.scss
@@ -97,42 +97,74 @@
       @include nb-ltr() {
         border-top-left-radius: nb-theme(btn-border-radius);
         border-bottom-left-radius: nb-theme(btn-border-radius);
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
       };
       @include nb-rtl() {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
         border-top-right-radius: nb-theme(btn-border-radius);
         border-bottom-right-radius: nb-theme(btn-border-radius);
       };
     }
     &:last-child {
       @include nb-ltr() {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
         border-top-right-radius: nb-theme(btn-border-radius);
         border-bottom-right-radius: nb-theme(btn-border-radius);
       };
       @include nb-rtl() {
         border-top-left-radius: nb-theme(btn-border-radius);
         border-bottom-left-radius: nb-theme(btn-border-radius);
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
       };
     }
   }
 
   .btn-group.dropdown {
     & > .btn:first-of-type.dropdown-toggle {
-      @include nb-ltr(border-top-left-radius, nb-theme(btn-border-radius));
-      @include nb-rtl(border-top-right-radius, nb-theme(btn-border-radius));
+      @include nb-ltr() {
+        border-top-left-radius: nb-theme(btn-border-radius);
+        border-top-right-radius: 0;
+      };
+      @include nb-rtl() {
+        border-top-left-radius: 0;
+        border-top-right-radius: nb-theme(btn-border-radius);
+      };
     }
     & > .btn:last-of-type.dropdown-toggle {
-      @include nb-ltr(border-top-right-radius, nb-theme(btn-border-radius));
-      @include nb-rtl(border-top-left-radius, nb-theme(btn-border-radius));
+      @include nb-ltr() {
+        border-top-left-radius: 0;
+        border-top-right-radius: nb-theme(btn-border-radius);
+      };
+      @include nb-rtl() {
+        border-top-left-radius: nb-theme(btn-border-radius);
+        border-top-right-radius: 0;
+      };
     }
 
     &:not(.show) {
       & > .btn:first-of-type.dropdown-toggle {
-        @include nb-ltr(border-bottom-left-radius, nb-theme(btn-border-radius));
-        @include nb-rtl(border-bottom-right-radius, nb-theme(btn-border-radius));
+        @include nb-ltr() {
+          border-bottom-left-radius: nb-theme(btn-border-radius);
+          border-bottom-right-radius: 0;
+        };
+        @include nb-rtl() {
+          border-bottom-left-radius: 0;
+          border-bottom-right-radius: nb-theme(btn-border-radius);
+        };
       }
       & > .btn:last-of-type.dropdown-toggle {
-        @include nb-ltr(border-bottom-right-radius, nb-theme(btn-border-radius));
-        @include nb-rtl(border-bottom-left-radius, nb-theme(btn-border-radius));
+        @include nb-ltr() {
+          border-bottom-left-radius: 0;
+          border-bottom-right-radius: nb-theme(btn-border-radius);
+        };
+        @include nb-rtl() {
+          border-bottom-left-radius: nb-theme(btn-border-radius);
+          border-bottom-right-radius: 0;
+        };
       }
     }
 
@@ -144,22 +176,46 @@
 
   .btn-group.dropup {
     & > .btn:first-of-type.dropdown-toggle {
-      @include nb-ltr(border-bottom-left-radius, nb-theme(btn-border-radius));
-      @include nb-rtl(border-bottom-right-radius, nb-theme(btn-border-radius));
+      @include nb-ltr() {
+        border-bottom-left-radius: nb-theme(btn-border-radius);
+        border-bottom-right-radius: 0;
+      };
+      @include nb-rtl() {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: nb-theme(btn-border-radius);
+      };
     }
     & > .btn:last-of-type.dropdown-toggle {
-      @include nb-ltr(border-bottom-right-radius, nb-theme(btn-border-radius));
-      @include nb-rtl(border-bottom-left-radius, nb-theme(btn-border-radius));
+      @include nb-ltr() {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: nb-theme(btn-border-radius);
+      };
+      @include nb-rtl() {
+        border-bottom-left-radius: nb-theme(btn-border-radius);
+        border-bottom-right-radius: 0;
+      };
     }
 
     &:not(.show) {
       & > .btn:first-of-type.dropdown-toggle {
-        @include nb-ltr(border-top-left-radius, nb-theme(btn-border-radius));
-        @include nb-rtl(border-top-right-radius, nb-theme(btn-border-radius));
+        @include nb-ltr() {
+          border-top-left-radius: nb-theme(btn-border-radius);
+          border-top-right-radius: 0;
+        };
+        @include nb-rtl() {
+          border-top-left-radius: 0;
+          border-top-right-radius: nb-theme(btn-border-radius);
+        };
       }
       & > .btn:last-of-type.dropdown-toggle {
-        @include nb-ltr(border-top-right-radius, nb-theme(btn-border-radius));
-        @include nb-rtl(border-top-left-radius, nb-theme(btn-border-radius));
+        @include nb-ltr() {
+          border-top-left-radius: 0;
+          border-top-right-radius: nb-theme(btn-border-radius);
+        };
+        @include nb-rtl() {
+          border-top-left-radius: nb-theme(btn-border-radius);
+          border-top-right-radius: 0;
+        };
       }
     }
 
diff --git a/src/framework/theme/styles/global/bootstrap/_custom-forms.scss b/src/framework/theme/styles/global/bootstrap/_custom-forms.scss
index 22659415f0..0cb007d4e4 100644
--- a/src/framework/theme/styles/global/bootstrap/_custom-forms.scss
+++ b/src/framework/theme/styles/global/bootstrap/_custom-forms.scss
@@ -23,6 +23,7 @@
 
     .custom-control-indicator {
       background-color: nb-theme(checkbox-bg);
+      border-radius: 50%;
       width: nb-theme(checkbox-size);
       height: nb-theme(checkbox-size);
       border: nb-theme(checkbox-border-size) solid nb-theme(checkbox-border-color);
diff --git a/src/framework/theme/styles/global/bootstrap/_input-group.scss b/src/framework/theme/styles/global/bootstrap/_input-group.scss
index bbcc3ed625..3a8283cfc9 100644
--- a/src/framework/theme/styles/global/bootstrap/_input-group.scss
+++ b/src/framework/theme/styles/global/bootstrap/_input-group.scss
@@ -19,8 +19,14 @@
     padding: 0.25rem 1rem;
     color: nb-theme(form-control-placeholder-color);
 
-    @include nb-ltr(border-right, none);
-    @include nb-rtl(border-left, none);
+    @include nb-ltr() {
+      border-left: $form-control-border;
+      border-right: none;
+    };
+    @include nb-rtl() {
+      border-left: none;
+      border-right: $form-control-border;
+    };
   }
 
   .input-group-addon {
@@ -55,12 +61,16 @@
     .input-group-prepend .btn:first-child,
     .input-group-btn .btn:first-child {
       @include nb-ltr() {
+        border-top-left-radius: nb-theme(form-control-border-radius);
+        border-bottom-left-radius: nb-theme(form-control-border-radius);
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
       };
       @include nb-rtl() {
         border-top-left-radius: 0;
         border-bottom-left-radius: 0;
+        border-top-right-radius: nb-theme(form-control-border-radius);
+        border-bottom-right-radius: nb-theme(form-control-border-radius);
       };
     }
     .form-control:last-child:not(:only-child),
@@ -70,8 +80,12 @@
       @include nb-ltr() {
         border-top-left-radius: 0;
         border-bottom-left-radius: 0;
+        border-top-right-radius: nb-theme(form-control-border-radius);
+        border-bottom-right-radius: nb-theme(form-control-border-radius);
       };
       @include nb-rtl() {
+        border-top-left-radius: nb-theme(form-control-border-radius);
+        border-bottom-left-radius: nb-theme(form-control-border-radius);
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
       };