diff --git a/ofu_app/templates/donar/home.jinja b/ofu_app/templates/donar/home.jinja
index ddc5e20..4f4b6b1 100644
--- a/ofu_app/templates/donar/home.jinja
+++ b/ofu_app/templates/donar/home.jinja
@@ -6,8 +6,9 @@
 {% block content %}
     <div class="container text-dark">
         <div class="row">
-            {{ macros.home_item(title='All Rooms', url_id='all-rooms', description='Übersicht über alle Lehrräume an der Universität Bamberg.') }}
-            {{ macros.home_item(title='Search Rooms', url_id='search-rooms', description='Du weißt nicht wo du hin musst? Hier kannst du ihn finden.') }}
+            {{ macros.home_item_with_icon(icon='fa-map-o', url_id='search-rooms', title="Donar", icon_size='fa-3x') }}
+            {{ macros.home_item_with_icon(icon='fa-search', link='https://suche.wiai.de/', title="Roofis", icon_size='fa-3x') }}
+            {{ macros.home_item_with_icon(icon='fa-bus', url_id='', title='Bus und Bahn', icon_size='fa-3x') }}
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/ofu_app/templates/home.jinja b/ofu_app/templates/home.jinja
index 789ac78..b49f4b8 100644
--- a/ofu_app/templates/home.jinja
+++ b/ofu_app/templates/home.jinja
@@ -3,7 +3,7 @@
 {% block headline %}
     <header class="">
         <h1 class="text-center" style="font-size: 20px">BaStA</h1>
-        <p class="text-center">Bamberger Studenten App</p>
+        <p class="text-center">Bamberger Studierenden App</p>
     </header>
 {% endblock %}
 {% block content %}
diff --git a/ofu_app/templates/macros/overview_pages.jinja b/ofu_app/templates/macros/overview_pages.jinja
index 437ba04..55ec543 100644
--- a/ofu_app/templates/macros/overview_pages.jinja
+++ b/ofu_app/templates/macros/overview_pages.jinja
@@ -12,14 +12,30 @@
     </div>
 {% endmacro %}
 
-{% macro home_item_with_icon(icon, url_id) -%}
+{% macro home_item_with_icon(icon, icon_size='fa-4x', url_id='', link='', title='') -%}
     <div class="col-6 p-3">
         <div class="card">
-            <a href="{{ url(url_id) }}">
-                <div class="card-body">
-                    <h4 class="card-title"><i class="fa {{ icon }} fa-4x" aria-hidden="true"></i></h4>
-                </div>
-            </a>
+            {% if url_id %}
+                <a href="{{ url(url_id) }}">
+                    <div class="card-body">
+                        <h4 class="card-title text-center"><i class="fa {{ icon }} {{ icon_size }}"
+                                                              aria-hidden="true"></i></h4>
+                        {% if title %}
+                            <p class="text-center">{{ title }}</p>
+                        {% endif %}
+                    </div>
+                </a>
+            {% else %}
+                <a href="{{ link }}">
+                    <div class="card-body">
+                        <h4 class="card-title text-center"><i class="fa {{ icon }} {{ icon_size }}"
+                                                              aria-hidden="true"></i></h4>
+                        {% if title %}
+                            <p class="text-center">{{ title }}</p>
+                        {% endif %}
+                    </div>
+                </a>
+            {% endif %}
         </div>
     </div>
 {% endmacro %}