diff --git a/src/app/hooks/renderHtml.ts b/src/app/hooks/renderHtml.ts
index 6de177e6..8995e710 100644
--- a/src/app/hooks/renderHtml.ts
+++ b/src/app/hooks/renderHtml.ts
@@ -81,12 +81,12 @@ export const renderHtml: Hook<[any, Mounter], [string, string, string]> = {
         const [cPrefix, cSuffix, cBody] = children.hook(this, childPath, childValue, mounter)
         return `<div class="node-entry"><div class="node ${children.type(childPath)}-node" ${category ? `data-category="${htmlEncode(category)}"` : ''}>
           <div class="node-header">
+            ${error(childPath, mounter)}
+            ${help(childPath, mounter)}
             <button class="remove" data-id="${removeId}">${Octicon.trashcan}</button>
             ${cPrefix}
             <label>${htmlEncode(pathLocale(path.contextPush('entry'), [`${index}`]))}</label>
             ${cSuffix}
-            ${error(childPath, mounter)}
-            ${help(childPath, mounter)}
           </div>
           ${cBody ? `<div class="node-body">${cBody}</div>` : ''}
           </div></div>`
@@ -120,12 +120,12 @@ export const renderHtml: Hook<[any, Mounter], [string, string, string]> = {
           const [cPrefix, cSuffix, cBody] = children.hook(this, childPath, value[key], mounter)
           return `<div class="node-entry"><div class="node ${children.type(childPath)}-node" ${category ? `data-category="${htmlEncode(category)}"` : ''}>
             <div class="node-header">
+              ${error(childPath, mounter)}
+              ${help(childPath, mounter)}
               <button class="remove" data-id="${removeId}">${Octicon.trashcan}</button>
               ${cPrefix}
               <label>${htmlEncode(key)}</label>
               ${cSuffix}
-              ${error(childPath, mounter)}
-              ${help(childPath, mounter)}
             </div>
             ${cBody ? `<div class="node-body">${cBody}</div>` : ''}
             </div></div>`
@@ -173,11 +173,11 @@ export const renderHtml: Hook<[any, Mounter], [string, string, string]> = {
           const [cPrefix, cSuffix, cBody] = field.hook(this, childPath, value[k], mounter)
           return `<div class="node ${field.type(childPath)}-node" ${category ? `data-category="${htmlEncode(category)}"` : ''}>
             <div class="node-header">
+              ${error(childPath, mounter)}
+              ${help(childPath, mounter)}
               ${cPrefix}
               <label>${htmlEncode(pathLocale(childPath))}</label>
               ${cSuffix}
-              ${error(childPath, mounter)}
-              ${help(childPath, mounter)}
             </div>
             ${cBody ? `<div class="node-body">${cBody}</div>` : ''}
             </div>`
diff --git a/src/styles/nodes.css b/src/styles/nodes.css
index f57508fa..8b259989 100644
--- a/src/styles/nodes.css
+++ b/src/styles/nodes.css
@@ -102,19 +102,18 @@
 
 /** Rounded corners */
 
-.node-header > *:first-child {
+.node-header > .node-icon {
+  order: 1;
+}
+
+.node-header > *:first-child,
+.node-header > .node-icon + * {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
 
 .node-header > *:last-child,
-.node-header > input[list]:nth-last-child(2),
-.node[data-help] > .node-header > *:nth-last-child(2),
-.node[data-help] > .node-header > input[list]:nth-last-child(3),
-.node[data-error] > .node-header > *:nth-last-child(2),
-.node[data-error] > .node-header > input[list]:nth-last-child(3),
-.node[data-help][data-error] > .node-header > *:nth-last-child(3),
-.node[data-help][data-error] > .node-header > input[list]:nth-last-child(4) {
+.node-header > input[list]:nth-last-child(2) {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
 }