diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css
index c03c1932..c53868e8 100644
--- a/source/Ox.UI/css/Ox.UI.css
+++ b/source/Ox.UI/css/Ox.UI.css
@@ -682,6 +682,9 @@ input.OxMedium.OxRounded {
     padding: 0 6px 0 6px;
     border-radius: 8px;
 }
+input.OxMedium.OxSquared {
+    border-radius: 4px;
+}
 input.OxMedium.OxSquare {
     padding: 0 2px 0 2px;
     border-radius: 0;
@@ -712,6 +715,9 @@ textarea {
     border-radius: 8px;
     resize: none;
 }
+textarea.OxSquared {
+    border-radius: 4px;
+}
 textarea.OxSquare {
     border-radius: 0;
 }
@@ -819,6 +825,14 @@ OxButtonGroup
 .OxButtonGroup > .OxButton.OxTab:last-child {
     border-bottom-right-radius: 0;
 }
+.OxButtonGroup.OxSquared > .OxButton.OxMedium:first-child {
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+}
+.OxButtonGroup.OxSquared > .OxButton.OxMedium:last-child {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+}
 /*
 --------------------------------------------------------------------------------
 OxCheckbox
@@ -924,6 +938,9 @@ div.OxInput.OxMedium {
 div.OxInput.OxRounded {
     border-radius: 8px;
 }
+div.OxInput.OxSquared {
+    border-radius: 4px;
+}
 div.OxInput.OxSquare {
     border-radius: 0;
 }
@@ -1018,6 +1035,9 @@ OxLabel
     overflow: hidden;
     white-space: nowrap;
 }
+.OxLabel.OxSquared {
+    border-radius: 4px;
+}
 .OxLabel.OxSquare {
     padding: 0 3px 0 3px;
     border-radius: 0;
@@ -1151,6 +1171,12 @@ OxSelect
 .OxSelect.OxRounded.OxSelected {
     border-radius: 8px 8px 0 0;
 }
+.OxSelect.OxSquared {
+    border-radius: 4px;
+}
+.OxSelect.OxSquared.OxSelected {
+    border-radius: 4px 4px 0 0;
+}
 .OxSelect.OxSquare {
     border-radius: 0;
 }
diff --git a/source/Ox.UI/js/Form/ButtonGroup.js b/source/Ox.UI/js/Form/ButtonGroup.js
index be26757b..ddb893a2 100644
--- a/source/Ox.UI/js/Form/ButtonGroup.js
+++ b/source/Ox.UI/js/Form/ButtonGroup.js
@@ -86,7 +86,7 @@ Ox.ButtonGroup = function(options, self) {
                 overlap: button.overlap,
                 selectable: self.options.selectable,
                 size: self.options.size,
-                style: self.options.style,
+                style: self.options.style == 'squared' ? 'default' : self.options.style, // FIXME: ugly
                 title: button.title,
                 tooltip: button.tooltip,
                 type: self.options.type,