diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php
index d9813ebc..c28a3e9c 100644
--- a/includes/controller/shift_entries_controller.php
+++ b/includes/controller/shift_entries_controller.php
@@ -123,7 +123,7 @@ function shift_entry_add_controller()
             'SELECT `id` FROM `ShiftEntry` WHERE `SID`= ? AND `UID` = ?',
             [$shift['SID'], $user_id]))
         ) {
-            return error('This angel does already have an entry for this shift.', true);
+            return error(_('This angel does already have an entry for this shift.'), true);
         }
 
         $freeloaded = isset($shift['freeloaded']) ? $shift['freeloaded'] : false;
diff --git a/includes/helper/internationalization_helper.php b/includes/helper/internationalization_helper.php
index 7fa6518b..01aca71f 100644
--- a/includes/helper/internationalization_helper.php
+++ b/includes/helper/internationalization_helper.php
@@ -72,11 +72,8 @@ function make_langselect()
         $items[] = toolbar_item_link(
             htmlspecialchars($url),
             '',
-            sprintf(
-                '<img src="%s" alt="%s" title="%2$s"> %2$s',
-                url('pic/flag/' . $locale . '.png'),
-                $name
-            )
+            $name,
+            $locale == locale()
         );
     }
     return $items;
diff --git a/public/pic/flag/de_DE.UTF-8.png b/public/pic/flag/de_DE.UTF-8.png
deleted file mode 100644
index ac4a9773..00000000
Binary files a/public/pic/flag/de_DE.UTF-8.png and /dev/null differ
diff --git a/public/pic/flag/en_US.UTF-8.png b/public/pic/flag/en_US.UTF-8.png
deleted file mode 100644
index ff701e19..00000000
Binary files a/public/pic/flag/en_US.UTF-8.png and /dev/null differ