diff --git a/application/fonts/fontello-ifont/css/ifont-embedded.css b/application/fonts/fontello-ifont/css/ifont-embedded.css
index 593eb8bc0..92bcfdff9 100644
--- a/application/fonts/fontello-ifont/css/ifont-embedded.css
+++ b/application/fonts/fontello-ifont/css/ifont-embedded.css
@@ -167,4 +167,4 @@
 .icon-chart-area:before { content: '\e870'; } /* '' */
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
-.icon-magic:before { content: '\e873'; } /* '' */
\ No newline at end of file
+.icon-magic:before { content: '\e873'; } /* '' */
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index b40b37927..719d1c829 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -11,6 +11,8 @@ use Icinga\Web\LessCompiler;
 class StyleSheet
 {
     protected static $lessFiles = array(
+        '../application/fonts/fontello-ifont/css/ifont-embedded.css',
+        'css/vendor/tipsy.css',
         'css/icinga/defaults.less',
         'css/icinga/layout-colors.less',
         'css/icinga/layout-structure.less',
@@ -24,9 +26,7 @@ class StyleSheet
         'css/icinga/pagination.less',
         'css/icinga/monitoring-colors.less',
         'css/icinga/selection-toolbar.less',
-        'css/icinga/login.less',
-        '../application/fonts/fontello-ifont/css/ifont-embedded.css',
-        'css/vendor/tipsy.css'
+        'css/icinga/login.less'
     );
 
     public static function compileForPdf()
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 7f6914e3d..6972e95dc 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -193,3 +193,12 @@ table.benchmark {
 .controls a {
   color: inherit;
 }
+
+/* controls have no padding as of tabs */
+.controls > h1 {
+  margin-right: 1em;
+}
+
+[class^="icon-"]:before, [class*=" icon-"]:before {
+    text-decoration: none;
+}