diff --git a/templates/sortable_table_macro.html.twig b/templates/sortable_table_macro.html.twig
new file mode 100644
index 0000000..eb4ff21
--- /dev/null
+++ b/templates/sortable_table_macro.html.twig
@@ -0,0 +1,33 @@
+{#
+    Sortable table headers ('<th></th>' blocks)
+
+    If you're using this macro then you must comply with convention and use following query parameters:
+        - query - search query
+        - page - current page for pager
+        - order-by - which column is currently used for orderring
+        - order - order direction ('asc' or 'desc')
+
+    'columns' argument must be an associative array like:
+        'Human readable column name' => 'propertyName'
+#}
+{% macro sortable_columns(columns) %}
+    {% set route = app.request.attributes.get('_route') %}
+    {% set query = app.request.query.get('query') %}
+    {% set page = app.request.query.get('page') %}
+    {% set orderBy = app.request.query.get('order-by') %}
+    {% set order = app.request.query.get('order') %}
+    {% for column, property in columns %}
+        <th scope="col">
+            {% if property is not null %}
+            <a href="{{ path(route, {
+                'query': query,
+                'page': page,
+                'order-by': property,
+                'order': (order and property == orderBy) ? ('asc' == order|lower ? 'desc' : 'asc') : 'asc'
+            }) }}">{{ column | raw }}</a>
+            {% else %}
+                {{ column | raw }}
+            {% endif %}
+        </th>
+    {% endfor %}
+{% endmacro %}
\ No newline at end of file
diff --git a/templates/torrent_list.html.twig b/templates/torrent_list.html.twig
index 5133f93..5821794 100644
--- a/templates/torrent_list.html.twig
+++ b/templates/torrent_list.html.twig
@@ -1,16 +1,19 @@
 {% block content %}
+    {% import 'sortable_table_macro.html.twig' as sortable %}
 
     <div class="pagination">
         {{ pagerfanta(torrents) }}
     </div>
 
     <table class="table">
-        <thead>
+        <thead class="thead-light">
         <tr>
-            <th scope="col">&#128279;</th>
-            <th scope="col">Name</th>
-            <th scope="col">Size</th>
-            <th scope="col">Discovered</th>
+            {{ sortable.sortable_columns({
+                '<i class="icon-magnet"></i>': null,
+                'Name': 'name',
+                'Size': 'totalSize',
+                'Discovered': 'discoveredOn'
+            }) }}
         </tr>
         </thead>
         {# @var torrent \App\Magnetico\Entity\Torrent #}