diff --git a/admin/calendar.php b/admin/calendar.php
index 44e9851d..d0b01176 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -65,7 +65,7 @@ while ($row = hesk_dbFetchAssoc($rs)) {
         continue;
     }
 
-    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000; padding-left: 14px' : 'background: ' . $row['color'];
+    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000;' : 'background: ' . $row['color'];
     $categories[] = $row;
 }
 
@@ -93,11 +93,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <div class="checkbox">
                             <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
                         </div>
-                        <div class="row">
-                            <div class="col-sm-1" style="<?php echo $category['css_style']; ?>">&nbsp;</div>
-                            <div class="col-sm-11 hide-on-overflow no-wrap">
-                                <?php echo $category['name']; ?>
-                            </div>
+                        <div class="hide-on-overflow no-wrap event-category background-volatile" style="<?php echo $category['css_style']; ?>">
+                            <?php echo $category['name']; ?>
                         </div>
                     </li>
                 <?php endforeach; ?>
diff --git a/calendar.php b/calendar.php
index cb66c66a..c43e5308 100644
--- a/calendar.php
+++ b/calendar.php
@@ -82,11 +82,8 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                             <div class="checkbox">
                                 <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
                             </div>
-                            <div class="row">
-                                <div class="col-sm-1" style="<?php echo $category['css_style']; ?>">&nbsp;</div>
-                                <div class="col-sm-11 hide-on-overflow no-wrap">
-                                    <?php echo $category['name']; ?>
-                                </div>
+                            <div class="hide-on-overflow no-wrap event-category background-volatile" style="<?php echo $category['css_style']; ?>">
+                                <?php echo $category['name']; ?>
                             </div>
                         </li>
                     <?php endforeach; ?>
diff --git a/css/mods-for-hesk.css b/css/mods-for-hesk.css
index 47bb4c3d..765e2297 100644
--- a/css/mods-for-hesk.css
+++ b/css/mods-for-hesk.css
@@ -351,4 +351,9 @@ div.setupButtons {
 .hide-on-overflow {
     overflow: hidden;
     text-overflow: ellipsis;
+}
+
+.event-category {
+    border-radius: 4px;
+    padding: 5px;
 }
\ No newline at end of file