diff --git a/breeze/src/archive/web/js/zkmax/inp/less/timepicker.less b/breeze/src/archive/web/js/zkmax/inp/less/timepicker.less
index 57880ea2c..175430cb6 100644
--- a/breeze/src/archive/web/js/zkmax/inp/less/timepicker.less
+++ b/breeze/src/archive/web/js/zkmax/inp/less/timepicker.less
@@ -7,13 +7,12 @@
 
 	&-input {
 		.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
-		width: 100%;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
-		.borderRadius(@borderRadiusSmall);
+		border-right: 0;
+		.leftBorderRadius(@borderRadiusSmall);
 		margin: 0;
 		padding: 4px 5px;
-		padding-right: @baseButtonWidth + 5;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
 
@@ -29,16 +28,9 @@
 		}
 	}
 
-	&-input-full {
-		padding-right: 5px;
-	}
-
 	&-button {
 		.iconFontStyle(@baseFontSize, @iconColor);
 		display: inline-block;
-		position: relative;
-		top: 0;
-		right: @baseButtonWidth;
 		min-width: @baseButtonWidth;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
diff --git a/breeze/src/archive/web/js/zul/inp/less/combo.less b/breeze/src/archive/web/js/zul/inp/less/combo.less
index 3c90290ec..e2836f070 100644
--- a/breeze/src/archive/web/js/zul/inp/less/combo.less
+++ b/breeze/src/archive/web/js/zul/inp/less/combo.less
@@ -12,13 +12,12 @@
 
 	&-input {
 		.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
-		width: 100%;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
-		.borderRadius(@borderRadiusSmall);
+		border-right: 0;
+		.leftBorderRadius(@borderRadiusSmall);
 		margin: 0;
 		padding: 4px 5px;
-		padding-right: @baseButtonWidth + 5px;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
 
@@ -34,16 +33,9 @@
 		}
 	}
 
-	&-input-full {
-		padding-right: 5px;
-	}
-
 	&-button {
 		.iconFontStyle(@baseFontSize, @iconColor);
 		display: inline-block;
-		position: relative;
-		top: 0;
-		right: @baseButtonWidth;
 		min-width: @baseButtonWidth;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
@@ -90,6 +82,11 @@
 		cursor: default;
 		.boxShadow(none);
 	}
+
+	&-rightedge {
+		border-right: 1px solid @inputBorderColor;
+		.borderRadius(@borderRadiusSmall);
+	}
 }
 
 .z-combobox-disabled>.z-combobox-button:hover,
@@ -142,6 +139,7 @@
 .z-spinner-button,
 .z-doublespinner-button {
 	padding: 0;
+	position: relative;
 
 	&:hover,
 	&:active {
diff --git a/sapphire/src/archive/web/js/zkmax/inp/less/timepicker.less b/sapphire/src/archive/web/js/zkmax/inp/less/timepicker.less
index 558b1bc3e..d1758593f 100644
--- a/sapphire/src/archive/web/js/zkmax/inp/less/timepicker.less
+++ b/sapphire/src/archive/web/js/zkmax/inp/less/timepicker.less
@@ -7,13 +7,12 @@
 
 	&-input {
 		.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
-		width: 100%;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
-		.borderRadius(@borderRadiusSmall);
+		border-right: 0;
+		.leftBorderRadius(@borderRadiusSmall);
 		margin: 0;
 		padding: 4px 5px;
-		padding-right: @baseButtonWidth + 5;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
 
@@ -29,16 +28,9 @@
 		}
 	}
 
-	&-input-full {
-		padding-right: 5px;
-	}
-
 	&-button {
 		.iconFontStyle(@baseFontSize, @iconColor);
 		display: inline-block;
-		position: relative;
-		top: 0;
-		right: @baseButtonWidth;
 		min-width: @baseButtonWidth;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
diff --git a/sapphire/src/archive/web/js/zul/inp/less/combo.less b/sapphire/src/archive/web/js/zul/inp/less/combo.less
index 2fb758f2d..d7401b243 100644
--- a/sapphire/src/archive/web/js/zul/inp/less/combo.less
+++ b/sapphire/src/archive/web/js/zul/inp/less/combo.less
@@ -12,13 +12,12 @@
 
 	&-input {
 		.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
-		width: 100%;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
-		.borderRadius(@borderRadiusSmall);
+		border-right: 0;
+		.leftBorderRadius(@borderRadiusSmall);
 		margin: 0;
 		padding: 4px 5px;
-		padding-right: @baseButtonWidth + 5px;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
 
@@ -34,16 +33,9 @@
 		}
 	}
 
-	&-input-full {
-		padding-right: 5px;
-	}
-
 	&-button {
 		.iconFontStyle(@baseFontSize, @iconColor);
 		display: inline-block;
-		position: relative;
-		top: 0;
-		right: @baseButtonWidth;
 		min-width: @baseButtonWidth;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
@@ -90,6 +82,11 @@
 		cursor: default;
 		.boxShadow(none);
 	}
+
+	&-rightedge {
+		border-right: 1px solid @inputBorderColor;
+		.borderRadius(@borderRadiusSmall);
+	}
 }
 
 .z-combobox-disabled>.z-combobox-button:hover,
@@ -142,6 +139,7 @@
 .z-spinner-button,
 .z-doublespinner-button {
 	padding: 0;
+	position: relative;
 
 	&:hover,
 	&:active {
diff --git a/silvertail/src/archive/web/js/zkmax/inp/less/timepicker.less b/silvertail/src/archive/web/js/zkmax/inp/less/timepicker.less
index 558b1bc3e..d1758593f 100644
--- a/silvertail/src/archive/web/js/zkmax/inp/less/timepicker.less
+++ b/silvertail/src/archive/web/js/zkmax/inp/less/timepicker.less
@@ -7,13 +7,12 @@
 
 	&-input {
 		.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
-		width: 100%;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
-		.borderRadius(@borderRadiusSmall);
+		border-right: 0;
+		.leftBorderRadius(@borderRadiusSmall);
 		margin: 0;
 		padding: 4px 5px;
-		padding-right: @baseButtonWidth + 5;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
 
@@ -29,16 +28,9 @@
 		}
 	}
 
-	&-input-full {
-		padding-right: 5px;
-	}
-
 	&-button {
 		.iconFontStyle(@baseFontSize, @iconColor);
 		display: inline-block;
-		position: relative;
-		top: 0;
-		right: @baseButtonWidth;
 		min-width: @baseButtonWidth;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
diff --git a/silvertail/src/archive/web/js/zul/inp/less/combo.less b/silvertail/src/archive/web/js/zul/inp/less/combo.less
index 2fb758f2d..d7401b243 100644
--- a/silvertail/src/archive/web/js/zul/inp/less/combo.less
+++ b/silvertail/src/archive/web/js/zul/inp/less/combo.less
@@ -12,13 +12,12 @@
 
 	&-input {
 		.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
-		width: 100%;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
-		.borderRadius(@borderRadiusSmall);
+		border-right: 0;
+		.leftBorderRadius(@borderRadiusSmall);
 		margin: 0;
 		padding: 4px 5px;
-		padding-right: @baseButtonWidth + 5px;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
 
@@ -34,16 +33,9 @@
 		}
 	}
 
-	&-input-full {
-		padding-right: 5px;
-	}
-
 	&-button {
 		.iconFontStyle(@baseFontSize, @iconColor);
 		display: inline-block;
-		position: relative;
-		top: 0;
-		right: @baseButtonWidth;
 		min-width: @baseButtonWidth;
 		height: @baseButtonHeight;
 		border: 1px solid @inputBorderColor;
@@ -90,6 +82,11 @@
 		cursor: default;
 		.boxShadow(none);
 	}
+
+	&-rightedge {
+		border-right: 1px solid @inputBorderColor;
+		.borderRadius(@borderRadiusSmall);
+	}
 }
 
 .z-combobox-disabled>.z-combobox-button:hover,
@@ -142,6 +139,7 @@
 .z-spinner-button,
 .z-doublespinner-button {
 	padding: 0;
+	position: relative;
 
 	&:hover,
 	&:active {