diff --git a/components/ILIAS/Like/classes/class.ilLikeGUI.php b/components/ILIAS/Like/classes/class.ilLikeGUI.php
index d72251e718fb..80e8cd253c1a 100755
--- a/components/ILIAS/Like/classes/class.ilLikeGUI.php
+++ b/components/ILIAS/Like/classes/class.ilLikeGUI.php
@@ -137,7 +137,7 @@ public function getHTML(): string
         $ctrl->setParameter($this, "repl_sig", $popover->getReplaceContentSignal()->getId());
         $asyn_url = $ctrl->getLinkTarget($this, "renderEmoticons", "", true, false);
         $popover = $popover->withAsyncContentUrl($asyn_url);
-        $button = $f->button()->shy($lng->txt("like"), '#')
+        $button = $f->button()->standard($lng->txt("like"), '#')
             ->withOnClick($popover->getShowSignal());
 
         $tpl->setVariable("LIKE", $r->render([$popover, $button]));
@@ -190,10 +190,6 @@ protected function renderEmoCounters(
             $tpl->setVariable("ID", $this->dom_id);
         }
 
-        if (count($comps) > 0 && $modal_signal !== null) {
-            $tpl->setVariable("SEP", $r->render($f->divider()->vertical()));
-        }
-
         return $tpl->get();
     }
 
diff --git a/components/ILIAS/Like/templates/default/tpl.emo_counters.html b/components/ILIAS/Like/templates/default/tpl.emo_counters.html
index f7bec58cbaad..a1daf303c568 100755
--- a/components/ILIAS/Like/templates/default/tpl.emo_counters.html
+++ b/components/ILIAS/Like/templates/default/tpl.emo_counters.html
@@ -1 +1 @@
-<span id="{ID}_ec" style="text-align:left;">{MODAL_TRIGGER}{SEP}</span>
\ No newline at end of file
+<span id="{ID}_ec">{MODAL_TRIGGER}</span>
\ No newline at end of file
diff --git a/components/ILIAS/News/Timeline/templates/default/tpl.timeline.html b/components/ILIAS/News/Timeline/templates/default/tpl.timeline.html
index b7b2502990be..401c48bde535 100755
--- a/components/ILIAS/News/Timeline/templates/default/tpl.timeline.html
+++ b/components/ILIAS/News/Timeline/templates/default/tpl.timeline.html
@@ -6,7 +6,7 @@
 		<!-- BEGIN badge --><div class="ilTimelineBadge"><p class="ilTimelineDay">{DAY}</p><p class="ilTimelineMonth">{MONTH}</p></div><!-- END badge -->
 		<div class="ilTimelinePanel">
 			{CONTENT}
-			<div style="position: relative;">
+			<div class="ilTimelinePanelFooter">
 				{FOOTER}
 			</div>
 		</div>
diff --git a/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php b/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php
index ddc6fb94047d..62e2df04a696 100755
--- a/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php
+++ b/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php
@@ -109,7 +109,7 @@ public function render(): string
         $obj_id = $this->news_item->getContextObjId();
 
         // edited?
-        if ($this->news_item->getCreationDate() !== $this->news_item->getUpdateDate()) {
+        if ($this->news_item->getCreationDate() != $this->news_item->getUpdateDate()) {
             $tpl->setCurrentBlock("edited");
             $update_date = new ilDateTime($this->news_item->getUpdateDate()->format('c'), IL_CAL_DATETIME);
             $tpl->setVariable("TXT_EDITED", $this->lng->txt("cont_news_edited"));
diff --git a/components/ILIAS/News/templates/default/tpl.timeline_item.html b/components/ILIAS/News/templates/default/tpl.timeline_item.html
index 621792afbcea..998f66431bd0 100755
--- a/components/ILIAS/News/templates/default/tpl.timeline_item.html
+++ b/components/ILIAS/News/templates/default/tpl.timeline_item.html
@@ -1,4 +1,4 @@
-<div>
+<div class="ilNewsTimelineHeader">
 	<div class="ilNewsTimelineUserImage">
 		{USER_AVATAR}
 		<!-- <img class="media-object" src="{USER_IMAGE}" alt="{USER_TITLE}"> -->
diff --git a/components/ILIAS/Notes/Comment/class.ilCommentGUI.php b/components/ILIAS/Notes/Comment/class.ilCommentGUI.php
index 628bfe9e23ef..22a6d42301c6 100755
--- a/components/ILIAS/Notes/Comment/class.ilCommentGUI.php
+++ b/components/ILIAS/Notes/Comment/class.ilCommentGUI.php
@@ -61,12 +61,7 @@ public function getCommentsHTML(): string
 
     protected function getNoEntriesText(bool $search): string
     {
-        if (!$search) {
-            $mess_txt = $this->lng->txt("notes_no_comments");
-        } else {
-            $mess_txt = $this->lng->txt("notes_no_comments_found");
-        }
-        return $mess_txt;
+        return $search ? $this->lng->txt("notes_no_comments_found") : "";
     }
 
     protected function getItemGroupTitle(int $obj_id = 0): string
diff --git a/components/ILIAS/Notes/Note/class.ilNoteGUI.php b/components/ILIAS/Notes/Note/class.ilNoteGUI.php
index 11dbb52618a6..6b15fe690086 100755
--- a/components/ILIAS/Notes/Note/class.ilNoteGUI.php
+++ b/components/ILIAS/Notes/Note/class.ilNoteGUI.php
@@ -342,10 +342,7 @@ protected function getNotes(): array
                 }
             }
 
-            $ascending = $this->manager->getSortAscending();
-            if ($this->only_latest) {
-                $order = false;
-            }
+            $ascending = !$this->only_latest && $this->manager->getSortAscending();
             $author_id = ($this->note_type === Note::PRIVATE)
                 ? $ilUser->getId()
                 : 0;
@@ -520,15 +517,19 @@ public function getNoteListHTML(
             $mess_txt = "";
             if ($this->show_empty_list_message) {
                 $mess_txt = $this->getNoEntriesText($this->search_text !== "");
-                $mess = $f->messageBox()->info($mess_txt);
-                //$html = $this->renderComponents([$panel, $mess]);
-                $html = $this->renderComponents([$mess]);
-                $tpl->setVariable("NOTES_LIST", $html);
+                if ($mess_txt !== "") {
+                    $mess = $f->messageBox()->info($mess_txt);
+                    //$html = $this->renderComponents([$panel, $mess]);
+                    $html = $this->renderComponents([$mess]);
+                    $tpl->setVariable("NOTES_LIST", $html);
+                }
             }
         } elseif ($this->search_text !== "") {
             $mess_txt = $this->getNoEntriesText(true);
-            $mess = $f->messageBox()->info($mess_txt);
-            $tpl->setVariable("NOTES_LIST", $this->renderComponents([$mess]));
+            if ($mess_txt !== "") {
+                $mess = $f->messageBox()->info($mess_txt);
+                $tpl->setVariable("NOTES_LIST", $this->renderComponents([$mess]));
+            }
         }
 
         ilDatePresentation::setUseRelativeDates($reldates);
@@ -1515,22 +1516,22 @@ public function getWidget(): string
                     $code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
                     return $code;
                 });
-            $comps[] = $f->divider()->vertical();
             $tpl->setVariable("GLYPH", $r->render($comps));
             $tpl->setVariable("TXT_LATEST", $this->getLatestItemText());
-        }
-
-        $b = $f->button()->shy($this->getAddEditItemText(), "#")->withAdditionalOnLoadCode(function ($id) use ($hash, $query_url) {
-            $code = "$('#$id').attr('data-note-key','$hash');\n";
-            $code .= "$('#$id').attr('data-note-ui-type','trigger');\n";
-            $code .= "$('#$id').attr('data-note-query-url','" . $query_url . "');\n";
-            $code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
-            return $code;
-        });
-        if ($ctrl->isAsynch()) {
-            $tpl->setVariable("SHY_BUTTON", $r->renderAsync($b));
         } else {
-            $tpl->setVariable("SHY_BUTTON", $r->render($b));
+            $b = $f
+                ->button()
+                ->standard($this->getAddEditItemText(), "#")
+                ->withAdditionalOnLoadCode(
+                    fn(string $id) => <<<JS
+                        $('#{$id}').attr('data-note-key','{$hash}');
+                        $('#{$id}').attr('data-note-ui-type','trigger');
+                        $('#{$id}').attr('data-note-query-url','{$query_url}');
+                        $('#{$id}').click((event) => ilNotes.clickTrigger(event));
+                    JS
+                );
+
+            $tpl->setVariable("SHY_BUTTON", $ctrl->isAsynch() ? $r->renderAsync($b) : $r->render($b));
         }
 
         $this->widget_header = $tpl->get();
diff --git a/lang/ilias_ar.lang b/lang/ilias_ar.lang
index 27c1af713d22..a09ac2fb76d6 100644
--- a/lang/ilias_ar.lang
+++ b/lang/ilias_ar.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_bg.lang b/lang/ilias_bg.lang
index 37103d4e770c..0f9d4a5b3995 100644
--- a/lang/ilias_bg.lang
+++ b/lang/ilias_bg.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_cs.lang b/lang/ilias_cs.lang
index 4e300dab3d3f..14a0020872ad 100644
--- a/lang/ilias_cs.lang
+++ b/lang/ilias_cs.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Mé komentáře
-notes#:#notes_no_comments#:#Zatím nebyl přidán žádný komentář.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_da.lang b/lang/ilias_da.lang
index 5ccacc246e5d..666e04b69e5f 100644
--- a/lang/ilias_da.lang
+++ b/lang/ilias_da.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Mine kommentarer
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 2d54a91c31bf..0b5d4614ff6f 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -11052,7 +11052,7 @@ lhist#:#lhist_period#:#Period
 lhist#:#lhist_selected#:#Selected
 lhist#:#lhist_show_more#:#Mehr anzeigen
 lhist#:#lhist_type_of_achievement#:#Typ des Lernerfolgs
-like#:#like#:#Like
+like#:#like#:#Reagieren
 like#:#reaction#:#Reaktion
 link#:#link_chapters#:#Kapitel
 link#:#link_link#:#Link
@@ -13110,7 +13110,7 @@ notes#:#note_update_note#:#Notiz bearbeiten
 notes#:#note_without_object#:#Ohne Objektbezug
 notes#:#notes_activate_comments#:#Öffentliches Kommentieren aktivieren
 notes#:#notes_add_comment#:#Kommentar hinzufügen
-notes#:#notes_add_edit_comment#:#Kommentar hinzufügen/editieren
+notes#:#notes_add_edit_comment#:#Kommentieren
 notes#:#notes_add_edit_message#:#Mitteilung hinzufügen/editieren
 notes#:#notes_add_edit_note#:#Notiz hinzufügen/editieren
 notes#:#notes_all_comments#:#Alle Kommentare
@@ -13131,7 +13131,6 @@ notes#:#notes_message_author_you#:#Sie
 notes#:#notes_message_deleted#:#Die Mitteilung wurde gelöscht.
 notes#:#notes_messages#:#Mitteilungen
 notes#:#notes_my_comments#:#Meine Kommentare
-notes#:#notes_no_comments#:#Bisher wurde noch kein Kommentar abgegeben.
 notes#:#notes_no_comments_found#:#Es wurden keine Kommentare gefunden, die den Suchkriterien entsprechen.
 notes#:#notes_no_messages#:#Bisher wurde noch keine Mitteilung hinzugefügt.
 notes#:#notes_no_messages_found#:#Es wurden keine Mitteilungen gefunden, die den Suchkriterien entsprechen.
diff --git a/lang/ilias_el.lang b/lang/ilias_el.lang
index 0983be59ab38..f24d573d8174 100644
--- a/lang/ilias_el.lang
+++ b/lang/ilias_el.lang
@@ -13026,7 +13026,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 5d2c4bc077e8..9dbcd36755ee 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -11026,7 +11026,7 @@ lhist#:#lhist_period#:#Period
 lhist#:#lhist_selected#:#Selected
 lhist#:#lhist_show_more#:#Show More
 lhist#:#lhist_type_of_achievement#:#Type of Achievement
-like#:#like#:#Like
+like#:#like#:#React
 like#:#reaction#:#Reaction
 link#:#link_chapters#:#Chapters
 link#:#link_link#:#Link
@@ -13084,7 +13084,7 @@ notes#:#note_update_note#:#Update Note
 notes#:#note_without_object#:#Without Reference
 notes#:#notes_activate_comments#:#Activate Public Comments
 notes#:#notes_add_comment#:#Add Comment
-notes#:#notes_add_edit_comment#:#Add/Edit Comment
+notes#:#notes_add_edit_comment#:#Comment
 notes#:#notes_add_edit_message#:#Add/Edit Message
 notes#:#notes_add_edit_note#:#Add/Edit Note
 notes#:#notes_all_comments#:#All Comments
@@ -13105,7 +13105,6 @@ notes#:#notes_message_author_you#:#You
 notes#:#notes_message_deleted#:#Message deleted.
 notes#:#notes_messages#:#Messages
 notes#:#notes_my_comments#:#My Comments
-notes#:#notes_no_comments#:#No comments have been posted yet.
 notes#:#notes_no_comments_found#:#No comments found that match your search criteria.
 notes#:#notes_no_messages#:#No messages have been left yet.
 notes#:#notes_no_messages_found#:#No messages found that match your search criteria.
diff --git a/lang/ilias_es.lang b/lang/ilias_es.lang
index b41f726c3ce6..3b70824fb7b7 100644
--- a/lang/ilias_es.lang
+++ b/lang/ilias_es.lang
@@ -13086,7 +13086,6 @@ notes#:#notes_message_author_counterpart#:#Remitente
 notes#:#notes_message_author_you#:#Usted
 notes#:#notes_messages#:#Mensajes
 notes#:#notes_my_comments#:#Mis comentarios
-notes#:#notes_no_comments#:#Aún no se ha publicado ningún comentario.
 notes#:#notes_no_comments_found#:#No se han encontrado comentarios que coincidan con sus criterios de búsqueda.
 notes#:#notes_no_messages#:#Aún no se ha adjuntado ningún mensaje.
 notes#:#notes_no_messages_found#:#No se han encontrado mensajes que coincidan con sus criterios de búsqueda.
diff --git a/lang/ilias_et.lang b/lang/ilias_et.lang
index c7ab92d89998..e7f73798b6ea 100644
--- a/lang/ilias_et.lang
+++ b/lang/ilias_et.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Minu kommentaarid
-notes#:#notes_no_comments#:#No comment has been posted yet.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_fa.lang b/lang/ilias_fa.lang
index 6dd4ffa6a623..35981f6e0521 100644
--- a/lang/ilias_fa.lang
+++ b/lang/ilias_fa.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#نظرهای من
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_fr.lang b/lang/ilias_fr.lang
index a669a46a1a7c..49160ce62283 100644
--- a/lang/ilias_fr.lang
+++ b/lang/ilias_fr.lang
@@ -13010,7 +13010,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###31 10 2023 new variable
 notes#:#notes_message_author_you#:#You###31 10 2023 new variable
 notes#:#notes_messages#:#Messages###31 10 2023 new variable
 notes#:#notes_my_comments#:#Mes Commentaires
-notes#:#notes_no_comments#:#Aucun commentaire actuellement.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###31 10 2023 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###31 10 2023 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###31 10 2023 new variable
diff --git a/lang/ilias_hr.lang b/lang/ilias_hr.lang
index 77f56a71ffb7..218751e90e5e 100644
--- a/lang/ilias_hr.lang
+++ b/lang/ilias_hr.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments
-notes#:#notes_no_comments#:#No comment has been posted yet.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_hu.lang b/lang/ilias_hu.lang
index f1271ccc3d4a..3c937a1067dc 100644
--- a/lang/ilias_hu.lang
+++ b/lang/ilias_hu.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Az én megjegyzéseim
-notes#:#notes_no_comments#:#Még egy megjegyzés sem érkezett.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_it.lang b/lang/ilias_it.lang
index ee903ef4af9d..b18ff0caf835 100644
--- a/lang/ilias_it.lang
+++ b/lang/ilias_it.lang
@@ -13028,7 +13028,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###30 04 2024 new variable
 notes#:#notes_message_author_you#:#You###30 04 2024 new variable
 notes#:#notes_messages#:#Messages###30 04 2024 new variable
 notes#:#notes_my_comments#:#I miei commenti
-notes#:#notes_no_comments#:#Nessun commento è stato ancora pubblicato.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###31 03 2023 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###30 04 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###30 04 2024 new variable
diff --git a/lang/ilias_ja.lang b/lang/ilias_ja.lang
index abf92f4a093c..909d6a1c0703 100644
--- a/lang/ilias_ja.lang
+++ b/lang/ilias_ja.lang
@@ -13099,7 +13099,6 @@ notes#:#notes_message_author_you#:#あなた
 notes#:#notes_message_deleted#:#Message deleted.###21 04 2026 new variable
 notes#:#notes_messages#:#メッセージ
 notes#:#notes_my_comments#:#マイコメント
-notes#:#notes_no_comments#:#コメントが投稿された形跡はまだありません。
 notes#:#notes_no_comments_found#:#検索条件で一致するコメントは見つかりませんでした。
 notes#:#notes_no_messages#:#メッセージはまだ添付されたいません。
 notes#:#notes_no_messages_found#:#検索基準に適合するメッセージは見つかりませんでした。
diff --git a/lang/ilias_ka.lang b/lang/ilias_ka.lang
index c1ebbd302731..85b6dc7507b0 100644
--- a/lang/ilias_ka.lang
+++ b/lang/ilias_ka.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#ჩემი კომენტარები
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_lt.lang b/lang/ilias_lt.lang
index af6e98dc9f24..7b9c32a9a841 100644
--- a/lang/ilias_lt.lang
+++ b/lang/ilias_lt.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_nl.lang b/lang/ilias_nl.lang
index b389579d9ee6..68a58878aeef 100644
--- a/lang/ilias_nl.lang
+++ b/lang/ilias_nl.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Mijn commentaar
-notes#:#notes_no_comments#:#Er is nog geen commentaar geplaatst.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_pl.lang b/lang/ilias_pl.lang
index e5e37e1e9ea3..82afb3c47bc1 100644
--- a/lang/ilias_pl.lang
+++ b/lang/ilias_pl.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Moje komentarze
-notes#:#notes_no_comments#:#Do tej pory nie dodano żadnego komentarza.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_pt.lang b/lang/ilias_pt.lang
index baecbc5b6dc7..01671a0cda70 100644
--- a/lang/ilias_pt.lang
+++ b/lang/ilias_pt.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Os meus comentários
-notes#:#notes_no_comments#:#Ainda não foi publicado nenhum comentário.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_ro.lang b/lang/ilias_ro.lang
index 02aca9fa8d8b..fcb0aab4c721 100644
--- a/lang/ilias_ro.lang
+++ b/lang/ilias_ro.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_ru.lang b/lang/ilias_ru.lang
index bbe760a52683..e8ba24d2eead 100644
--- a/lang/ilias_ru.lang
+++ b/lang/ilias_ru.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments
-notes#:#notes_no_comments#:#Нет опубликованных комментариев.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_sk.lang b/lang/ilias_sk.lang
index 7f8ae586dc62..5a9b63c47746 100644
--- a/lang/ilias_sk.lang
+++ b/lang/ilias_sk.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Mé komentáře
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_sl.lang b/lang/ilias_sl.lang
index f28ff5c9c8e3..1463af403121 100644
--- a/lang/ilias_sl.lang
+++ b/lang/ilias_sl.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments
-notes#:#notes_no_comments#:#No comment has been posted yet.
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###19 08 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_sq.lang b/lang/ilias_sq.lang
index 4ac3b6b07264..726d9339e7b6 100644
--- a/lang/ilias_sq.lang
+++ b/lang/ilias_sq.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_sr.lang b/lang/ilias_sr.lang
index ed08052f4a00..a033a7c8c69d 100644
--- a/lang/ilias_sr.lang
+++ b/lang/ilias_sr.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_sv.lang b/lang/ilias_sv.lang
index 247e4f6c40ec..62f61b636c2e 100644
--- a/lang/ilias_sv.lang
+++ b/lang/ilias_sv.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###21 11 2023 new variable
 notes#:#notes_message_author_you#:#You###21 11 2023 new variable
 notes#:#notes_messages#:#Messages###21 11 2023 new variable
 notes#:#notes_my_comments#:#Mina kommentarer
-notes#:#notes_no_comments#:#Ingen kommentar har gjorts ännu.
 notes#:#notes_no_comments_found#:#Inga kommentarer hittades som matchar sökkriterierna.
 notes#:#notes_no_messages#:#No messages have been attached yet.###21 11 2023 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###21 11 2023 new variable
diff --git a/lang/ilias_tr.lang b/lang/ilias_tr.lang
index cb4140120ce1..77770f3f5ea8 100644
--- a/lang/ilias_tr.lang
+++ b/lang/ilias_tr.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#Yorumlarım
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_uk.lang b/lang/ilias_uk.lang
index ed5334ea9912..f7d0cf28a341 100644
--- a/lang/ilias_uk.lang
+++ b/lang/ilias_uk.lang
@@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_vi.lang b/lang/ilias_vi.lang
index a81ca6df7509..812090b95765 100644
--- a/lang/ilias_vi.lang
+++ b/lang/ilias_vi.lang
@@ -13027,7 +13027,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/lang/ilias_zh.lang b/lang/ilias_zh.lang
index dbdeaeaf4282..8acd90aed06e 100644
--- a/lang/ilias_zh.lang
+++ b/lang/ilias_zh.lang
@@ -13024,7 +13024,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
 notes#:#notes_message_author_you#:#You###26 08 2024 new variable
 notes#:#notes_messages#:#Messages###26 08 2024 new variable
 notes#:#notes_my_comments#:#我的评论
-notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
 notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
 notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
 notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
diff --git a/templates/default/070-components/legacy/Services/_component_like.scss b/templates/default/070-components/legacy/Services/_component_like.scss
index 9a7920615f6f..eaaaf567053d 100755
--- a/templates/default/070-components/legacy/Services/_component_like.scss
+++ b/templates/default/070-components/legacy/Services/_component_like.scss
@@ -1,10 +1,5 @@
 @use "../../../010-settings/" as *;
 
-.ilLike {
-	padding: 5px 0px;
-	text-align: right;
-}
-
 .ilLike .modal {
 	text-align: left;
 }
diff --git a/templates/default/070-components/legacy/Services/_component_news.scss b/templates/default/070-components/legacy/Services/_component_news.scss
index 2525169aa9d2..23c79eee7f4f 100755
--- a/templates/default/070-components/legacy/Services/_component_news.scss
+++ b/templates/default/070-components/legacy/Services/_component_news.scss
@@ -118,6 +118,12 @@ span.ilNewsRssIcon {
 			.panel h2 {
 				display: none;
 			}
+			.ilTimelinePanelFooter {
+				display: flex;
+				flex-direction: column;
+				align-items: flex-end;
+				gap: 8px;
+			}
 		}
 		> .ilTimelineBadge {
 			color: white;
@@ -206,30 +212,27 @@ span.ilNewsRssIcon {
 	z-index: 500;
 }
 
-.ilNewsTimelineUserImage {
-	float: left;
-	overflow: hidden;
-	width: 100px;
+.ilNewsTimelineHeader {
+	display: flex;
+	gap: 20px;
 
-	@media only screen and (max-width: $il-grid-float-breakpoint-max) {
-		width: 50px;
-	}
-}
+	.ilNewsTimelineUserImage {
+		flex-shrink: 0;
 
-.ilNewsTimelineUserImage img {
-	width: 75px;
-	height: 75px;
+		img {
+			width: 75px;
+			height: 75px;
 
-	@media only screen and (max-width: $il-grid-float-breakpoint-max) {
-		width: 40px;
-		height: 40px;
+			@media only screen and (max-width: $il-grid-float-breakpoint-max) {
+				width: 40px;
+				height: 40px;
+			}
+		}
 	}
-}
 
-.ilNewsTimelineContentSection {
-	padding-left: 100px;
-	@media only screen and (max-width: $il-grid-float-breakpoint-max) {
-		padding-left: 50px;
+	.ilNewsTimelineContentSection {
+		flex: 1;
+		min-width: 0;
 	}
 }
 
diff --git a/templates/default/delos.css b/templates/default/delos.css
index 91bec9a0e395..35b28d2b8a27 100644
--- a/templates/default/delos.css
+++ b/templates/default/delos.css
@@ -19856,11 +19856,6 @@ div.ilStartupSection form.form-horizontal {
   padding: 3px 9px;
 }
 
-.ilLike {
-  padding: 5px 0px;
-  text-align: right;
-}
-
 .ilLike .modal {
   text-align: left;
 }
@@ -20447,6 +20442,12 @@ span.ilNewsRssIcon:hover {
 .ilTimeline > li > .ilTimelinePanel .panel h2 {
   display: none;
 }
+.ilTimeline > li > .ilTimelinePanel .ilTimelinePanelFooter {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  gap: 8px;
+}
 .ilTimeline > li > .ilTimelineBadge {
   color: white;
   width: 50px;
@@ -20540,15 +20541,13 @@ span.ilNewsRssIcon:hover {
   z-index: 500;
 }
 
-.ilNewsTimelineUserImage {
-  float: left;
-  overflow: hidden;
-  width: 100px;
+.ilNewsTimelineHeader {
+  display: flex;
+  gap: 20px;
 }
-@media only screen and (max-width: 991px) {
-  .ilNewsTimelineUserImage {
-    width: 50px;
-  }
+
+.ilNewsTimelineUserImage {
+  flex-shrink: 0;
 }
 
 .ilNewsTimelineUserImage img {
@@ -20563,12 +20562,8 @@ span.ilNewsRssIcon:hover {
 }
 
 .ilNewsTimelineContentSection {
-  padding-left: 100px;
-}
-@media only screen and (max-width: 991px) {
-  .ilNewsTimelineContentSection {
-    padding-left: 50px;
-  }
+  flex: 1;
+  min-width: 0;
 }
 
 .ilNewsTimelineEditInfo {