diff --git a/p/themes/Alternative-Dark/adark.css b/p/themes/Alternative-Dark/adark.css
index 98679f8f9..44ac98152 100644
--- a/p/themes/Alternative-Dark/adark.css
+++ b/p/themes/Alternative-Dark/adark.css
@@ -178,6 +178,11 @@ th {
 	border-radius: 0 3px 3px 0;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
 .stick .btn + .btn,
 .group .btn + .btn,
 .stick .btn + input,
diff --git a/p/themes/Alternative-Dark/adark.rtl.css b/p/themes/Alternative-Dark/adark.rtl.css
index efbacf146..c3799919b 100644
--- a/p/themes/Alternative-Dark/adark.rtl.css
+++ b/p/themes/Alternative-Dark/adark.rtl.css
@@ -178,6 +178,11 @@ th {
 	border-radius: 3px 0 0 3px;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
 .stick .btn + .btn,
 .group .btn + .btn,
 .stick .btn + input,
diff --git a/p/themes/Ansum/_sidebar.css b/p/themes/Ansum/_sidebar.css
index 6621b0d05..d87aa6a52 100644
--- a/p/themes/Ansum/_sidebar.css
+++ b/p/themes/Ansum/_sidebar.css
@@ -126,6 +126,11 @@
 
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 5px;
+}
+
 .aside {
 	background: var(--sid-bg);
 
diff --git a/p/themes/Ansum/_sidebar.rtl.css b/p/themes/Ansum/_sidebar.rtl.css
index 28f8233ea..7c7187c20 100644
--- a/p/themes/Ansum/_sidebar.rtl.css
+++ b/p/themes/Ansum/_sidebar.rtl.css
@@ -126,6 +126,11 @@
 
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 5px;
+}
+
 .aside {
 	background: var(--sid-bg);
 
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 6d2e01993..13cee3c7d 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -198,6 +198,15 @@ button.as-link[disabled] {
 	border: 1px solid var(--dark-border-color0);
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
+.group > .dropdown:only-child > .btn {
+	border-left: 1px solid var(--dark-border-color0);
+}
+
 .btn:hover {
 	background: linear-gradient(to top, var(--dark-background-color-button-hover-gradient1) 0%, var(--dark-background-color-button-hover-gradient2) 100%);
 }
diff --git a/p/themes/Dark/dark.rtl.css b/p/themes/Dark/dark.rtl.css
index cfb1ed37d..836c89f1b 100644
--- a/p/themes/Dark/dark.rtl.css
+++ b/p/themes/Dark/dark.rtl.css
@@ -198,6 +198,15 @@ button.as-link[disabled] {
 	border: 1px solid var(--dark-border-color0);
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
+.group > .dropdown:only-child > .btn {
+	border-right: 1px solid var(--dark-border-color0);
+}
+
 .btn:hover {
 	background: linear-gradient(to top, var(--dark-background-color-button-hover-gradient1) 0%, var(--dark-background-color-button-hover-gradient2) 100%);
 }
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 2f6c3d233..697c88000 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -149,6 +149,11 @@ th {
 	border-radius: 0 5px 5px 0;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 5px;
+}
+
 .stick .btn + .btn,
 .group .btn + .btn,
 .stick .btn + input,
diff --git a/p/themes/Flat/flat.rtl.css b/p/themes/Flat/flat.rtl.css
index a3bc43064..71af52517 100644
--- a/p/themes/Flat/flat.rtl.css
+++ b/p/themes/Flat/flat.rtl.css
@@ -149,6 +149,11 @@ th {
 	border-radius: 5px 0 0 5px;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 5px;
+}
+
 .stick .btn + .btn,
 .group .btn + .btn,
 .stick .btn + input,
diff --git a/p/themes/Mapco/_sidebar.css b/p/themes/Mapco/_sidebar.css
index 308817653..cb020f341 100644
--- a/p/themes/Mapco/_sidebar.css
+++ b/p/themes/Mapco/_sidebar.css
@@ -126,6 +126,11 @@
 
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 5px;
+}
+
 .aside {
 	background: var(--sid-bg);
 
diff --git a/p/themes/Mapco/_sidebar.rtl.css b/p/themes/Mapco/_sidebar.rtl.css
index a121c2b33..ba5c758b6 100644
--- a/p/themes/Mapco/_sidebar.rtl.css
+++ b/p/themes/Mapco/_sidebar.rtl.css
@@ -126,6 +126,11 @@
 
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 5px;
+}
+
 .aside {
 	background: var(--sid-bg);
 
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7b8c4b0ca..1f629ad71 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -261,6 +261,15 @@ th {
 	border-radius: 0 3px 3px 0;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
+.group > .dropdown:only-child > .btn {
+	border-left: 1px solid var(--border-color);
+}
+
 .btn {
 	margin: 0;
 	padding: 0.25rem 0.5rem;
diff --git a/p/themes/Origine/origine.rtl.css b/p/themes/Origine/origine.rtl.css
index fb62eaf98..a9408bc38 100644
--- a/p/themes/Origine/origine.rtl.css
+++ b/p/themes/Origine/origine.rtl.css
@@ -261,6 +261,15 @@ th {
 	border-radius: 3px 0 0 3px;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
+.group > .dropdown:only-child > .btn {
+	border-right: 1px solid var(--border-color);
+}
+
 .btn {
 	margin: 0;
 	padding: 0.25rem 0.5rem;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index dad834fc7..db793befe 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -200,6 +200,11 @@ th {
 	border-radius: 0 3px 3px 0;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
 .stick .btn + .btn,
 .group .btn + .btn,
 .stick .btn + input,
diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css
index 1e23e386d..77d4434ae 100644
--- a/p/themes/Pafat/pafat.rtl.css
+++ b/p/themes/Pafat/pafat.rtl.css
@@ -200,6 +200,11 @@ th {
 	border-radius: 3px 0 0 3px;
 }
 
+.group > .btn:only-child,
+.group > .dropdown:only-child > .btn {
+	border-radius: 3px;
+}
+
 .stick .btn + .btn,
 .group .btn + .btn,
 .stick .btn + input,