diff --git a/assets/js/ui.decks.js b/assets/js/ui.decks.js
index edcf91a7..bf75c680 100755
--- a/assets/js/ui.decks.js
+++ b/assets/js/ui.decks.js
@@ -166,6 +166,17 @@
         location.href = Routing.generate('decks_diff', {deck1_uuid: ids[0], deck2_uuid: ids[1]});
     };
 
+    ui.handle_deck_selection_change = function handle_deck_selection_change()
+    {
+        var checked = $('#decks').find('input[type=checkbox]:checked');
+        var button = $('#btn-group-selection button');
+        if (checked.size()) {
+            button.removeClass('btn-default').addClass('btn-primary')
+        } else {
+            button.addClass('btn-default').removeClass('btn-primary')
+        }
+    }
+
     ui.do_action_selection = function do_action_selection(event)
     {
         event.stopPropagation();
@@ -208,18 +219,24 @@
      */
     ui.on_dom_loaded = function on_dom_loaded()
     {
+        $('#decks .select_all').on('click', function ()
+        {
+            $('.list-decks-deck input[type="checkbox"]:not(:checked)').prop('checked', true);
+            ui.handle_deck_selection_change();
+            return false;
+        });
+
+        $('#decks .select_none').on('click', function ()
+        {
+            $('.list-decks-deck input[type="checkbox"]:checked').prop('checked', false);
+            ui.handle_deck_selection_change();
+            return false;
+        });
 
         $('#decks').on('click', 'button.btn-delete-deck', ui.confirm_delete);
         $('#decks').on('click', 'input[type=checkbox]', function (event)
         {
-            var checked = $(this).closest('tbody').find('input[type=checkbox]:checked');
-            var button = $('#btn-group-selection button');
-            if(checked.size()) {
-                button.removeClass('btn-default').addClass('btn-primary')
-            } else {
-                button.addClass('btn-default').removeClass('btn-primary')
-            }
-
+            ui.handle_deck_selection_change();
         });
 
         $('#btn-group-selection').on('click', 'button[id],a[id]', ui.do_action_selection);
diff --git a/templates/Builder/decks.html.twig b/templates/Builder/decks.html.twig
index 2edeb7bf..24ea8c50 100755
--- a/templates/Builder/decks.html.twig
+++ b/templates/Builder/decks.html.twig
@@ -124,8 +124,21 @@
 
                 <table class="table table-expanded list-decks">
                     <tbody id="decks">
+                    {% if decks.count %}
+                        <tr>
+                            <td colspan="4">
+                                <a href="#" class="select_all clickable">
+                                    <span class="fas fa-check"></span> {{ 'decks.all' | trans }}
+                                </a>
+                                /
+                                <a href="#" class="select_none clickable">
+                                    <span class="fas fa-times"></span> {{ 'decks.none' | trans }}
+                                </a>
+                            </td>
+                        </tr>
+                    {% endif %}
                     {% for deck in decks %}
-                        <tr data-id="{{ deck.id }}" data-uuid="{{ deck.uuid }}">
+                        <tr data-id="{{ deck.id }}" data-uuid="{{ deck.uuid }}" class="list-decks-deck">
                             <td><input type="checkbox"></td>
                             <td class="hidden-xs">
                                 <img
diff --git a/translations/messages.de.yml b/translations/messages.de.yml
index 6878ee72..c08fedb9 100644
--- a/translations/messages.de.yml
+++ b/translations/messages.de.yml
@@ -47,6 +47,8 @@ forms:
   sort: Sortieren
 
 decks:
+  all: Alle
+  none: Keine
   privatedecks: Meine privaten Decklisten
   slotcount: "(%current%/%max% Decklisten)"
   version: Version %version%
diff --git a/translations/messages.en.yml b/translations/messages.en.yml
index e7afddfe..0e7249d8 100644
--- a/translations/messages.en.yml
+++ b/translations/messages.en.yml
@@ -47,6 +47,8 @@ forms:
   sort: Sort
 
 decks:
+  all: all
+  none: none
   privatedecks: My private decks
   slotcount: "(%current%/%max% slots)"
   version: Version %version%
diff --git a/translations/messages.es.yml b/translations/messages.es.yml
index a396f78a..88407fa6 100644
--- a/translations/messages.es.yml
+++ b/translations/messages.es.yml
@@ -47,6 +47,8 @@ forms:
   sort: Ordenar
 
 decks:
+  all: todo
+  none: ninguno
   privatedecks: Mis mazos privados
   slotcount: "(%current%/%max% mazos)"
   version: Versión %version%