diff --git a/components/ILIAS/UI/resources/js/Table/dist/table.min.js b/components/ILIAS/UI/resources/js/Table/dist/table.min.js
index 823b92627136..e37da29bc827 100644
--- a/components/ILIAS/UI/resources/js/Table/dist/table.min.js
+++ b/components/ILIAS/UI/resources/js/Table/dist/table.min.js
@@ -12,4 +12,4 @@
  * https://www.ilias.de
  * https://github.com/ILIAS-eLearning
  */
-!function(e,t){"use strict";class s{#e;#t;#s;#i;#a;#o;#n;#r;constructor(e,t,s,i){if(this.#s=document.getElementById(i),null===this.#s)throw new Error(`Could not find a DataTable for id '${i}'.`);if(this.#n=this.#s.getElementsByTagName("table").item(0),null===this.#n)throw new Error("There is no <table> in the component's HTML.");this.#i=this.#s.getElementsByClassName("c-table-data__async_modal_container").item(0),this.#a=this.#s.getElementsByClassName("c-table-data__async_message").item(0),this.#o=this.#a.getElementsByClassName("c-table-data__async_messageresponse").item(0),this.#e=e,this.#t={actionId:t,rowId:s},this.#r={},this.#s.addEventListener("keydown",(e=>this.navigateCellsWithArrowKeys(e)));const a=this.#n.getElementsByClassName("c-table-data__row-selector");for(let e=0;e<a.length;e+=1){a[e].addEventListener("change",(()=>this.selectionChange()))}}registerAction(e,t,s,i){this.#r[e]={async:t,urlBuilder:s,urlTokens:i}}selectionChange(){this.#l(!this.#c())}#c(){const{urlBuilder:e}=this.#r[Object.keys(this.#r).at(0)],{urlTokens:t}=this.#r[Object.keys(this.#r).at(0)],s=t.values().next().value,i=this.collectSelectedRowIds();i.push(i[0]),e.writeParameter(s,i);try{e.getUrl().toString()}catch(e){return!1}return!0}#h(){const e=this.#s.querySelector("dialog.c-table-data__multiaction-warning");il.UI.modal.showModal(e,{},{id:e.id})}#l(e){this.#n.getElementsByClassName("c-table-data__row-selector").forEach((t=>{t.disabled=!0===e&&!t.checked}))}selectAll(e){const t=this.#n.getElementsByClassName("c-table-data__row-selector"),s=this.#n.getElementsByClassName("c-table-data__selection_all").item(0),i=this.#n.getElementsByClassName("c-table-data__selection_none").item(0);for(let s=0;s<t.length;s+=1){if(t[s].checked=e,e&&!this.#c()){this.#l(!0),this.#h();break}}e?(s.style.display="none",i.style.display="block"):(this.#l(!1),s.style.display="block",i.style.display="none")}collectSelectedRowIds(){const e=this.#n.getElementsByClassName("c-table-data__row-selector"),t=[];return e.forEach((e=>{e.checked&&t.push(e.value)})),t}doMultiAction(e){this.doAction(e,this.collectSelectedRowIds())}doSingleAction(e){const t=e.options[this.#t.rowId];this.doAction(e,[t])}doActionForAll(e){const t=e.parentNode.parentNode.parentNode,s=t.getElementsByClassName("close").item(0),i=t.getElementsByClassName("modal-body")[0].getElementsByTagName("select")[0].value;if(i in this.#r){const e=this.#t.actionId,t={options:{}};t.options[e]=i,s.click(),this.doAction(t,["ALL_OBJECTS"])}}doAction(e,t){const s=e.options[this.#t.actionId],i=this.#r[s],a=i.urlTokens.values().next().value;i.urlBuilder.writeParameter(a,t);const o=decodeURI(i.urlBuilder.getUrl().toString());i.async?this.asyncAction(o):window.location.href=o}asyncAction(e){this.#e.ajax({url:e,dataType:"html"}).done((e=>{if("SCRIPT"===this.#e(e).first().prop("tagName"))this.#e.globalEval(this.#e(e).first().text());else{let t;this.#e(e).first().hasClass("c-modal")?(this.#i.innerHTML=e,t=this.#i.firstChild):(this.#o.innerHTML=e,t=this.#a);this.#e(`<div>${e}</div>`).find("[data-replace-marker='script']").each(((e,t)=>this.#e.globalEval(t.innerHTML))),il.UI.modal.showModal(t,{},{id:t.id})}}))}navigateCellsWithArrowKeys(e){if(37!==e.which&&38!==e.which&&39!==e.which&&40!==e.which)return;const t=e.target.closest("td, th"),s=t.closest("tr");let{cellIndex:i}=t,{rowIndex:a}=s;switch(e.which){case 37:i-=1;break;case 39:i+=1;break;case 38:a-=1;break;case 40:a+=1}a<0||i<0||a>=this.#n.rows.length||i>=s.cells.length||this.focusCell(t,a,i)}focusCell(e,t,s){const i=this.#n.rows[t].cells[s];i.focus(),e.setAttribute("tabindex",-1),i.setAttribute("tabindex",0)}}class i{#s;constructor(e){if(this.#s=document.getElementById(e),null===this.#s)throw new Error(`Could not find a PresentationTable for id '${e}'.`)}expandRow(e){const t=this.#s.querySelector(`#${e}`);t.classList.remove("collapsed"),t.classList.add("expanded")}collapseRow(e){const t=this.#s.querySelector(`#${e}`);t.classList.remove("expanded"),t.classList.add("collapsed")}toggleRow(e){this.#s.querySelector(`#${e}`).classList.contains("expanded")?this.collapseRow(e):this.expandRow(e)}expandAll(e){const t=this.#s.querySelectorAll(".il-table-presentation-row");e.options.expand?t.forEach((e=>this.expandRow(e.id))):t.forEach((e=>this.collapseRow(e.id)))}}class a{#s;#n;#d;#g;#w;#m;constructor(e){if(this.#s=document.getElementById(e),null===this.#s)throw new Error(`Could not find a OrderingTable for id '${e}'.`);if(this.#n=this.#s.getElementsByTagName("table").item(0),null===this.#n)throw new Error("There is no <table> in the component's HTML.");this.#p(),this.#d.forEach((e=>this.#u(e)))}#p(){this.#d=Array.from(this.#n.rows),this.#d.shift(),this.#d.pop()}#u(e){e.addEventListener("dragstart",(e=>this.dragstart(e))),e.addEventListener("dragover",(e=>this.dragover(e))),e.addEventListener("dragend",(e=>this.dragend(e))),e.addEventListener("touchstart",(e=>this.touchstart(e))),e.addEventListener("touchmove",(e=>this.touchmove(e))),e.addEventListener("touchend",(e=>this.touchend(e))),e.addEventListener("touchcancel",(e=>this.touchend(e)))}dragstart(e){this.#s.classList.add("dragInProgress"),this.#g=e.target.closest("tr"),e.dataTransfer.clearData(),e.dataTransfer.setData("text/html",this.#g.outerHTML),e.dataTransfer.setData("text/plain",this.#g.textContent.replace(/[\n\r]+|[\s]{2,}/g," ").trim()),this.#w=this.#g.cloneNode(!0),this.#w.classList.add("c-table-data__row--drag-image"),this.#w.style.top="-9999px",this.#s.appendChild(this.#w),e.dataTransfer.setDragImage(this.#w,0,0),this.#m=this.#g.cloneNode(!0),this.#m.addEventListener("dragover",(e=>this.dragover(e))),this.#m.classList.add("c-table-data__row--placeholder"),Array.from(this.#m.getElementsByTagName("td")).forEach((e=>{e.innerHTML=""})),this.#g.classList.add("c-table-data__row--drag-origin")}dragover(e){if(!this.#b())return;e.preventDefault(),e.dataTransfer.effectAllowed="copyMove";const t=e.target.closest("tr");t&&t!==this.#m&&(this.#d.indexOf(t)>this.#d.indexOf(this.#g)?t.after(this.#m):t.before(this.#m))}dragend(e){e.preventDefault(),this.#w&&this.#s.contains(this.#w)&&(this.#s.removeChild(this.#w),this.#w=null),this.#m.replaceWith(this.#g),this.#g.classList.remove("c-table-data__row--drag-origin"),this.#g.classList.add("c-table-data__row--drag-settle"),this.#g.addEventListener("animationend",(()=>this.#y()),{once:!0}),this.#s.classList.remove("dragInProgress"),this.#p(),this.#R()}#y(){this.#g.classList.remove("c-table-data__row--drag-settle")}#b(){return this.#d.includes(this.#g)}touchstart(e){this.#g=e.target.closest("tr"),this.#m=this.#g.cloneNode(!0),this.#m.classList.add("c-table-data__row--placeholder"),Array.from(this.#m.getElementsByTagName("td")).forEach((e=>{e.innerHTML=""})),this.#w=this.#g.cloneNode(!0),this.#w.classList.add("c-table-data__row--touch-drag-image"),this.#s.appendChild(this.#w),this.#g.classList.add("c-table-data__row--drag-origin")}touchmove(e){e.preventDefault();const t=e.touches[0];this.#w.style.left=`${t.clientX+-50}px`,this.#w.style.top=`${t.clientY}px`;const s=document.elementFromPoint(t.clientX,t.clientY)?.closest("tr");s&&this.#d.includes(s)&&(this.#d.indexOf(s)>this.#d.indexOf(this.#g)?s.after(this.#m):s.before(this.#m)),t.clientY<100?this.#f(-8):t.clientY>window.innerHeight-100?this.#f(8):this.#v()}touchend(){this.#s.removeChild(this.#w),this.#m.replaceWith(this.#g),this.#g.classList.remove("c-table-data__row--drag-origin"),this.#p(),this.#R()}#R(){let e=10;this.#n.querySelectorAll('input[type="number"]').forEach((t=>{t.value=e,e+=10}))}#f(e){this.scrollInterval||(this.scrollInterval=setInterval((()=>{window.scrollBy(0,e)}),16))}#v(){this.scrollInterval&&(clearInterval(this.scrollInterval),this.scrollInterval=null)}}e.UI=e.UI||{},e.UI.table=e.UI.table||{},e.UI.table.data=new class{#e;#E=[];constructor(e){this.#e=e}init(e,t,i){if(void 0!==this.#E[e])throw new Error(`DataTable with id '${e}' has already been initialized.`);this.#E[e]=new s(this.#e,t,i,e)}get(e){return this.#E[e]??null}}(t),e.UI.table.presentation=new class{#E=[];init(e){if(void 0!==this.#E[e])throw new Error(`PresentationTable with input-id '${e}' has already been initialized.`);this.#E[e]=new i(e)}get(e){return this.#E[e]??null}},e.UI.table.ordering=new class{#E=[];init(e){if(void 0!==this.#E[e])throw new Error(`OrderingTable with id '${e}' has already been initialized.`);this.#E[e]=new a(e)}get(e){return this.#E[e]??null}}}(il,$);
+!function(e,t){"use strict";class s{#e;#t;#s;#i;#o;#a;#n;#r;constructor(e,t,s,i){if(this.#s=document.getElementById(i),null===this.#s)throw new Error(`Could not find a DataTable for id '${i}'.`);if(this.#n=this.#s.getElementsByTagName("table").item(0),null===this.#n)throw new Error("There is no <table> in the component's HTML.");this.#i=this.#s.getElementsByClassName("c-table-data__async_modal_container").item(0),this.#o=this.#s.getElementsByClassName("c-table-data__async_message").item(0),this.#a=this.#o.getElementsByClassName("c-table-data__async_messageresponse").item(0),this.#e=e,this.#t={actionId:t,rowId:s},this.#r={},this.#s.addEventListener("keydown",(e=>this.navigateCellsWithArrowKeys(e)));const o=this.#n.getElementsByClassName("c-table-data__row-selector");for(let e=0;e<o.length;e+=1){o[e].addEventListener("change",(()=>this.selectionChange()))}this.#l()}#l(){const e=Array.from(this.#s.querySelectorAll("input.c-table-data__row-selector")),t=()=>{const t=Array.from(new Set(e.map((e=>e.checked))));if(1===t.length)this.selectAll(t[0]);else{const e=document.querySelector(".c-table-data__header__rowselection.state");e.classList.remove("all"),e.classList.remove("none"),e.classList.add("some")}};e.forEach((e=>e.addEventListener("input",t)))}registerAction(e,t,s,i){this.#r[e]={async:t,urlBuilder:s,urlTokens:i}}selectionChange(){this.#c(!this.#h())}#h(){const{urlBuilder:e}=this.#r[Object.keys(this.#r).at(0)],{urlTokens:t}=this.#r[Object.keys(this.#r).at(0)],s=t.values().next().value,i=this.collectSelectedRowIds();i.push(i[0]),e.writeParameter(s,i);try{e.getUrl().toString()}catch(e){return!1}return!0}#d(){const e=this.#s.querySelector("dialog.c-table-data__multiaction-warning");il.UI.modal.showModal(e,{},{id:e.id})}#c(e){this.#n.getElementsByClassName("c-table-data__row-selector").forEach((t=>{t.disabled=!0===e&&!t.checked}))}selectAll(e){const t=this.#n.getElementsByClassName("c-table-data__row-selector"),s=this.#n.querySelector(".c-table-data__header__rowselection.state");for(let s=0;s<t.length;s+=1){if(t[s].checked=e,e&&!this.#h()){this.#c(!0),this.#d();break}}s.classList.remove("some"),e?(s.classList.add("none"),s.classList.remove("all")):(this.#c(!1),s.classList.add("all"),s.classList.remove("none"))}collectSelectedRowIds(){const e=this.#n.getElementsByClassName("c-table-data__row-selector"),t=[];return e.forEach((e=>{e.checked&&t.push(e.value)})),t}doMultiAction(e){this.doAction(e,this.collectSelectedRowIds())}doSingleAction(e){const t=e.options[this.#t.rowId];this.doAction(e,[t])}doActionForAll(e){const t=e.parentNode.parentNode.parentNode,s=t.getElementsByClassName("close").item(0),i=t.getElementsByClassName("modal-body")[0].getElementsByTagName("select")[0].value;if(i in this.#r){const e=this.#t.actionId,t={options:{}};t.options[e]=i,s.click(),this.doAction(t,["ALL_OBJECTS"])}}doAction(e,t){const s=e.options[this.#t.actionId],i=this.#r[s],o=i.urlTokens.values().next().value;i.urlBuilder.writeParameter(o,t);const a=decodeURI(i.urlBuilder.getUrl().toString());i.async?this.asyncAction(a):window.location.href=a}asyncAction(e){this.#e.ajax({url:e,dataType:"html"}).done((e=>{if("SCRIPT"===this.#e(e).first().prop("tagName"))this.#e.globalEval(this.#e(e).first().text());else{let t;this.#e(e).first().hasClass("c-modal")?(this.#i.innerHTML=e,t=this.#i.firstChild):(this.#a.innerHTML=e,t=this.#o);this.#e(`<div>${e}</div>`).find("[data-replace-marker='script']").each(((e,t)=>this.#e.globalEval(t.innerHTML))),il.UI.modal.showModal(t,{},{id:t.id})}}))}navigateCellsWithArrowKeys(e){if(37!==e.which&&38!==e.which&&39!==e.which&&40!==e.which)return;const t=e.target.closest("td, th"),s=t.closest("tr");let{cellIndex:i}=t,{rowIndex:o}=s;switch(e.which){case 37:i-=1;break;case 39:i+=1;break;case 38:o-=1;break;case 40:o+=1}o<0||i<0||o>=this.#n.rows.length||i>=s.cells.length||this.focusCell(t,o,i)}focusCell(e,t,s){const i=this.#n.rows[t].cells[s];i.focus(),e.setAttribute("tabindex",-1),i.setAttribute("tabindex",0)}}class i{#s;constructor(e){if(this.#s=document.getElementById(e),null===this.#s)throw new Error(`Could not find a PresentationTable for id '${e}'.`)}expandRow(e){const t=this.#s.querySelector(`#${e}`);t.classList.remove("collapsed"),t.classList.add("expanded")}collapseRow(e){const t=this.#s.querySelector(`#${e}`);t.classList.remove("expanded"),t.classList.add("collapsed")}toggleRow(e){this.#s.querySelector(`#${e}`).classList.contains("expanded")?this.collapseRow(e):this.expandRow(e)}expandAll(e){const t=this.#s.querySelectorAll(".il-table-presentation-row");e.options.expand?t.forEach((e=>this.expandRow(e.id))):t.forEach((e=>this.collapseRow(e.id)))}}class o{#s;#n;#g;#m;#w;#p;constructor(e){if(this.#s=document.getElementById(e),null===this.#s)throw new Error(`Could not find a OrderingTable for id '${e}'.`);if(this.#n=this.#s.getElementsByTagName("table").item(0),null===this.#n)throw new Error("There is no <table> in the component's HTML.");this.#u(),this.#g.forEach((e=>this.#b(e)))}#u(){this.#g=Array.from(this.#n.rows),this.#g.shift(),this.#g.pop()}#b(e){e.addEventListener("dragstart",(e=>this.dragstart(e))),e.addEventListener("dragover",(e=>this.dragover(e))),e.addEventListener("dragend",(e=>this.dragend(e))),e.addEventListener("touchstart",(e=>this.touchstart(e))),e.addEventListener("touchmove",(e=>this.touchmove(e))),e.addEventListener("touchend",(e=>this.touchend(e))),e.addEventListener("touchcancel",(e=>this.touchend(e)))}dragstart(e){this.#s.classList.add("dragInProgress"),this.#m=e.target.closest("tr"),e.dataTransfer.clearData(),e.dataTransfer.setData("text/html",this.#m.outerHTML),e.dataTransfer.setData("text/plain",this.#m.textContent.replace(/[\n\r]+|[\s]{2,}/g," ").trim()),this.#w=this.#m.cloneNode(!0),this.#w.classList.add("c-table-data__row--drag-image"),this.#w.style.top="-9999px",this.#s.appendChild(this.#w),e.dataTransfer.setDragImage(this.#w,0,0),this.#p=this.#m.cloneNode(!0),this.#p.addEventListener("dragover",(e=>this.dragover(e))),this.#p.classList.add("c-table-data__row--placeholder"),Array.from(this.#p.getElementsByTagName("td")).forEach((e=>{e.innerHTML=""})),this.#m.classList.add("c-table-data__row--drag-origin")}dragover(e){if(!this.#y())return;e.preventDefault(),e.dataTransfer.effectAllowed="copyMove";const t=e.target.closest("tr");t&&t!==this.#p&&(this.#g.indexOf(t)>this.#g.indexOf(this.#m)?t.after(this.#p):t.before(this.#p))}dragend(e){e.preventDefault(),this.#w&&this.#s.contains(this.#w)&&(this.#s.removeChild(this.#w),this.#w=null),this.#p.replaceWith(this.#m),this.#m.classList.remove("c-table-data__row--drag-origin"),this.#m.classList.add("c-table-data__row--drag-settle"),this.#m.addEventListener("animationend",(()=>this.#R()),{once:!0}),this.#s.classList.remove("dragInProgress"),this.#u(),this.#f()}#R(){this.#m.classList.remove("c-table-data__row--drag-settle")}#y(){return this.#g.includes(this.#m)}touchstart(e){this.#m=e.target.closest("tr"),this.#p=this.#m.cloneNode(!0),this.#p.classList.add("c-table-data__row--placeholder"),Array.from(this.#p.getElementsByTagName("td")).forEach((e=>{e.innerHTML=""})),this.#w=this.#m.cloneNode(!0),this.#w.classList.add("c-table-data__row--touch-drag-image"),this.#s.appendChild(this.#w),this.#m.classList.add("c-table-data__row--drag-origin")}touchmove(e){e.preventDefault();const t=e.touches[0];this.#w.style.left=`${t.clientX+-50}px`,this.#w.style.top=`${t.clientY}px`;const s=document.elementFromPoint(t.clientX,t.clientY)?.closest("tr");s&&this.#g.includes(s)&&(this.#g.indexOf(s)>this.#g.indexOf(this.#m)?s.after(this.#p):s.before(this.#p)),t.clientY<100?this.#v(-8):t.clientY>window.innerHeight-100?this.#v(8):this.#L()}touchend(){this.#s.removeChild(this.#w),this.#p.replaceWith(this.#m),this.#m.classList.remove("c-table-data__row--drag-origin"),this.#u(),this.#f()}#f(){let e=10;this.#n.querySelectorAll('input[type="number"]').forEach((t=>{t.value=e,e+=10}))}#v(e){this.scrollInterval||(this.scrollInterval=setInterval((()=>{window.scrollBy(0,e)}),16))}#L(){this.scrollInterval&&(clearInterval(this.scrollInterval),this.scrollInterval=null)}}e.UI=e.UI||{},e.UI.table=e.UI.table||{},e.UI.table.data=new class{#e;#E=[];constructor(e){this.#e=e}init(e,t,i){if(void 0!==this.#E[e])throw new Error(`DataTable with id '${e}' has already been initialized.`);this.#E[e]=new s(this.#e,t,i,e)}get(e){return this.#E[e]??null}}(t),e.UI.table.presentation=new class{#E=[];init(e){if(void 0!==this.#E[e])throw new Error(`PresentationTable with input-id '${e}' has already been initialized.`);this.#E[e]=new i(e)}get(e){return this.#E[e]??null}},e.UI.table.ordering=new class{#E=[];init(e){if(void 0!==this.#E[e])throw new Error(`OrderingTable with id '${e}' has already been initialized.`);this.#E[e]=new o(e)}get(e){return this.#E[e]??null}}}(il,$);
diff --git a/components/ILIAS/UI/resources/js/Table/src/datatable.class.js b/components/ILIAS/UI/resources/js/Table/src/datatable.class.js
index 99c460228388..f29d859707b5 100755
--- a/components/ILIAS/UI/resources/js/Table/src/datatable.class.js
+++ b/components/ILIAS/UI/resources/js/Table/src/datatable.class.js
@@ -108,6 +108,25 @@ export default class DataTable {
       const col = cols[i];
       col.addEventListener('change', () => this.selectionChange());
     }
+
+    this.#checkForStateChanges();
+  }
+
+  #checkForStateChanges()
+  {
+    const checkboxes = Array.from(this.#component.querySelectorAll('input.c-table-data__row-selector'));
+    const updateState = () => {
+      const allSame = Array.from(new Set(checkboxes.map(n => n.checked)));
+      if (allSame.length === 1) {
+        this.selectAll(allSame[0]);
+      } else {
+        const d = document.querySelector('.c-table-data__header__rowselection.state');
+        d.classList.remove('all');
+        d.classList.remove('none');
+        d.classList.add('some');
+      }
+    };
+    checkboxes.forEach(n => n.addEventListener('input', updateState));
   }
 
   /**
@@ -178,8 +197,7 @@ export default class DataTable {
    */
   selectAll(state) {
     const cols = this.#table.getElementsByClassName('c-table-data__row-selector');
-    const selectorAll = this.#table.getElementsByClassName('c-table-data__selection_all').item(0);
-    const selectorNone = this.#table.getElementsByClassName('c-table-data__selection_none').item(0);
+    const header = this.#table.querySelector('.c-table-data__header__rowselection.state');
 
     for (let i = 0; i < cols.length; i += 1) {
       const col = cols[i];
@@ -191,13 +209,14 @@ export default class DataTable {
       }
     }
 
+    header.classList.remove('some');
     if (state) {
-      selectorAll.style.display = 'none';
-      selectorNone.style.display = 'block';
+      header.classList.add('none');
+      header.classList.remove('all');
     } else {
       this.#disableRowSelection(false);
-      selectorAll.style.display = 'block';
-      selectorNone.style.display = 'none';
+      header.classList.add('all');
+      header.classList.remove('none');
     }
   }
 
diff --git a/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php
index 5f11031c401d..28befc9a2ba3 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php
@@ -343,11 +343,13 @@ protected function renderActionsHeader(
             $signal = $component->getSelectionSignal();
             $sig_all = clone $signal;
             $sig_all->addOption('select', true);
-            $select_all = $glyph_factory->add()->withOnClick($sig_all);
+            $select_all = $glyph_factory->unselect()->withOnClick($sig_all);
+            $clear = $glyph_factory->clear()->withOnClick($sig_all);
             $signal->addOption('select', false);
-            $select_none = $glyph_factory->close()->withOnClick($signal);
+            $select_none = $glyph_factory->select()->withOnClick($signal);
             $tpl->setVariable('SELECTION_CONTROL_SELECT', $default_renderer->render($select_all));
             $tpl->setVariable('SELECTION_CONTROL_DESELECT', $default_renderer->render($select_none));
+            $tpl->setVariable('SELECTION_CONTROL_CLEAR', $default_renderer->render($clear));
         }
 
         if ($component instanceof Component\Table\Ordering) {
diff --git a/components/ILIAS/UI/src/templates/default/Table/tpl.datatable.html b/components/ILIAS/UI/src/templates/default/Table/tpl.datatable.html
index b3cbd734bfa4..848684fec944 100755
--- a/components/ILIAS/UI/src/templates/default/Table/tpl.datatable.html
+++ b/components/ILIAS/UI/src/templates/default/Table/tpl.datatable.html
@@ -12,9 +12,10 @@ <h2 class="ilHeader" id="{ID}_label">{TITLE}</h2>
 				<tr class="c-table-data__header c-table-data__row">
 
 					<!-- BEGIN header_rowselection_cell -->
-					<th class="c-table-data__header c-table-data__cell c-table-data__header__rowselection" tabindex="-1" aria-colindex="1">
+					<th class="c-table-data__header c-table-data__cell c-table-data__header__rowselection state all" tabindex="-1" aria-colindex="1">
 						<div class="c-table-data__selection_all">{SELECTION_CONTROL_SELECT}</div>
 						<div class="c-table-data__selection_none">{SELECTION_CONTROL_DESELECT}</div>
+						<div class="c-table-data__selection_some">{SELECTION_CONTROL_CLEAR}</div>
 					</th>
 					<!-- END header_rowselection_cell -->
 
diff --git a/templates/default/070-components/UI-framework/Table/_ui-component_table.scss b/templates/default/070-components/UI-framework/Table/_ui-component_table.scss
index 5e5dd670d967..ac595c3b406e 100755
--- a/templates/default/070-components/UI-framework/Table/_ui-component_table.scss
+++ b/templates/default/070-components/UI-framework/Table/_ui-component_table.scss
@@ -195,6 +195,24 @@ th.c-table-data__cell {
     }
 }
 
+th.c-table-data__cell.c-table-data__header__rowselection{
+    &.state.all {
+        .c-table-data__selection_all { display: block; }
+        .c-table-data__selection_none { display: none; }
+        .c-table-data__selection_some { display : none; }
+    }
+    &.state.some {
+        .c-table-data__selection_all { display: none; }
+        .c-table-data__selection_none { display: none; }
+        .c-table-data__selection_some { display : block; }
+    }
+    &.state.none {
+        .c-table-data__selection_all { display: none; }
+        .c-table-data__selection_none { display: block; }
+        .c-table-data__selection_some { display : none; }
+    }
+}
+
 // stick under breadcrumbs when they are present
 
 .breadcrumbs + #mainspacekeeper th.c-table-data__cell {
diff --git a/templates/default/delos.css b/templates/default/delos.css
index e6bde764a022..76b85c262e99 100644
--- a/templates/default/delos.css
+++ b/templates/default/delos.css
@@ -12015,6 +12015,34 @@ th.c-table-data__cell {
   }
 }
 
+th.c-table-data__cell.c-table-data__header__rowselection.state.all .c-table-data__selection_all {
+  display: block;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.all .c-table-data__selection_none {
+  display: none;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.all .c-table-data__selection_some {
+  display: none;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.some .c-table-data__selection_all {
+  display: none;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.some .c-table-data__selection_none {
+  display: none;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.some .c-table-data__selection_some {
+  display: block;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.none .c-table-data__selection_all {
+  display: none;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.none .c-table-data__selection_none {
+  display: block;
+}
+th.c-table-data__cell.c-table-data__header__rowselection.state.none .c-table-data__selection_some {
+  display: none;
+}
+
 @media screen and (min-width: 993px) {
   .breadcrumbs + #mainspacekeeper th.c-table-data__cell {
     top: 32px;