diff --git a/src/ui/templates/cards/accordion.hbs b/src/ui/templates/cards/accordion.hbs
index 5a660f860..5fefbcaf5 100644
--- a/src/ui/templates/cards/accordion.hbs
+++ b/src/ui/templates/cards/accordion.hbs
@@ -11,7 +11,7 @@ id="{{id}}">
         {{{_config.title}}}
       </h3>
       <div class="yxt-AccordionCard-icon js-yxt-AccordionCard-icon{{#if isExpanded}} yxt-AccordionCard-icon--expanded{{/if}}">
-        {{> icons/bakedInIcon iconName='chevron'}}
+        {{> icons/builtInIcon iconName='chevron'}}
       </div>
     </button>
   {{else}}
diff --git a/src/ui/templates/cards/standard.hbs b/src/ui/templates/cards/standard.hbs
index b9e026e26..5b859e098 100644
--- a/src/ui/templates/cards/standard.hbs
+++ b/src/ui/templates/cards/standard.hbs
@@ -76,10 +76,10 @@
           <span>
             {{#if hideExcessDetails}}
               {{_config.showMoreText}}
-              {{> icons/bakedInIcon iconName='chevron' classNames='Icon--sm Icon-collapseDown'}}
+              {{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon-collapseDown'}}
             {{else}}
               {{_config.showLessText}}
-              {{> icons/bakedInIcon iconName='chevron' classNames='Icon--sm Icon-collapseUp'}}
+              {{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon-collapseUp'}}
             {{/if}}
           </span>
         </button>
diff --git a/src/ui/templates/controls/filteroptions.hbs b/src/ui/templates/controls/filteroptions.hbs
index f1d47bbe9..e11461b79 100644
--- a/src/ui/templates/controls/filteroptions.hbs
+++ b/src/ui/templates/controls/filteroptions.hbs
@@ -15,11 +15,11 @@
 
             {{#if expanded}}
               <span class="yxt-FilterOptions-expand yxt-FilterOptions-collapseUp">
-                {{> icons/bakedInIcon iconName='chevron'}}
+                {{> icons/builtInIcon iconName='chevron'}}
               </span>
             {{else}}
               <span class="yxt-FilterOptions-expand yxt-FilterOptions-collapseDown">
-                {{> icons/bakedInIcon iconName='chevron'}}
+                {{> icons/builtInIcon iconName='chevron'}}
               </span>
             {{/if}}
           </div>
@@ -49,7 +49,7 @@
       <div class="yxt-FilterOptions-search js-yxt-FilterOptions-search">
         <input type="text" class="yxt-FilterOptions-filter js-yxt-FilterOptions-filter" aria-label="{{searchLabelText}}" placeholder="{{placeholderText}}">
         <button class="yxt-FilterOptions-clearSearch js-yxt-FilterOptions-clearSearch js-hidden">
-          {{> icons/bakedInIcon iconName='close'}}
+          {{> icons/builtInIcon iconName='close'}}
         </button>
       </div>
     {{/if}}
@@ -115,7 +115,7 @@
           {{showLessLabel}}
         </span>
         <span class="yxt-FilterOptions-collapseUp">
-          {{> icons/bakedInIcon iconName='chevron'}}
+          {{> icons/builtInIcon iconName='chevron'}}
         </span>
       </button>
       <button class="yxt-FilterOptions-showToggle js-yxt-FilterOptions-showToggle js-yxt-FilterOptions-showMore{{#unless showMoreState}} hidden{{/unless}}">
@@ -123,7 +123,7 @@
           {{showMoreLabel}}
         </span>
         <span class="yxt-FilterOptions-collapseDown">
-          {{> icons/bakedInIcon iconName='chevron'}}
+          {{> icons/builtInIcon iconName='chevron'}}
         </span>
       </button>
     {{/if}}
diff --git a/src/ui/templates/controls/sortoptions.hbs b/src/ui/templates/controls/sortoptions.hbs
index e796dbfcd..17e566589 100644
--- a/src/ui/templates/controls/sortoptions.hbs
+++ b/src/ui/templates/controls/sortoptions.hbs
@@ -32,14 +32,14 @@
         <button class='yxt-SortOptions-showToggle'>
           {{_config.showMoreLabel}}
           <span class='yxt-SortOptions-collapseDown'>
-            {{> icons/bakedInIcon iconName='chevron'}}
+            {{> icons/builtInIcon iconName='chevron'}}
           </span>
         </button>
       {{else}}
         <button class='yxt-SortOptions-showToggle'>
           {{_config.showLessLabel}}
           <span class='yxt-SortOptions-collapseUp'>
-            {{> icons/bakedInIcon iconName='chevron'}}
+            {{> icons/builtInIcon iconName='chevron'}}
           </span>
         </button>
       {{/if}}
diff --git a/src/ui/templates/filters/filterbox.hbs b/src/ui/templates/filters/filterbox.hbs
index 7630a921b..98dbf1cac 100644
--- a/src/ui/templates/filters/filterbox.hbs
+++ b/src/ui/templates/filters/filterbox.hbs
@@ -2,7 +2,7 @@
   {{#if title}}
     <h2 class="yxt-FilterBox-titleContainer">
       <div>
-        {{> icons/bakedInIcon iconName='elements'}}
+        {{> icons/builtInIcon iconName='elements'}}
       </div>
       <span class="yxt-FilterBox-title">{{title}}</span>
     </h2>
diff --git a/src/ui/templates/icons/bakedInIcon.hbs b/src/ui/templates/icons/builtInIcon.hbs
similarity index 100%
rename from src/ui/templates/icons/bakedInIcon.hbs
rename to src/ui/templates/icons/builtInIcon.hbs
diff --git a/src/ui/templates/navigation/navigation.hbs b/src/ui/templates/navigation/navigation.hbs
index b06aba1bf..7e1267aa0 100644
--- a/src/ui/templates/navigation/navigation.hbs
+++ b/src/ui/templates/navigation/navigation.hbs
@@ -21,7 +21,7 @@
     <div class="yxt-Nav-moreContainer">
       <button id="yxt-Nav-moreButton" class="yxt-Nav-item yxt-Nav-more yxt-Nav-item--more js-yxt-navMore">
         <span class="yxt-Nav-moreIcon">
-          {{> icons/bakedInIcon iconName=overflowIcon}}
+          {{> icons/builtInIcon iconName=overflowIcon}}
         </span>
         {{overflowLabel}}
       </button>
diff --git a/src/ui/templates/questions/questionsubmission.hbs b/src/ui/templates/questions/questionsubmission.hbs
index 0b5274666..767906f2f 100644
--- a/src/ui/templates/questions/questionsubmission.hbs
+++ b/src/ui/templates/questions/questionsubmission.hbs
@@ -9,7 +9,7 @@
     aria-expanded="{{#if questionExpanded}}true{{else}}false{{/if}}">
     <div class="yxt-QuestionSubmission-left">
       <div class="yxt-QuestionSubmission-titleIconWrapper">
-        {{> icons/bakedInIcon iconName=_config.sectionTitleIconName}}
+        {{> icons/builtInIcon iconName=_config.sectionTitleIconName}}
       </div>
       <div class="yxt-QuestionSubmission-title">
         {{_config.sectionTitle}}
@@ -20,7 +20,7 @@
         {{_config.teaser}}
       </div>
       <span class="yxt-QuestionSubmission-toggle{{#if questionExpanded}}--expanded{{else}}--collapsed{{/if}} yxt-QuestionSubmission-toggle">
-        {{> icons/bakedInIcon iconName='chevron'}}
+        {{> icons/builtInIcon iconName='chevron'}}
       </span>
     </div>
   </button>
diff --git a/src/ui/templates/results/alternativeverticals.hbs b/src/ui/templates/results/alternativeverticals.hbs
index 3a0d938d8..026a83081 100644
--- a/src/ui/templates/results/alternativeverticals.hbs
+++ b/src/ui/templates/results/alternativeverticals.hbs
@@ -29,7 +29,7 @@
                 </span>
               </div>
               <div class="yxt-AlternativeVerticals-arrowIconWrapper">
-                {{> icons/bakedInIcon iconName='chevron'}}
+                {{> icons/builtInIcon iconName='chevron'}}
               </div>
             </a>
           </li>
diff --git a/src/ui/templates/results/directanswer.hbs b/src/ui/templates/results/directanswer.hbs
index bcb98b69b..226035262 100644
--- a/src/ui/templates/results/directanswer.hbs
+++ b/src/ui/templates/results/directanswer.hbs
@@ -48,7 +48,7 @@
           <form class="yxt-DirectAnswer-thumbs js-directAnswer-feedback-form">
             <label class="yxt-DirectAnswer-thumb">
               <span class="yxt-DirectAnswer-thumbUpIcon">
-                {{> icons/bakedInIcon iconName='thumb'}}
+                {{> icons/builtInIcon iconName='thumb'}}
               </span>
               <input type="radio"
                     name="feedback"
@@ -60,7 +60,7 @@
             </label>
             <label class="yxt-DirectAnswer-thumb">
               <span class="yxt-DirectAnswer-thumbDownIcon">
-                {{> icons/bakedInIcon iconName='thumb'}}
+                {{> icons/builtInIcon iconName='thumb'}}
               </span>
               <input type="radio"
                     name="feedback"
diff --git a/src/ui/templates/results/pagination.hbs b/src/ui/templates/results/pagination.hbs
index 6dc458079..6df6dd810 100644
--- a/src/ui/templates/results/pagination.hbs
+++ b/src/ui/templates/results/pagination.hbs
@@ -9,10 +9,10 @@
       >
         {{#unless icons.firstButtonIcon}}
           <span class="yxt-Pagination-doubleChevron--left">
-            {{> icons/bakedInIcon iconName='chevron'}}
+            {{> icons/builtInIcon iconName='chevron'}}
           </span>
           <span class="yxt-Pagination-chevron--left">
-            {{> icons/bakedInIcon iconName='chevron'}}
+            {{> icons/builtInIcon iconName='chevron'}}
           </span>
         {{else}}
           <span class="yxt-Pagination-doubleChevron--left">
@@ -30,7 +30,7 @@
     >
       {{#unless icons.previousButtonIcon}}
         <span class="yxt-Pagination-chevron--left">
-          {{> icons/bakedInIcon iconName='chevron'}}
+          {{> icons/builtInIcon iconName='chevron'}}
         </span>
       {{else}}
         <span class="yxt-Pagination-chevron--left">
@@ -96,7 +96,7 @@
     >
       {{#unless icons.nextButtonIcon}}
         <span class="yxt-Pagination-chevron">
-          {{> icons/bakedInIcon iconName='chevron'}}
+          {{> icons/builtInIcon iconName='chevron'}}
         </span>
       {{else}}
         <span class="yxt-Pagination-chevron">
@@ -113,10 +113,10 @@
       >
         {{#unless icons.lastButtonIcon}}
         <span class="yxt-Pagination-doubleChevron">
-          {{> icons/bakedInIcon iconName='chevron'}}
+          {{> icons/builtInIcon iconName='chevron'}}
         </span>
         <span class="yxt-Pagination-chevron">
-          {{> icons/bakedInIcon iconName='chevron'}}
+          {{> icons/builtInIcon iconName='chevron'}}
         </span>
         {{else}}
           <span class="yxt-Pagination-doubleChevron">
diff --git a/src/ui/templates/results/resultsaccordion.hbs b/src/ui/templates/results/resultsaccordion.hbs
index bfdc75e77..938c67fd6 100644
--- a/src/ui/templates/results/resultsaccordion.hbs
+++ b/src/ui/templates/results/resultsaccordion.hbs
@@ -19,7 +19,7 @@
                 {{this.title}}
                 <div class="yxt-AccordionResult-indicatorWrapper" aria-hidden="true">
                   <span class="yxt-AccordionResult-indicator">
-                    {{> icons/bakedInIcon iconName='chevron'}}
+                    {{> icons/builtInIcon iconName='chevron'}}
                   </span>
                 </div>
               </button>
@@ -42,7 +42,7 @@
                             {{#if this.icon}}
                               <div class="yxt-AccordionResult-ctaIconWrapper">
                                 <span class="yxt-AccordionResult-ctaIcon">
-                                  {{> icons/bakedInIcon iconName=this.icon}}
+                                  {{> icons/builtInIcon iconName=this.icon}}
                                 </span>
                               </div>
                             {{/if}}
diff --git a/src/ui/templates/results/verticalresults.hbs b/src/ui/templates/results/verticalresults.hbs
index 998ceb123..940628f9e 100644
--- a/src/ui/templates/results/verticalresults.hbs
+++ b/src/ui/templates/results/verticalresults.hbs
@@ -29,7 +29,7 @@
       {{#if _config.icon}}
         <div class="yxt-Results-titleIconWrapper">
           {{#if iconIsBuiltIn}}
-            {{> icons/bakedInIcon iconName=_config.icon }}
+            {{> icons/builtInIcon iconName=_config.icon }}
           {{else}}
             {{> icons/iconPartial iconUrl=_config.icon }}
           {{/if}}
@@ -78,7 +78,7 @@
     >
       <div class="yxt-Results-viewAllLabel">{{_config.viewMoreLabel}}</div>
       <div>
-        {{> icons/bakedInIcon iconName='chevron'}}
+        {{> icons/builtInIcon iconName='chevron'}}
       </div>
     </a>
   {{/if}}
diff --git a/src/ui/templates/search/search.hbs b/src/ui/templates/search/search.hbs
index f9875280b..9f035e395 100644
--- a/src/ui/templates/search/search.hbs
+++ b/src/ui/templates/search/search.hbs
@@ -29,7 +29,7 @@
                 data-eventtype="SEARCH_CLEAR_BUTTON"
                 data-eventoptions="{{eventOptions}}"
         >
-          {{> icons/bakedInIcon iconName='close'}}
+          {{> icons/builtInIcon iconName='close'}}
           <span class="yxt-SearchBar-clearButtonText sr-only">
             {{clearText}}
           </span>
@@ -38,7 +38,7 @@
           class="js-yext-submit yxt-SearchBar-button">
           {{#if submitIcon}}
             <div class="yxt-SearchBar-buttonImage">
-              {{> icons/bakedInIcon iconName=submitIcon}}
+              {{> icons/builtInIcon iconName=submitIcon}}
             </div>
           {{else if _config.customIconUrl}}
             <div class="yxt-SearchBar-buttonImage">
@@ -47,7 +47,7 @@
           {{else}}
             <div class="yxt-SearchBar-AnimatedIcon yxt-SearchBar-AnimatedIcon--paused js-yxt-AnimatedForward
               {{#if autoFocus}} yxt-SearchBar-AnimatedIcon--inactive{{/if}}">
-              {{> icons/bakedInIcon
+              {{> icons/builtInIcon
                 iconName='yext_animated_forward'
                 classNames='Icon--lg'
                 complexContentsParams=forwardIconOpts.complexContentsParams
@@ -55,7 +55,7 @@
             </div>
             <div class="yxt-SearchBar-AnimatedIcon yxt-SearchBar-AnimatedIcon--paused js-yxt-AnimatedReverse
               {{#unless autoFocus}} yxt-SearchBar-AnimatedIcon--inactive{{/unless}}">
-              {{> icons/bakedInIcon
+              {{> icons/builtInIcon
                 iconName='yext_animated_reverse'
                 classNames='Icon--lg'
                 complexContentsParams=reverseIconOpts.complexContentsParams
@@ -91,7 +91,7 @@
                 data-eventtype="SEARCH_CLEAR_BUTTON"
                 data-eventoptions="{{eventOptions}}"
         >
-          {{> icons/bakedInIcon iconName='close' }}
+          {{> icons/builtInIcon iconName='close' }}
           <span class="yxt-SearchBar-clearButtonText sr-only">
             {{clearText}}
           </span>
@@ -100,7 +100,7 @@
           class="js-yext-submit yxt-SearchBar-button">
           {{#if submitIcon}}
             <div class="yxt-SearchBar-buttonImage">
-              {{> icons/bakedInIcon iconName=submitIcon}}
+              {{> icons/builtInIcon iconName=submitIcon}}
             </div>
           {{else if _config.customIconUrl}}
             <div class="yxt-SearchBar-buttonImage">