diff --git a/css/popupboxes.css b/css/popupboxes.css
index 8470e9079..b15750591 100644
--- a/css/popupboxes.css
+++ b/css/popupboxes.css
@@ -82,7 +82,8 @@
     float: right;
     font-size: 16px;
     font-weight: bold;
-    padding: 2px;
+    padding: 6px;
+    margin: 6px;
     border: 1px solid white;
 }
 
@@ -132,7 +133,8 @@
     float: right;
     font-size: 16px;
     font-weight: bold;
-    padding: 2px;
+    padding: 6px;
+    margin: 6px;
     border: 1px solid white;
 }
 
@@ -182,7 +184,8 @@
     float: right;
     font-size: 16px;
     font-weight: bold;
-    padding: 2px;
+    padding: 6px;
+    margin: 6px;
     border: 1px solid white;
 }
 
@@ -231,8 +234,8 @@
     color: #aaa;
     font-size: 20px;
     font-weight: bold;
-    padding: 1px;
-    margin: 3px;
+    padding: 6px;
+    margin: 6px;
     border: 1px solid white;
 }
 
@@ -282,8 +285,8 @@
     color: #aaa;
     font-size: 20px;
     font-weight: bold;
-    padding: 3px;
-    margin: 3px;
+    padding: 6px;
+    margin: 6px;
     border: 1px solid white;
 }
 
diff --git a/css/styles.css b/css/styles.css
index d8fbc6c5e..baffbab0e 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -35,6 +35,14 @@ span {
     padding: 4px;
 }
 
+/* Disable border highlight on elements */
+input:focus,
+textarea:focus,
+button:focus,
+td:focus,
+tr:focus {
+    outline:none;
+}
 
 /* Main menu */
 .mainmenu {