diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index d16232cd28ebe3cc8fccf1de5523af1fc77a0074..0369a19a1e6cee8197a14ec211d0eb612763a4a5 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -92,26 +92,24 @@ textarea.edit {
 input.edit,select.edit {
   font-size: 100%;
   border: 1px solid __dark__;
-  height: 18px !important;
-  max-height: 22px !important;
-  min-height: 22px !important;
+  height: 1.65em;
   color: Black;
   background-color: __white__;
   vertical-align: middle;
-  padding: 1px;
+  margin: 1px;
+  padding: 0 5px;
   display: inline;
 }
 
 input.missing {
   font-size: 100%;
   border: 1px solid __dark__;
-  height: 18px !important;
-  max-height: 22px !important;
-  min-height: 22px !important;
+  height: 1.65em;
   color: Black;
   background-color: #ffcccc;
   vertical-align: middle;
-  padding: 1px;
+  margin: 1px;
+  padding: 0 5px;
   display: inline;
 }
 
@@ -126,10 +124,9 @@ input.button, button.button{
   text-decoration:none;
   font-size: 100%;
   cursor: pointer;
-  height: 22px !important;
-  max-height: 22px !important;
-  min-height: 22px !important;
+  height: 1.8em;
   margin: 1px;
+  padding: 0 5px;
   display: inline-block;
 
   /* Mac IE will not see this and continue with inline-block */
@@ -148,9 +145,6 @@ div.secedit input.button {
   padding: 0px;
   font-size: 10px;
   cursor: pointer;
-  height: 15px !important;
-  max-height: 15px !important;
-  min-height: 15px !important;
   float:right;
   display: inline;
 }
diff --git a/lib/tpl/default/layout.css b/lib/tpl/default/layout.css
index d541fa2f9640bef255c8dead01a813799a870693..d893af9b8b459f6903cc0f4752eb95e20889bd06 100644
--- a/lib/tpl/default/layout.css
+++ b/lib/tpl/default/layout.css
@@ -44,7 +44,7 @@
 
 /* ---------------  top and bottom bar ---------------- */
 .bar {
-	height:25px;
+	height:2.0em;
 	border-top:1px solid __dark__;
 	border-bottom:1px solid __dark__;
 	background: __medium__;