diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css
index 83916c51..f850d32a 100644
--- a/source/Ox.UI/css/Ox.UI.css
+++ b/source/Ox.UI/css/Ox.UI.css
@@ -1906,17 +1906,19 @@ Panels
 .OxCollapsePanel > .OxBar > .OxExtras > * {
     float: left;
 }
-.OxCollapsePanel > .OxBar > .OxExtras > .OxButton {
-    //position: absolute;
-    //right: 0px;
-    border-radius: 0;
+.OxCollapsePanel > .OxBar > .OxExtras > .OxButton,
+.OxCollapsePanel > .OxBar > .OxExtras > .OxButton:active,
+.OxCollapsePanel > .OxBar > .OxExtras > .OxButton:focus {
+    padding: 3px;
+    border-width: 0;
+}
+.OxCollapsePanel > .OxBar > .OxExtras > input.OxMedium {
+    border-radius: 0;    
 }
 .OxCollapsePanel > .OxBar > .OxExtras > .OxSelect {
-    //position: absolute;
-    //right: 0px;
-    width: 16px;
-    height: 16px;
-    padding: 1px 1px 0 0;
+    width: 14px;
+    height: 14px;
+    padding: 1px;
     border-width: 0;
     border-radius: 0;
     background: rgba(0, 0, 0, 0);
diff --git a/source/Ox.UI/js/Panel/CollapsePanel.js b/source/Ox.UI/js/Panel/CollapsePanel.js
index db36fa48..ebe04a82 100644
--- a/source/Ox.UI/js/Panel/CollapsePanel.js
+++ b/source/Ox.UI/js/Panel/CollapsePanel.js
@@ -68,7 +68,7 @@ Ox.CollapsePanel = function(options, self) {
     if (self.options.extras.length) {
         self.$extras = Ox.Element()
             .addClass('OxExtras')
-            .css({width: self.options.extras.length * 16 + 1 + 'px'})
+            .css({width: self.options.extras.length * 16 + 'px'})
             .appendTo(self.$titlebar);
         self.options.extras.forEach(function($extra) {
             $extra.appendTo(self.$extras);