diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index f12a78a7..0cfb48e2 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -321,7 +321,7 @@ function angeltypes_list_controller()
         }
 
         $angeltype['restricted'] = $angeltype['restricted'] ? icon('book') : '';
-        $angeltype['no_self_signup'] = $angeltype['no_self_signup'] ? '' : icon('share');
+        $angeltype['no_self_signup'] = $angeltype['no_self_signup'] ? '' : icon('pencil-square');
 
         $angeltype['name'] = '<a href="'
             . page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])
diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php
index 5ab16791..17d14a87 100644
--- a/includes/view/AngelTypes_view.php
+++ b/includes/view/AngelTypes_view.php
@@ -503,7 +503,7 @@ function AngelTypes_list_view($angeltypes, $admin_angeltypes)
         table([
             'name'           => __('Name'),
             'restricted'     => icon('book') . __('Requires introduction'),
-            'no_self_signup' => icon('share') . __('Self Sign Up Allowed'),
+            'no_self_signup' => icon('pencil-square') . __('Self Sign Up Allowed'),
             'membership'     => __('Membership'),
             'actions'        => ''
         ], $angeltypes)
@@ -581,9 +581,9 @@ function AngelTypes_about_view($angeltypes, $user_logged_in)
         $buttons[] = button(page_link_to('login'), __('Login'));
     }
 
-    $faqUrl = config('faq_url');
-    if (!empty($faqUrl)) {
-        $buttons[] = button($faqUrl, __('FAQ'), 'btn-primary');
+    $footerConfig = config('footer_items');
+    if (!empty($footerConfig['FAQ'])) {
+        $buttons[] = button($footerConfig['FAQ'], __('FAQ'), 'btn-primary');
     }
 
     $content = [
diff --git a/includes/view/ShiftCalendarRenderer.php b/includes/view/ShiftCalendarRenderer.php
index 513b6a23..3f7616d1 100644
--- a/includes/view/ShiftCalendarRenderer.php
+++ b/includes/view/ShiftCalendarRenderer.php
@@ -326,7 +326,7 @@ class ShiftCalendarRenderer
             badge(__('Help needed'), 'danger'),
             badge(__('Other angeltype needed / collides with my shifts'), 'warning'),
             badge(__('Shift is full'), 'success'),
-            badge(__('Shift running/ended or user not arrived/allowed'), 'default')
+            badge(__('Shift running/ended or user not arrived/allowed'), 'secondary')
         ]);
     }
 }
diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php
index 42542ae6..391ebe62 100644
--- a/includes/view/ShiftCalendarShiftRenderer.php
+++ b/includes/view/ShiftCalendarShiftRenderer.php
@@ -91,7 +91,7 @@ class ShiftCalendarShiftRenderer
             case ShiftSignupState::FREE:
                 return 'danger';
             default:
-                return '';
+                return 'secondary';
         }
     }