diff --git a/resources/views/admin/log.twig b/resources/views/admin/log.twig
index eb7644e0..ab7c8448 100644
--- a/resources/views/admin/log.twig
+++ b/resources/views/admin/log.twig
@@ -2,7 +2,7 @@
 {% import 'macros/base.twig' as m %}
 {% import 'macros/form.twig' as f %}
 
-{% set title %}{% block title %}{{ __('log.log') }}{% endblock %}{% endset %}
+{% block title %}{{ __('log.log') }}{% endblock %}
 
 {% block content %}
     <div class="col-md-12">
diff --git a/resources/views/admin/schedule/index.twig b/resources/views/admin/schedule/index.twig
index ead2042f..2e7352c7 100644
--- a/resources/views/admin/schedule/index.twig
+++ b/resources/views/admin/schedule/index.twig
@@ -2,12 +2,12 @@
 {% import 'macros/base.twig' as m %}
 {% import 'macros/form.twig' as f %}
 
-{% set title %}{% block title %}{{ __('schedule.import.title') }}{% endblock %}{% endset %}
+{% block title %}{{ __('schedule.import.title') }}{% endblock %}
 
 {% block content %}
     <div class="container">
         <h1>
-            {% block content_title %}{{ title }}{% endblock %}
+            {% block content_title %}{{ block('title') }}{% endblock %}
 
             {% if is_index|default(false) %}
                 {{ m.button(m.icon('plus-lg'), url('/admin/schedule/edit'), 'secondary') }}
diff --git a/resources/views/admin/shifts/history.twig b/resources/views/admin/shifts/history.twig
index b3056523..badd0a07 100644
--- a/resources/views/admin/shifts/history.twig
+++ b/resources/views/admin/shifts/history.twig
@@ -2,13 +2,13 @@
 {% import 'macros/base.twig' as m %}
 {% import 'macros/form.twig' as f %}
 
-{% set title %}{% block title %}{{ __('shifts.history') }}{% endblock %}{% endset %}
+{% block title %}{{ __('shifts.history') }}{% endblock %}
 
 {% block content %}
     <div class="container">
         <h1>
             {{ m.button(m.icon('chevron-left'), url('/admin-shifts'), null, 'sm') }}
-            {% block content_title %}{{ title }}{% endblock %}
+            {% block content_title %}{{ block('title') }}{% endblock %}
         </h1>
 
         {% include 'layouts/parts/messages.twig' %}
diff --git a/resources/views/pages/faq/overview.twig b/resources/views/pages/faq/overview.twig
index a61b2f07..5d110761 100644
--- a/resources/views/pages/faq/overview.twig
+++ b/resources/views/pages/faq/overview.twig
@@ -2,9 +2,7 @@
 {% import 'macros/base.twig' as m %}
 {% import 'macros/form.twig' as f %}
 
-{% block title %}
-    {{ __('faq.faq') }}
-{% endblock %}
+{% block title %}{{ __('faq.faq') }}{% endblock %}
 
 {% block content %}
     <div class="container">
diff --git a/resources/views/pages/news/news.twig b/resources/views/pages/news/news.twig
index 25111c28..4e667ae7 100644
--- a/resources/views/pages/news/news.twig
+++ b/resources/views/pages/news/news.twig
@@ -2,10 +2,7 @@
 {% import 'macros/base.twig' as m %}
 {% import 'macros/form.twig' as f %}
 
-{% block title %}
-    {{ m.button(m.icon('chevron-left'), url('/news'), null, 'sm') }}
-    {% if news.is_meeting %}{{ __('news.is_meeting') }} {% endif %}{{ news.title }}
-{% endblock %}
+{% block title %}{% if news.is_meeting %}{{ __('news.is_meeting') }} {% endif %}{{ news.title }}{% endblock %}
 
 {% block news %}
     {{ _self.news(news) }}
diff --git a/resources/views/pages/news/overview.twig b/resources/views/pages/news/overview.twig
index 055517f8..818cceb2 100644
--- a/resources/views/pages/news/overview.twig
+++ b/resources/views/pages/news/overview.twig
@@ -8,6 +8,9 @@
 {% block content %}
     <div class="container">
         <h1>
+            {% if not is_overview|default(false) %}
+                {{ m.button(m.icon('chevron-left'), url('/news'), null, 'sm') }}
+            {% endif %}
             {{ block('title') }}
             {%- if has_permission_to('admin_news') and is_overview|default(false) -%}
                 {{ m.button(m.icon('plus-lg'), url('/admin/news', only_meetings ? {'meeting': 1} : {}), 'secondary') }}
diff --git a/resources/views/pages/questions/overview.twig b/resources/views/pages/questions/overview.twig
index 06b9a5dc..5ec80003 100644
--- a/resources/views/pages/questions/overview.twig
+++ b/resources/views/pages/questions/overview.twig
@@ -2,9 +2,7 @@
 {% import 'macros/base.twig' as m %}
 {% import 'macros/form.twig' as f %}
 
-{% block title %}
-    {{ __('question.questions') }}
-{% endblock %}
+{% block title %}{{ __('question.questions') }}{% endblock %}
 
 {% block content %}
     <div class="container">