diff --git a/core/src/main/resources/hudson/tasks/Shell/global.groovy b/core/src/main/resources/hudson/tasks/Shell/global.groovy
deleted file mode 100644
index 5b3c3c7596..0000000000
--- a/core/src/main/resources/hudson/tasks/Shell/global.groovy
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2011, CloudBees, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.tasks.Shell
-f=namespace(lib.FormTagLib)
-
-f.section(title:_("Shell")) {
-    f.entry(field: 'shell', title:_("Shell executable")) {
-        f.textbox()
-    }
-}
diff --git a/core/src/main/resources/hudson/tasks/Shell/global.jelly b/core/src/main/resources/hudson/tasks/Shell/global.jelly
new file mode 100644
index 0000000000..2c6cb76225
--- /dev/null
+++ b/core/src/main/resources/hudson/tasks/Shell/global.jelly
@@ -0,0 +1,33 @@
+<!--
+The MIT License
+
+Copyright (c) 2025, Stefan Spieker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+    <f:section title="${%Shell}">
+        <f:entry title="${%Shell executable}" field="shell">
+            <f:textbox />
+        </f:entry>
+    </f:section>
+</j:jelly>
+
diff --git a/core/src/main/resources/lib/form/repeatable/repeatable.js b/core/src/main/resources/lib/form/repeatable/repeatable.js
index 3f19dcfb7e..5c81b3810a 100644
--- a/core/src/main/resources/lib/form/repeatable/repeatable.js
+++ b/core/src/main/resources/lib/form/repeatable/repeatable.js
@@ -143,11 +143,11 @@ var repeatableSupport = {
   // called when 'add' button is clicked
   onAdd: function (n) {
     var addOnTop = false;
+    if (n.classList.contains("repeatable-add-top")) {
+      addOnTop = true;
+    }
     while (n.tag == null) {
       n = n.parentNode;
-      if (n.classList.contains("repeatable-add-top")) {
-        addOnTop = true;
-      }
     }
     n.tag.expand(addOnTop);
     // Hack to hide tool home when a new tool has some installers.
diff --git a/src/main/js/components/command-palette/models.js b/src/main/js/components/command-palette/models.js
index 79d35fcf7b..ced3aa4266 100644
--- a/src/main/js/components/command-palette/models.js
+++ b/src/main/js/components/command-palette/models.js
@@ -19,7 +19,7 @@ export function LinkResult(params) {
       return `<a class="jenkins-command-palette__results__item" href="${xmlEscape(
         params.url,
       )}">
-        ${params.type === "image" ? `<img alt="${xmlEscape(params.label)}" class="jenkins-command-palette__results__item__icon" src="${params.icon}" />` : ""}
+        ${params.type === "image" ? `<img alt="${xmlEscape(params.label)}" class="jenkins-command-palette__results__item__icon jenkins-avatar" src="${params.icon}" />` : ""}
         ${params.type !== "image" ? `<div class="jenkins-command-palette__results__item__icon">${params.icon}</div>` : ""}
         ${xmlEscape(params.label)}
         ${params.isExternal ? Symbols.EXTERNAL_LINK : ""}
diff --git a/src/main/scss/components/_avatar.scss b/src/main/scss/components/_avatar.scss
index d1aa785b8b..5e1185cc30 100644
--- a/src/main/scss/components/_avatar.scss
+++ b/src/main/scss/components/_avatar.scss
@@ -1,8 +1,14 @@
 .jenkins-avatar {
   &[src] {
     border-radius: 100px;
-    outline: 1px solid color-mix(in sRGB, var(--text-color) 10%, transparent);
-    background: color-mix(in sRGB, var(--text-color) 5%, transparent);
-    outline-offset: -1px;
+    outline: var(--jenkins-border-width) solid
+      color-mix(in sRGB, var(--text-color-secondary) 10%, transparent);
+    background: color-mix(in sRGB, var(--text-color-secondary) 5%, transparent);
+    outline-offset: calc(var(--jenkins-border-width) * -1);
+    object-fit: cover;
+
+    @media (prefers-contrast: more) {
+      outline-color: var(--text-color);
+    }
   }
 }
diff --git a/src/main/scss/components/_command-palette.scss b/src/main/scss/components/_command-palette.scss
index 8bec54eb62..656c34f8f2 100644
--- a/src/main/scss/components/_command-palette.scss
+++ b/src/main/scss/components/_command-palette.scss
@@ -186,14 +186,6 @@ $command-palette-background: color-mix(
           width: 1.25rem;
           height: 1.25rem;
         }
-
-        &[src] {
-          border-radius: 100px;
-          outline: 1px solid
-            color-mix(in sRGB, var(--text-color) 10%, transparent);
-          background: color-mix(in sRGB, var(--text-color) 5%, transparent);
-          outline-offset: -1px;
-        }
       }
 
       &__description {