diff --git a/app/views/dmsf/_list_view.erb b/app/views/dmsf/_list_view.erb
index ae320033..e89f32e8 100644
--- a/app/views/dmsf/_list_view.erb
+++ b/app/views/dmsf/_list_view.erb
@@ -25,7 +25,8 @@
     <tr>
       <th class="dmsf_checkbox dmsf_th">
         <% if !@system_folder %>
-          <input id="check_all_entries" title="<%= l(:title_check_uncheck_all_for_zip_download_or_email) %>" type="checkbox" />
+          <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
+                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
         <% end %>
       </th>
       <% if DmsfFolder.is_column_on?('id') %>
diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb
index 9349eb77..d2e44b14 100644
--- a/app/views/dmsf/trash.html.erb
+++ b/app/views/dmsf/trash.html.erb
@@ -49,7 +49,8 @@
     <thead>
       <tr>
         <th class="dmsf_checkbox dmsf_th">
-          <input id="check_all_entries" title="<%= l(:title_check_uncheck_all_for_restore_or_delete) %>" type="checkbox" />
+          <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
+                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
         </th>
         <% if DmsfFolder.is_column_on?('id') %>
           <th class="dmsf_th">#</th>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 49d063cf..de494b76 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -62,8 +62,6 @@ cs:
   link_edit: "Upravit %{title}"
   submit_create: Vytvořit
   link_create_folder: Vytvořit složku
-  title_check_uncheck_all_for_zip_download_or_email: Vybrat/Nevybrat vše pro stažení jako zip nebo emailem
-  title_check_uncheck_all_for_restore_or_delete: Vybrat/Nevybrat vše pro obnovení nebo smazání
   link_title: Název
   link_size: Velikost
   link_modified: Změněno
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e2f62b96..f8ce6c1f 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -62,8 +62,6 @@ de:
   link_edit: "Bearbeite %{title}"
   submit_create: Erstellen
   link_create_folder: Ordner erstellen
-  title_check_uncheck_all_for_zip_download_or_email: Wähle alle/keine für ZIP-Download bzw. Email
-  title_check_uncheck_all_for_restore_or_delete: Wähle alle/keine für Rückstellen oder Löschen
   link_title: Titel
   link_size: Größe
   link_modified: Geändert
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 13e1bb7b..b071bd4a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -62,8 +62,6 @@ en:
   link_edit: "Edit %{title}"
   submit_create: Create
   link_create_folder: Create folder
-  title_check_uncheck_all_for_zip_download_or_email: Check/Uncheck all for zip, download or email
-  title_check_uncheck_all_for_restore_or_delete: Check/Uncheck all for restore or delete
   link_title: Title
   link_size: Size
   link_modified: Modified
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9b85cc84..fa57f47c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -62,8 +62,6 @@ es:
   link_edit: "Editar %{title}"
   submit_create: Crear
   link_create_folder: Crear Directorio
-  title_check_uncheck_all_for_zip_download_or_email: Tildar/Destildar todo para crear Zip o enviarlo por email
-  title_check_uncheck_all_for_restore_or_delete: Check/Uncheck all for restore or delete
   link_title: Titulo
   link_size: Tamaño
   link_modified: Modificado
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 27e077f6..0b463c8f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -62,8 +62,6 @@ fr:
   link_edit: "Modification du dossier %{title}"
   submit_create: Ajouter
   link_create_folder: Créer un sous-dossier
-  title_check_uncheck_all_for_zip_download_or_email: Sélectionner/Ignorer tous les documents pour le téléchargement ou pour la transmission par mail
-  title_check_uncheck_all_for_restore_or_delete: Sélectionner/Ignorer pour restaurer ou supprimer
   link_title: Titre
   link_size: Taille
   link_modified: Modifié
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 9fb72097..7776b8a0 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -62,8 +62,6 @@ hu:
   link_edit: "%{title} szerkesztése"
   submit_create: Létrehozás
   link_create_folder: Mappa létrehozása
-  title_check_uncheck_all_for_zip_download_or_email: Mind kijelölése / Kijelölés megszüntetése
-  title_check_uncheck_all_for_restore_or_delete: Mind kijelölése / Kijelölés megszüntetése visszaállításra vagy törlésre
   link_title: Cím
   link_size: Méret
   link_modified: Módosított
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 6b3b071e..8fcfb5d7 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -62,8 +62,6 @@ it: # Italian strings thx 2 Matteo Arceci!
   link_edit: "Modifica %{title}"
   submit_create: Creato
   link_create_folder: Creata cartella
-  title_check_uncheck_all_for_zip_download_or_email: Seleziona/Deseleziona tutto per lo zip, download o email
-  title_check_uncheck_all_for_restore_or_delete: Seleziona/Deseleziona tutto per ripristinare o cancellare
   link_title: Nome documento
   link_size: Dimensioni
   link_modified: Modificato
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d9c6d9b6..a1979537 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -62,8 +62,6 @@ ja:
   link_edit: "%{title} を編集します"
   submit_create: 作成
   link_create_folder: フォルダ作成
-  title_check_uncheck_all_for_zip_download_or_email: すべての Zip ダウンロードまたは電子メールのチェックをオン/オフします
-  title_check_uncheck_all_for_restore_or_delete: すべての復元または削除のチェックをオン/オフします
   title_check_for_restore_or_delete: 復元または削除をチェックします
   link_title: タイトル
   link_size: サイズ
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b6bd3639..0ea6a6d3 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -62,8 +62,6 @@ ko:
   link_edit: "%{title} 수정"
   submit_create: 작성
   link_create_folder: 폴더 작성
-  title_check_uncheck_all_for_zip_download_or_email: Zip, 다운로드 혹은 이메일을 위한 모든 파일 체크/체크
-  title_check_uncheck_all_for_restore_or_delete: 복구 혹은 삭제된 모든 파일 체크/ 체크 해제
   link_title: 제목
   link_size: 사이즈
   link_modified: 수정됨
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 51095d32..48918de4 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -62,8 +62,6 @@ nl:
   link_edit: "Aanpassen %{title}"
   submit_create: Aanmaken
   link_create_folder: Maak map
-  title_check_uncheck_all_for_zip_download_or_email: Vink Aan/Uit voor alle zip, download of e-mail
-  title_check_uncheck_all_for_restore_or_delete: Vink Aan/Uit voor alle herstel of verwijder
   link_title: Titel
   link_size: Bestandsgrootte
   link_modified: Aangepast
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f6b47447..e5f73bd9 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -62,8 +62,6 @@ pl:
   link_edit: "Edytuj %{title}"
   submit_create: Utwórz
   link_create_folder: Utwórz folder
-  title_check_uncheck_all_for_zip_download_or_email: Zaznacz/Odznacz wszystkie aby pobrać plik zip lub wysłać email
-  title_check_uncheck_all_for_restore_or_delete: Check/Uncheck all for restore or delete
   link_title: Tytuł
   link_size: Rozmiar
   link_modified: Zmodyfikowany
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 806c1aa9..67c9588e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -62,8 +62,6 @@ pt-BR:
   link_edit: "Editar %{title}"
   submit_create: Criar
   link_create_folder: Criar pasta
-  title_check_uncheck_all_for_zip_download_or_email: Marcar / Desmarcar tudo para download ou enviar por e-mail
-  title_check_uncheck_all_for_restore_or_delete: Marcar / Desmarcar tudo para restaurar ou deletar
   link_title: Taxonomia
   link_size: Tamanho do arquivo
   link_modified: Última modificação
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c29ba68b..4eff6274 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -62,8 +62,6 @@ ru:
   link_edit: "Редактировать %{title}"
   submit_create: Создать
   link_create_folder: Создать папку
-  title_check_uncheck_all_for_zip_download_or_email: Выбрать/Снять все документы для того, чтобы скачать или отправить их по электронной почте
-  title_check_uncheck_all_for_restore_or_delete: Выбрать/Снять все документы для восстановления или удаления
   link_title: Название
   link_size: Размер
   link_modified: Изменен
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index cae9de94..c3d2803f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -62,8 +62,6 @@ sl:
   link_edit: "Uredi %{title}"
   submit_create: Kreiraj
   link_create_folder: Kreiraj mapo
-  title_check_uncheck_all_for_zip_download_or_email: "Označi/Odznači vse za Zip prenašanje ali email"
-  title_check_uncheck_all_for_restore_or_delete: Check/Uncheck all for restore or delete
   link_title: Naslov
   link_size: Velikost
   link_modified: Spremenjeno
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index ef5c9f35..937fc252 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -62,8 +62,6 @@ zh-TW:
   link_edit: "編輯 %{title}"
   submit_create: 建立
   link_create_folder: 建立資料夾
-  title_check_uncheck_all_for_zip_download_or_email: 全選/全不選（下載或電子郵件發送）
-  title_check_uncheck_all_for_restore_or_delete: Check/Uncheck all for restore or delete
   link_title: 標題
   link_size: 檔案大小
   link_modified: 修改日期
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ebfbf16b..50c0401e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -62,8 +62,6 @@ zh:
   link_edit: "编辑 %{title}"
   submit_create: 创建
   link_create_folder: 创建文件夹
-  title_check_uncheck_all_for_zip_download_or_email: 全选/全不选（zip下载或邮件发送）
-  title_check_uncheck_all_for_restore_or_delete: Check/Uncheck all for restore or delete
   link_title: 主题
   link_size: 大小
   link_modified: 修改日期