diff --git a/resources/assets/themes/theme18.scss b/resources/assets/themes/theme18.scss
index 68bcab0d..5596d4b7 100644
--- a/resources/assets/themes/theme18.scss
+++ b/resources/assets/themes/theme18.scss
@@ -96,6 +96,10 @@ h6,
   border-bottom: 0 !important;
 }
 
+body > .container-fluid {
+  margin-bottom: 1em;
+}
+
 #footer {
   padding-top: 1em;
   background: #4d733b url('./theme18/bg_pattern_tiled.png') repeat;
@@ -133,6 +137,7 @@ body {
 
   .nav-link {
     color: black;
+
     &:hover,
     &.active {
       color: black;
@@ -141,9 +146,29 @@ body {
   }
 }
 
+
+.text-success,
+.text-danger {
+  background: white;
+  border-radius: 3px;
+  padding: 1px;
+}
+
 td {
-  [class*="text-"] {
-    background: white;
-    border-radius: 3px;
+  .text-success,
+  .text-danger {
+    background: transparent;
+    padding: 0;
+
+    .bi {
+      background: white;
+      border-radius: 3px;
+    }
+  }
+}
+
+.alert {
+  a {
+    color: inherit !important;
   }
 }