diff --git a/core/dist/css/decanter.css b/core/dist/css/decanter.css
index 3b6733e9a..ae97fccbf 100644
--- a/core/dist/css/decanter.css
+++ b/core/dist/css/decanter.css
@@ -8697,9 +8697,9 @@ a {
   -moz-osx-font-smoothing: grayscale;
   padding: 0.6rem 2rem;
   display: inline-block;
-  height: 40px;
+  height: 4rem;
   max-width: 100%;
-  border-radius: 30px;
+  border-radius: 3rem;
   font-size: 1.6rem; }
   .su-site-search__input::-webkit-input-placeholder {
     color: #2e2d29;
@@ -8731,16 +8731,13 @@ a {
   margin-top: 0;
   margin-right: 0;
   margin-bottom: 0;
-  background-color: transparent;
+  background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjUiIHZpZXdCb3g9IjAgMCAyNCAyNSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yMS40NzM3IDEwLjIwMTZDMjEuNDczNyAxNC4wMzg1IDE4LjM2MzIgMTcuMTQ5IDE0LjUyNjMgMTcuMTQ5QzEwLjY4OTQgMTcuMTQ5IDcuNTc4OTUgMTQuMDM4NSA3LjU3ODk1IDEwLjIwMTZDNy41Nzg5NSA2LjM2NDY2IDEwLjY4OTQgMy4yNTQyMiAxNC41MjYzIDMuMjU0MjJDMTguMzYzMiAzLjI1NDIyIDIxLjQ3MzcgNi4zNjQ2NiAyMS40NzM3IDEwLjIwMTZaTTI0IDEwLjIwMTZDMjQgMTUuNDMzOCAxOS43NTg1IDE5LjY3NTMgMTQuNTI2MyAxOS42NzUzQzEyLjUwMjkgMTkuNjc1MyAxMC42Mjc3IDE5LjA0MDkgOS4wODg2MiAxNy45NjAzTDIuMTE5OTQgMjQuMzkyOUMxLjYwNzMyIDI0Ljg2NjEgMC44MDgxNzUgMjQuODM0MSAwLjMzNDk5MSAyNC4zMjE1Qy0wLjEzODE5MiAyMy44MDg5IC0wLjEwNjIyNiAyMy4wMDk4IDAuNDA2Mzg5IDIyLjUzNjZMNy4yMjY3OSAxNi4yNDA4QzUuODY4ODIgMTQuNjAxMyA1LjA1MjY0IDEyLjQ5NjggNS4wNTI2NCAxMC4yMDE2QzUuMDUyNjQgNC45Njk0MiA5LjI5NDE1IDAuNzI3OTA1IDE0LjUyNjMgMC43Mjc5MDVDMTkuNzU4NSAwLjcyNzkwNSAyNCA0Ljk2OTQyIDI0IDEwLjIwMTZaIiBmaWxsPSIjMkUyRDI5Ii8+Cjwvc3ZnPgo=) no-repeat 0 0;
   opacity: .6;
   position: absolute;
-  top: 11px;
-  right: 12px;
-  width: auto; }
-  .su-site-search__submit img {
-    display: inline-block;
-    max-width: 24px;
-    max-height: 24px; }
+  top: 1.1rem;
+  right: 1.2rem;
+  width: 24px;
+  height: 25px; }
   .su-site-search__submit:hover, .su-site-search__submit:active, .su-site-search__submit:focus {
     background-color: transparent;
     opacity: 1; }
diff --git a/core/src/scss/components/site-search/_site-search.scss b/core/src/scss/components/site-search/_site-search.scss
index f5d454e54..611981e14 100644
--- a/core/src/scss/components/site-search/_site-search.scss
+++ b/core/src/scss/components/site-search/_site-search.scss
@@ -18,9 +18,9 @@
   @include padding(.6rem 2rem);
 
   display: inline-block;
-  height: 40px;
+  height: 4rem;
   max-width: 100%;
-  border-radius: 30px;
+  border-radius: 3rem;
   font-size: 1.6rem;
 
   &::placeholder {
@@ -37,18 +37,13 @@
   @include padding(0);
   @include margin(0 0 0 null);
 
-  background-color: transparent;
+  background: url("#{$image-path}/icon-search.svg") no-repeat 0 0;
   opacity: .6;
   position: absolute;
-  top: 11px;
-  right: 12px;
-  width: auto;
-
-  img {
-    display: inline-block;
-    max-width: 24px;
-    max-height: 24px;
-  }
+  top: 1.1rem;
+  right: 1.2rem;
+  width: 24px;
+  height: 25px;
 
   &:hover,
   &:active,
diff --git a/core/src/templates/components/main-nav/main-nav.json b/core/src/templates/components/main-nav/main-nav.json
index dea2880f1..e95b9a934 100644
--- a/core/src/templates/components/main-nav/main-nav.json
+++ b/core/src/templates/components/main-nav/main-nav.json
@@ -108,7 +108,6 @@
     "method": "get",
     "search_label": "Search Stanford sites",
     "placeholder": "Search Stanford sites",
-    "search_input_name": "q",
-    "search_icon_src": "/img/icon-search.svg"
+    "search_input_name": "q"
   }
 }
diff --git a/core/src/templates/components/main-nav/main-nav.twig b/core/src/templates/components/main-nav/main-nav.twig
index e30d307ba..804e40eba 100644
--- a/core/src/templates/components/main-nav/main-nav.twig
+++ b/core/src/templates/components/main-nav/main-nav.twig
@@ -59,8 +59,7 @@
         "method": mobile_search.method,
         "search_label": mobile_search.search_label,
         "placeholder": mobile_search.placeholder,
-        "search_input_name": mobile_search.search_input_name,
-        "search_icon_src": mobile_search.search_icon_src
+        "search_input_name": mobile_search.search_input_name
       }
       only
     %}
diff --git a/core/src/templates/components/site-search/site-search.json b/core/src/templates/components/site-search/site-search.json
index 56d0026c1..7ce069fda 100644
--- a/core/src/templates/components/site-search/site-search.json
+++ b/core/src/templates/components/site-search/site-search.json
@@ -3,6 +3,5 @@
   "method": "get",
   "search_label": "Search this site",
   "placeholder": "Search this site",
-  "search_input_name": "search-field",
-  "search_icon_src": "/img/icon-search.svg"
+  "search_input_name": "search-field"
 }
diff --git a/core/src/templates/components/site-search/site-search.twig b/core/src/templates/components/site-search/site-search.twig
index 966bdb6fa..17f714b6a 100644
--- a/core/src/templates/components/site-search/site-search.twig
+++ b/core/src/templates/components/site-search/site-search.twig
@@ -12,10 +12,11 @@
  * - method: Method of the form
  * - search_label: Custom screen reader label
  * - search_input_name: Name for the search input field. Also used as the ID of the search input field and the "for" attribute of the label.
- * - input_attributes: Additional HTML attributes for the search input field
+ * - search_input_attributes: Additional HTML attributes for the search input field
  * - placeholder: Placeholder text for the search input field
- * - button_attributes: Additional HTML attributes for the submit button
- * - search_icon_src: The href property of the search icon image
+ * - search_button_attributes: Additional HTML attributes for the submit button
+ * - search_button_name: The name for the form element. Defaults to 'search'
+ * - search_button_text: The user facing text for the button. Defaults to 'Submit Search'
  * - additional_fields: Any additional fields for the search form, e.g., hidden input fields
  *
  */
@@ -23,8 +24,8 @@
 <div {{- attributes }} class="su-site-search {{ modifier_class }}" role="search">
  <form action="{{ action }}" method="{{ method }}" accept-charset="UTF-8">
   <label class="su-site-search__sr-label" for="{{ search_input_name|default('search-field') }}">{{ search_label|default('Search this site') }}</label>
-  <input {{- input_attributes }} type="text" id="{{ search_input_name|default('search-field') }}" name="{{ search_input_name|default('search-field') }}" class="su-site-search__input" placeholder="{{- placeholder -}}" maxlength="128">
-  <button {{- button_attributes }} type="submit" name="submit" class="su-site-search__submit" aria-label="Search"><img src="{{ search_icon_src }}" alt="Search button" /></button>
+  <input {{- search_input_attributes }} type="text" id="{{ search_input_name|default('search-field') }}" name="{{ search_input_name|default('search-field') }}" class="su-site-search__input" placeholder="{{- placeholder -}}" maxlength="128">
+  <button {{- search_button_attributes }} type="submit" name="{{ search_button_name|default('search') }}" class="su-site-search__submit su-sr-only-text" aria-label="Search">{{ search_button_text|default('Submit Search') }}</button>
   {#- Any additional eg. hidden input fields -#}
   {{- additional_fields -}}
  </form>
diff --git a/core/src/templates/core/fonts/fonts.twig b/core/src/templates/core/fonts/fonts.twig
index 83e752b5b..b588f06bf 100644
--- a/core/src/templates/core/fonts/fonts.twig
+++ b/core/src/templates/core/fonts/fonts.twig
@@ -54,8 +54,8 @@
 </div>
 
 <div class="su-sanskrit">
-  <h2>Noto Sans</h2>
-  <p class="su-font-lead">Noto Sans is a secondary font.</p>
+  <h2>Noto Sans Devanagari (Sanskrit) Subset</h2>
+  <p class="su-font-lead">Noto Sans is a secondary font. It should only be used when Sanskrit font support is needed.</p>
   <h3>Style Variations</h3>
   <div style="font-weight: 400; font-style: normal;">Regular</div>
   <div style="font-weight: 400; font-style: italic;">Regular Italic</div>
diff --git a/kss/builder/decanter/kss-assets/css/kss.css b/kss/builder/decanter/kss-assets/css/kss.css
index 97d6e3b90..451090bb1 100644
--- a/kss/builder/decanter/kss-assets/css/kss.css
+++ b/kss/builder/decanter/kss-assets/css/kss.css
@@ -1914,6 +1914,9 @@ ol.linenums {
   font-weight: normal;
   color: #56554d; }
 
+#kssref-components-site-search .kss-modifier__wrapper {
+  max-width: 40rem; }
+
 #kssref-components-skiplinks .kss-modifier__example {
   z-index: 11222; }
 
diff --git a/kss/builder/decanter/scss/_site-search.scss b/kss/builder/decanter/scss/_site-search.scss
new file mode 100644
index 000000000..04fb8fc82
--- /dev/null
+++ b/kss/builder/decanter/scss/_site-search.scss
@@ -0,0 +1,9 @@
+@charset 'UTF-8';
+
+// The site-search component
+
+#kssref-components-site-search {
+  .kss-modifier__wrapper {
+    max-width: 40rem;
+  }
+}
diff --git a/kss/builder/decanter/scss/kss.scss b/kss/builder/decanter/scss/kss.scss
index 02dee890f..3cf55eb28 100644
--- a/kss/builder/decanter/scss/kss.scss
+++ b/kss/builder/decanter/scss/kss.scss
@@ -55,5 +55,6 @@
   'prettify',
   'print',
   'sidebar',
+  'site-search',
   'skiplinks',
   'toolbar';