diff --git a/lib/Froxlor/UI/Listing.php b/lib/Froxlor/UI/Listing.php
index 8101d361..8467fb84 100644
--- a/lib/Froxlor/UI/Listing.php
+++ b/lib/Froxlor/UI/Listing.php
@@ -44,6 +44,8 @@ class Listing
         }
 
         return [
+            'title' => $tabellisting['title'],
+            'icon' => $tabellisting['icon'],
             'table' => $table,
             'pagination' => null, // TODO: write some logic
         ];
diff --git a/templates/Froxlor/table/table.html.twig b/templates/Froxlor/table/table.html.twig
index 250ed812..edf2ebce 100644
--- a/templates/Froxlor/table/table.html.twig
+++ b/templates/Froxlor/table/table.html.twig
@@ -1,12 +1,12 @@
-{% macro table(listing, action, title = "") %}
+{% macro table(listing) %}
 
 	<form action="{{ action|default("") }}" method="post" enctype="application/x-www-form-urlencoded" class="form">
-		{% if title is not empty %}
+		{% if listing.title is not empty %}
 			<h3 class="page-header">
-				{% if table_options.icon is not empty %}
-					<i class="{{ table_options.icon }}"></i>
+				{% if listing.icon is not empty %}
+					<i class="{{ listing.icon }}"></i>
 				{% endif %}
-				{{ title }}
+				{{ listing.title }}
 			</h3>
 		{% endif %}
 
diff --git a/templates/Froxlor/user/table.html.twig b/templates/Froxlor/user/table.html.twig
index 574824cf..334b786f 100644
--- a/templates/Froxlor/user/table.html.twig
+++ b/templates/Froxlor/user/table.html.twig
@@ -4,6 +4,6 @@
 
 	{% import "Froxlor/table/table.html.twig" as table %}
 
-	{{ table.table(listing, table_options.title) }}
+	{{ table.table(listing) }}
 
 {% endblock %}