diff --git a/core/src/main/resources/lib/form/entry.jelly b/core/src/main/resources/lib/form/entry.jelly
index c89086875bd1..4dddd1dc3ce1 100644
--- a/core/src/main/resources/lib/form/entry.jelly
+++ b/core/src/main/resources/lib/form/entry.jelly
@@ -69,7 +69,7 @@ THE SOFTWARE.
   <!-- expose this so that we can look up the @field value later from prepareDatabinding.jelly -->
   <j:set var="entry" value="${attrs}" />
   <j:set var="possiblyEscapedTitle" value="${escapeEntryTitleAndDescription ? h.escape(attrs.title) : attrs.title}" />
-  <div class='tr form-group'>
+  <div class='jenkins-form-item'>
     <j:choose>
       <j:when test="${possiblyEscapedTitle!=null}">
         <div class="jenkins-form-label help-sibling">
diff --git a/core/src/main/resources/lib/hudson/newFromList/form.jelly b/core/src/main/resources/lib/hudson/newFromList/form.jelly
index 92fef4eb164f..6822d99d3ac7 100644
--- a/core/src/main/resources/lib/hudson/newFromList/form.jelly
+++ b/core/src/main/resources/lib/hudson/newFromList/form.jelly
@@ -52,13 +52,11 @@ THE SOFTWARE.
   <j:set var="descriptors" value="${h.filterDescriptors(it,attrs.descriptors)}" />
 
   <s:form class="jenkins-form" method="post" id="createItemForm" action="${attrs.action?:'createItem'}" name="createItem">
-    <!-- View name field -->
-    <div class="jenkins-form-item">
-      <label for="name" class="jenkins-form-label">${attrs.nameTitle}</label>
+    <s:entry title="${attrs.nameTitle}">
       <s:textbox id="name" name="name" checkUrl="'${h.jsStringEscape(attrs.checkUrl)}?value='+encodeURIComponent(this.value)"
-                 onchange="updateOk()" onkeyup="updateOk()" />
+                 onchange="updateOk(this.form)" onkeyup="updateOk(this.form)" />
       <script>$('name').focus();</script>
-    </div>
+    </s:entry>
 
     <!-- View name field -->
     <div class="jenkins-form-item">
@@ -120,12 +118,12 @@ THE SOFTWARE.
         let nameInput = document.getElementById("name");
         let radios = form.querySelectorAll('input[type="radio"]');
 
-        if (nameInput.value.length == 0) {
+        if (nameInput.value.length === 0) {
           return true;
         }
 
         // this means we only have dummy checkboxes
-        if (radios.length == 2) {
+        if (radios.length === 2) {
           return true;
         }
 
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index 802c82bac374..e79ea566f788 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -273,7 +273,6 @@ pre.console {
 }
 
 .setting-main {
-  margin-top: 0.25rem;
   width: 100%; /* try to make this column as big as possible. */
 }
 
@@ -577,9 +576,10 @@ label.attach-previous {
     padding-left: 20px;
     min-height: 16px;
     line-height: 16px;
-    background-image: url("../../images/16x16/error.png");
+    background-image: url("../../images/svgs/error.svg");
     background-position: left center;
     background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .error-inline {
@@ -593,10 +593,11 @@ label.attach-previous {
     padding-left: 20px;
     min-height: 16px;
     line-height: 16px;
-    background-image: url("../../images/16x16/warning.png");
+    background-image: url("../../images/svgs/warning.svg");
     background-size: 16px 16px;
     background-position: left center;
     background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .warning-inline {