diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
index 488407988acf..9b3127ec5ef2 100644
--- a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
@@ -27,7 +27,15 @@ THE SOFTWARE.
 <div class="jenkins-alert jenkins-alert-warning">
   <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
     <f:submit name="yes" value="${%Tell me more}"/>
-    <f:submit name="no" value="${%Dismiss}"/>
+      <l:isAdmin>
+        <button type="submit"
+                class="jenkins-button jenkins-button--tertiary"
+                name="no"
+                value="${%Dismiss}"
+                title="${%Dismiss}">
+          <l:icon src="symbol-close"/>
+        </button>
+      </l:isAdmin>
   </form>
   ${%blurb(app.rootDir)}
 </div>
diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
index c6d274d99031..2d3ac81cfaa6 100644
--- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
@@ -27,7 +27,15 @@ THE SOFTWARE.
   <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%Manage}"/>
-      <f:submit name="no" value="${%Dismiss}"/>
+      <l:isAdmin>
+        <button type="submit"
+                class="jenkins-button jenkins-button--tertiary"
+                name="no"
+                value="${%Dismiss}"
+                title="${%Dismiss}">
+          <l:icon src="symbol-close"/>
+        </button>
+      </l:isAdmin>
     </form>
     ${%You have data stored in an older format and/or unreadable data.}
   </div>
diff --git a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
index c7367563a257..f4cfff5e5eed 100644
--- a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
@@ -28,7 +28,12 @@ THE SOFTWARE.
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%More Info}"/>
       <l:isAdmin>
-        <f:submit name="no" value="${%Dismiss}"/>
+        <button type="submit"
+                class="jenkins-button jenkins-button--tertiary"
+                value="${%Dismiss}"
+                name="no">
+          <l:icon src="symbol-close"/>
+        </button>
       </l:isAdmin>
     </form>
     <div>${%blurb}</div>
diff --git a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
index 178bbebeddb6..3ad6faa3768c 100644
--- a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
@@ -28,7 +28,12 @@ THE SOFTWARE.
     <l:isAdmin>
       <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
         <f:submit name="yes" value="${%Create a view now}"/>
-        <f:submit name="no" value="${%Dismiss}"/>
+        <button type="submit"
+                class="jenkins-button jenkins-button--tertiary"
+                value="${%Dismiss}"
+                name="no">
+          <l:icon src="symbol-close"/>
+        </button>
       </form>
     </l:isAdmin>
     ${%blurb}
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly
index 52a2bd1df659..042d2cd8a220 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly
@@ -26,7 +26,13 @@ THE SOFTWARE.
 <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">
   <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/disable">
-      <f:submit value="${%Dismiss}"/>
+      <button type="submit"
+              class="jenkins-button jenkins-button--tertiary"
+              name="no"
+              value="${%Dismiss}"
+              title="${%Dismiss}">
+        <l:icon src="symbol-close"/>
+      </button>
     </form>
     ${%blurb(rootURL)}
   </div>
diff --git a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly
index 5cbd262425a3..62c81b0341b4 100644
--- a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly
@@ -27,8 +27,13 @@ THE SOFTWARE.
   <div class="jenkins-alert jenkins-alert-warning">
      <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%Manage}"/>
-      <f:submit name="no" value="${%Dismiss}"/>
-     </form>
+      <button type="submit"
+              class="jenkins-button jenkins-button--tertiary"
+              value="${%Dismiss}"
+              name="no">
+        <l:icon src="symbol-close"/>
+      </button>
+      </form>
 
     ${%ExecutorsWarning}
   </div>
diff --git a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly
index 1f8f0fb8bd8c..bde25db6a13a 100644
--- a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly
@@ -28,7 +28,12 @@ THE SOFTWARE.
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="agent" value="${%Set up agent}"/>
       <f:submit name="cloud" value="${%Set up cloud}"/>
-      <f:submit name="no" value="${%Dismiss}"/>
+      <button type="submit"
+              class="jenkins-button jenkins-button--tertiary"
+              value="${%Dismiss}"
+              name="no">
+        <l:icon src="symbol-close"/>
+      </button>
     </form>
     ${%ExecutorsWarning}
   </div>
diff --git a/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly b/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly
index 94a5b777b58c..617f75ad6ed4 100644
--- a/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly
@@ -26,7 +26,13 @@ THE SOFTWARE.
   <div class="jenkins-alert jenkins-alert-warning">
     <l:isAdmin>
       <form method="post" action="${rootURL}/${it.url}/disable">
-        <f:submit value="${%Dismiss}"/>
+        <button type="submit"
+                class="jenkins-button jenkins-button--tertiary"
+                name="no"
+                value="${%Dismiss}"
+                title="${%Dismiss}">
+          <l:icon src="symbol-close"/>
+        </button>
       </form>
     </l:isAdmin>
     <j:set var="actionAnchor">
diff --git a/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly b/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly
index 65895c8c79c4..e3a9ac240f2f 100644
--- a/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly
@@ -27,8 +27,14 @@ THE SOFTWARE.
   <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%Setup Security}"/>
-      <f:submit name="no" value="${%Dismiss}"/>
-    </form>
+        <button type="submit"
+                class="jenkins-button jenkins-button--tertiary"
+                name="no"
+                value="${%Dismiss}"
+                title="${%Dismiss}">
+          <l:icon src="symbol-close"/>
+        </button>
+      </form>
     ${%blurb}
   </div>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly b/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly
index b9ea4fd3ed9c..b42f79062cb7 100644
--- a/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly
+++ b/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly
@@ -3,7 +3,13 @@
     <div class="jenkins-alert jenkins-alert-warning">
         <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
             <f:submit name="yes" value="${%Apply Migration}"/>
-            <f:submit name="no" value="${%Dismiss}"/>
+            <button type="submit"
+                class="jenkins-button jenkins-button--tertiary"
+                name="no"
+                value="${%Dismiss}"
+                title="${%Dismiss}">
+                <l:icon src="symbol-close"/>
+            </button>
         </form>
         ${%blurb}
     </div>
diff --git a/core/src/main/resources/jenkins/security/csp/impl/CspRecommendation/message.jelly b/core/src/main/resources/jenkins/security/csp/impl/CspRecommendation/message.jelly
index 02aed15ae431..013b525eb3ac 100644
--- a/core/src/main/resources/jenkins/security/csp/impl/CspRecommendation/message.jelly
+++ b/core/src/main/resources/jenkins/security/csp/impl/CspRecommendation/message.jelly
@@ -22,11 +22,18 @@ 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">
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
     <div class="jenkins-alert jenkins-alert-info">
         <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
             <f:submit name="more" value="${%Learn more}"/>
-            <f:submit name="dismiss" primary="false" value="${%Dismiss}"/>
+        <l:isAdmin>
+            <button type="submit"
+                    class="jenkins-button jenkins-button--tertiary"
+                    value="${%Dismiss}"
+                    name="dismiss">
+              <l:icon src="symbol-close"/>
+            </button>
+        </l:isAdmin>
         </form>
         ${%blurb}
     </div>
diff --git a/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly b/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly
index 392a1a8677bf..a1ed87371566 100644
--- a/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly
@@ -25,7 +25,14 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <div class="jenkins-alert jenkins-alert-warning">
         <form method="post" action="${rootURL}/${it.url}/disable">
-            <f:submit value="${%Dismiss}"/>
+            <l:isAdmin>
+                <button type="submit"
+                        class="jenkins-button jenkins-button--tertiary"
+                        value="${%Dismiss}"
+                        name="no">
+                <l:icon src="symbol-close"/>
+                </button>
+            </l:isAdmin>
         </form>
         <j:set var="referenceAnchor">
             <a href="https://www.jenkins.io/redirect/csrf-protection" rel="noopener noreferrer" target="_blank">${%referenceUrlContent}</a>