From edd6bcd8dc6efbcdad7283483b45913beb0476a0 Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Fri, 25 Sep 2026 16:21:09 +1000
Subject: [PATCH] fix(windows): add icon and flex layout for warning

---
 windows/src/desktop/kmshell/xml/config.css    | 26 ++++++++++++++-----
 .../desktop/kmshell/xml/keyman_options.xsl    | 15 ++++++-----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/windows/src/desktop/kmshell/xml/config.css b/windows/src/desktop/kmshell/xml/config.css
index cf0316c36f..7293ad9b81 100644
--- a/windows/src/desktop/kmshell/xml/config.css
+++ b/windows/src/desktop/kmshell/xml/config.css
@@ -738,17 +738,29 @@ table tr
 }
 .options_startup_warning
 {
-  background: #FFF4CE;
-  border: 1px solid #D6B656;
-  color: #4A3B00;
+  background: #FFFFFF;
+  border: 2px solid #CC3846;
+  color: #000000;
+  display: flex;
+  align-items: flex-start;
   margin: 4px 8px 8px 32px;
   padding: 8px;
 }
-.options_startup_warning input,
-.options_startup_warning button
+.options_startup_warning_icon
 {
-  margin-left: 0;
-  margin-top: 6px;
+  flex: 0 0 auto;
+  height: 32px;
+  margin: 8px 8px 0 0;
+  width: 32px;
+}
+.options_startup_warning_content
+{
+  flex: 1 1 auto;
+}
+#options .options_startup_warning input,
+#options .options_startup_warning button
+{
+  margin: 6px 0 0;
 }
 #options_control
 {
diff --git a/windows/src/desktop/kmshell/xml/keyman_options.xsl b/windows/src/desktop/kmshell/xml/keyman_options.xsl
index 1d06a83dc9..0fafe7665c 100644
--- a/windows/src/desktop/kmshell/xml/keyman_options.xsl
+++ b/windows/src/desktop/kmshell/xml/keyman_options.xsl
@@ -18,12 +18,15 @@
               <xsl:call-template name="option" />
               <xsl:if test="id='koStartWithWindows' and value='True' and //StartupDisabled='True'">
                 <div class="options_startup_warning">
-                  <div><xsl:value-of select="$locale/string[@name='S_StartupDisabledWarning']"/></div>
-                  <xsl:call-template name="button">
-                    <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_StartupSettings']"/></xsl:with-param>
-                    <xsl:with-param name="command">keyman:options_startupsettings</xsl:with-param>
-                    <xsl:with-param name="tabid">1</xsl:with-param>
-                  </xsl:call-template>
+                  <img class="options_startup_warning_icon" src="/app/caution-icon.png" alt="" />
+                  <div class="options_startup_warning_content">
+                    <div><xsl:value-of select="$locale/string[@name='S_StartupDisabledWarning']"/></div>
+                    <xsl:call-template name="button">
+                      <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_StartupSettings']"/></xsl:with-param>
+                      <xsl:with-param name="command">keyman:options_startupsettings</xsl:with-param>
+                      <xsl:with-param name="tabid">1</xsl:with-param>
+                    </xsl:call-template>
+                  </div>
                 </div>
               </xsl:if>
             </xsl:if>