diff --git a/core/src/main/resources/hudson/cli/CLIAction/command.jelly b/core/src/main/resources/hudson/cli/CLIAction/command.jelly
index 53bfdeb07830..9fe61d129e93 100644
--- a/core/src/main/resources/hudson/cli/CLIAction/command.jelly
+++ b/core/src/main/resources/hudson/cli/CLIAction/command.jelly
@@ -24,13 +24,16 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <l:layout permission="${app.READ}">
+  <l:layout permission="${app.READ}" title="Command ${command.name}">
     <st:include page="sidepanel.jelly" it="${app}"/>
     <l:main-panel>
-      <h1>
-        <l:icon class="icon-terminal icon-xlg"/>
-        Command ${command.name}
-      </h1>
+      <div class="jenkins-app-bar">
+        <div class="jenkins-app-bar__content">
+          <h1>
+            Command ${command.name}
+          </h1>
+        </div>
+      </div>
       <j:set var="commandArgs" value="${command.name}${command.singleLineSummary}"/>
       <st:include page="example.jelly"/>
       <pre>
diff --git a/core/src/main/resources/hudson/cli/CLIAction/index.jelly b/core/src/main/resources/hudson/cli/CLIAction/index.jelly
index 29067da07fad..c3a0b817befb 100644
--- a/core/src/main/resources/hudson/cli/CLIAction/index.jelly
+++ b/core/src/main/resources/hudson/cli/CLIAction/index.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <l:layout permission="${app.READ}">
+  <l:layout permission="${app.READ}" title="${%Jenkins CLI}">
     <st:include page="sidepanel.jelly" it="${app}"/>
     <l:main-panel>
       <div class="jenkins-app-bar">
@@ -34,7 +34,7 @@ THE SOFTWARE.
           </h1>
         </div>
       </div>
-      <p>
+      <p class="jenkins-description">
         ${%blurb(rootURL)}
       </p>
       <j:set var="commandArgs" value="help"/>
diff --git a/core/src/main/resources/lib/hudson/scriptConsole.jelly b/core/src/main/resources/lib/hudson/scriptConsole.jelly
index 9cb0503151d9..40fd8ffd1b83 100644
--- a/core/src/main/resources/lib/hudson/scriptConsole.jelly
+++ b/core/src/main/resources/lib/hudson/scriptConsole.jelly
@@ -39,23 +39,30 @@ THE SOFTWARE.
           <j:set var="icon" value="${it.icon}"/>
         </j:otherwise>
       </j:choose>
-      <h1><img src="${imagesURL}/48x48/${icon}" width="48" height="48" alt=""/> ${%Script Console}</h1>
+
+      <div class="jenkins-app-bar">
+        <div class="jenkins-app-bar__content">
+          <h1>${%Script Console}</h1>
+        </div>
+      </div>
 
       <j:choose>
         <j:when test="${it.channel != null}">
-          <p>
+          <p class="jenkins-description">
             ${%description}
           </p>
           <!-- this is where the example goes -->
           <d:invokeBody />
-          <p>
+          <p class="jenkins-form-description">
             ${%description2}
           </p>
 
           <form action="script" method="post">
-            <textarea id="script" name="script" class="script">${request.getParameter('script')}</textarea>
-            <div align="right">
-              <f:submit  value="${%Run}"/>
+            <div>
+              <textarea id="script" name="script" class="script">${request.getParameter('script')}</textarea>
+            </div>
+            <div>
+              <f:submit value="${%Run}"/>
             </div>
           </form>
           <st:adjunct includes="org.kohsuke.stapler.codemirror.mode.groovy.groovy"/>
diff --git a/war/src/main/less/base/typography.less b/war/src/main/less/base/typography.less
index a5a9aa6d766a..934542fb6c3e 100644
--- a/war/src/main/less/base/typography.less
+++ b/war/src/main/less/base/typography.less
@@ -89,5 +89,5 @@ h6,
   color: var(--text-color-secondary);
   line-height: 1.66;
   margin-top: 0;
-  margin-bottom: 2rem;
+  margin-bottom: var(--section-padding);
 }
\ No newline at end of file