diff --git a/includes/sys_form.php b/includes/sys_form.php
index 3e2222f2..4290d8a3 100644
--- a/includes/sys_form.php
+++ b/includes/sys_form.php
@@ -214,7 +214,7 @@ function form_radio($name, $label, $selected, $value)
 function form_info($label, $text = '')
 {
     if ($label == '') {
-        return '<span class="help-block">' . icon('info-lg') . $text . '</span>';
+        return '<span class="help-block">' . icon('info-circle') . $text . '</span>';
     }
     if ($text == '') {
         return '<h4>' . $label . '</h4>';
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index 3706d3a2..5a038ed0 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -26,7 +26,7 @@ function Shift_view_header($shift, Room $room)
         div('col-sm-3 col-xs-6', [
             '<h4>' . __('Start') . '</h4>',
             '<p class="lead' . (time() >= $shift['start'] ? ' text-success' : '') . '">',
-            icon('calendar') . date(__('Y-m-d'), $shift['start']),
+            icon('calendar3') . date(__('Y-m-d'), $shift['start']),
             '<br />',
             icon('clock') . date('H:i', $shift['start']),
             '</p>'
@@ -34,7 +34,7 @@ function Shift_view_header($shift, Room $room)
         div('col-sm-3 col-xs-6', [
             '<h4>' . __('End') . '</h4>',
             '<p class="lead' . (time() >= $shift['end'] ? ' text-success' : '') . '">',
-            icon('calendar') . date(__('Y-m-d'), $shift['end']),
+            icon('calendar3') . date(__('Y-m-d'), $shift['end']),
             '<br />',
             icon('clock') . date('H:i', $shift['end']),
             '</p>'
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 0b6a9509..74e0aa17 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -390,7 +390,7 @@ function User_view_myshift($shift, $user_source, $its_me)
     }
 
     $myshift = [
-        'date'       => icon('calendar')
+        'date'       => icon('calendar3')
             . date('Y-m-d', $shift['start']) . '<br>'
             . icon('clock') . date('H:i', $shift['start'])
             . ' - '
@@ -530,7 +530,7 @@ function User_view_worklog(Worklog $worklog, $admin_user_worklog_privilege)
     }
 
     return [
-        'date'       => icon('calendar') . date('Y-m-d', $worklog->worked_at->timestamp),
+        'date'       => icon('calendar3') . date('Y-m-d', $worklog->worked_at->timestamp),
         'duration'   => sprintf('%.2f', $worklog->hours) . ' h',
         'room'       => '',
         'shift_info' => __('Work log entry'),
@@ -649,7 +649,7 @@ function User_view(
                         ) : '',
                         ($its_me && $auth->can('ical')) ? button(
                             page_link_to('ical', ['key' => $user_source->api_key]),
-                            icon('calendar') . __('iCal Export')
+                            icon('calendar3') . __('iCal Export')
                         ) : '',
                         ($its_me && $auth->can('shifts_json_export')) ? button(
                             page_link_to('shifts_json_export', ['key' => $user_source->api_key]),
@@ -681,7 +681,7 @@ function User_view(
             ($its_me || $admin_user_privilege) ? '<h2>' . __('Shifts') . '</h2>' : '',
             $myshifts_table,
             ($its_me && $nightShiftsConfig['enabled']) ? info(
-                icon('info-lg') . sprintf(
+                icon('info-circle') . sprintf(
                     __('Your night shifts between %d and %d am count twice.'),
                     $nightShiftsConfig['start'],
                     $nightShiftsConfig['end']
diff --git a/resources/views/macros/base.twig b/resources/views/macros/base.twig
index f1113697..bf928b6e 100644
--- a/resources/views/macros/base.twig
+++ b/resources/views/macros/base.twig
@@ -25,7 +25,7 @@
 {% endmacro %}
 
 {% macro info(text) %}
-    <span class="help-block">{{ _self.icon('info-lg') }}{{ text }}</span>
+    <span class="help-block">{{ _self.icon('info-circle') }}{{ text }}</span>
 {%- endmacro %}
 
 {% macro type_bg_class() -%}
diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig
index ffb9be7a..0616336f 100644
--- a/resources/views/pages/login.twig
+++ b/resources/views/pages/login.twig
@@ -114,7 +114,7 @@
             </div>
 
             <div class="col-md-12 text-center">
-                {{ m.icon('info-lg') }} {{ __('Please note: You have to activate cookies!') }}
+                {{ m.icon('info-circle') }} {{ __('Please note: You have to activate cookies!') }}
             </div>
         </div>
     </div>