diff --git a/ghost/admin/app/templates/about.hbs b/ghost/admin/app/templates/about.hbs
index 0fb989057e..57dc7da862 100644
--- a/ghost/admin/app/templates/about.hbs
+++ b/ghost/admin/app/templates/about.hbs
@@ -1,6 +1,6 @@
 <section class="gh-canvas js-settings-content">
     <header class="gh-canvas-header">
-        {{inline-svg "ghost-logo" class="gh-logo" alt="Ghost"}}
+        {{svg-jar "ghost-logo" class="gh-logo" alt="Ghost"}}
     </header>
     <section class="view-container">
         <section class="gh-env-details">
diff --git a/ghost/admin/app/templates/components/gh-alert.hbs b/ghost/admin/app/templates/components/gh-alert.hbs
index e46ade5f19..38104b707e 100644
--- a/ghost/admin/app/templates/components/gh-alert.hbs
+++ b/ghost/admin/app/templates/components/gh-alert.hbs
@@ -1,4 +1,4 @@
 <div class="gh-alert-content">
     {{message.message}}
 </div>
-<button class="gh-alert-close" {{action "closeNotification"}}>{{inline-svg "close"}}<span class="hidden">Close</span></button>
+<button class="gh-alert-close" {{action "closeNotification"}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
diff --git a/ghost/admin/app/templates/components/gh-date-time-picker.hbs b/ghost/admin/app/templates/components/gh-date-time-picker.hbs
index 5e77e4f5fe..9aa780e625 100644
--- a/ghost/admin/app/templates/components/gh-date-time-picker.hbs
+++ b/ghost/admin/app/templates/components/gh-date-time-picker.hbs
@@ -9,7 +9,7 @@
         {{#dp.trigger tabindex="-1" data-test-date-time-picker-datepicker=true}}
             <div class="gh-date-time-picker-date {{if dateError "error"}}">
                 <input type="text" readonly value={{moment-format _date "MM/DD/YYYY"}} disabled={{disabled}} data-test-date-time-picker-date-input>
-                {{inline-svg "calendar"}}
+                {{svg-jar "calendar"}}
             </div>
         {{/dp.trigger}}
         {{#dp.content class="dropdown-menu"}}
diff --git a/ghost/admin/app/templates/components/gh-image-uploader-with-preview.hbs b/ghost/admin/app/templates/components/gh-image-uploader-with-preview.hbs
index 3926d1da61..3f94edb6b9 100644
--- a/ghost/admin/app/templates/components/gh-image-uploader-with-preview.hbs
+++ b/ghost/admin/app/templates/components/gh-image-uploader-with-preview.hbs
@@ -2,7 +2,7 @@
     <div class="gh-image-uploader -with-image">
         <div><img src={{image}}></div>
         <a class="image-cancel" title="Delete" {{action "remove"}}>
-            {{inline-svg "trash"}}
+            {{svg-jar "trash"}}
             <span class="hidden">Delete</span>
         </a>
     </div>
diff --git a/ghost/admin/app/templates/components/gh-image-uploader.hbs b/ghost/admin/app/templates/components/gh-image-uploader.hbs
index c36e0bc321..d63e8c8f8c 100644
--- a/ghost/admin/app/templates/components/gh-image-uploader.hbs
+++ b/ghost/admin/app/templates/components/gh-image-uploader.hbs
@@ -20,7 +20,7 @@
 
         {{#if (and allowUnsplash settings.unsplash.isActive)}}
             <div class="gh-image-uploader-unsplash" {{action (toggle "_showUnsplash" this)}}>
-                {{inline-svg "unsplash"}}
+                {{svg-jar "unsplash"}}
             </div>
         {{/if}}
     </div>
diff --git a/ghost/admin/app/templates/components/gh-mobile-nav-bar.hbs b/ghost/admin/app/templates/components/gh-mobile-nav-bar.hbs
index fd911ddb9d..38143b12d5 100644
--- a/ghost/admin/app/templates/components/gh-mobile-nav-bar.hbs
+++ b/ghost/admin/app/templates/components/gh-mobile-nav-bar.hbs
@@ -1,9 +1,9 @@
-{{#link-to "editor.new" classNames="gh-nav-main-editor"}}{{inline-svg "pen"}}New story{{/link-to}}
+{{#link-to "editor.new" classNames="gh-nav-main-editor"}}{{svg-jar "pen"}}New story{{/link-to}}
 {{#if (eq router.currentRouteName "posts.index")}}
-    {{#link-to "posts" (query-params type=null) classNames="gh-nav-main-content active"}}{{inline-svg "content"}}Stories{{/link-to}}
+    {{#link-to "posts" (query-params type=null) classNames="gh-nav-main-content active"}}{{svg-jar "content"}}Stories{{/link-to}}
 {{else}}
-    {{#link-to "posts" classNames="gh-nav-main-content"}}{{inline-svg "content"}}Content{{/link-to}}
+    {{#link-to "posts" classNames="gh-nav-main-content"}}{{svg-jar "content"}}Content{{/link-to}}
 {{/if}}
-{{#link-to "team" classNames="gh-nav-main-users"}}{{inline-svg "account-group"}}Team{{/link-to}}
-<div class="gh-mobile-nav-bar-more" {{action "openMobileMenu" target=ui}}>{{inline-svg "icon" class="icon-gh"}}More</div>
+{{#link-to "team" classNames="gh-nav-main-users"}}{{svg-jar "account-group"}}Team{{/link-to}}
+<div class="gh-mobile-nav-bar-more" {{action "openMobileMenu" target=ui}}>{{svg-jar "icon" class="icon-gh"}}More</div>
 {{yield}}
diff --git a/ghost/admin/app/templates/components/gh-modal-dialog.hbs b/ghost/admin/app/templates/components/gh-modal-dialog.hbs
index 9fe3ab94bc..3f81857326 100644
--- a/ghost/admin/app/templates/components/gh-modal-dialog.hbs
+++ b/ghost/admin/app/templates/components/gh-modal-dialog.hbs
@@ -2,7 +2,7 @@
     <article class="{{klass}} js-modal">
         <section class="modal-content" {{action "noBubble" bubbles=false preventDefault=false}}>
             {{#if title}}<header class="modal-header"><h1>{{title}}</h1></header>{{/if}}
-            {{#if showClose}}<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>{{/if}}
+            {{#if showClose}}<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>{{/if}}
             <section class="modal-body">
                 {{yield}}
             </section>
diff --git a/ghost/admin/app/templates/components/gh-nav-menu.hbs b/ghost/admin/app/templates/components/gh-nav-menu.hbs
index e86b1d67b7..dfc949457e 100644
--- a/ghost/admin/app/templates/components/gh-nav-menu.hbs
+++ b/ghost/admin/app/templates/components/gh-nav-menu.hbs
@@ -6,16 +6,16 @@
             <div class="gh-nav-menu-details-blog">{{config.blogTitle}}</div>
             <div class="gh-nav-menu-details-user">{{session.user.name}}</div>
         </div>
-        {{inline-svg "arrow-down-small"}}
+        {{svg-jar "arrow-down-small"}}
     {{/dropdown.trigger}}
     {{#dropdown.content class="gh-nav-menu-dropdown"}}
         <ul class="dropdown-menu dropdown-triangle-top" role="menu" {{action dropdown.actions.close on="click" preventDefault=false}}>
-            <li role="presentation">{{#link-to "about" classNames="gh-nav-menu-about dropdown-item js-nav-item" role="menuitem" tabindex="-1"}}{{inline-svg "store"}} About Ghost{{/link-to}}</li>
+            <li role="presentation">{{#link-to "about" classNames="gh-nav-menu-about dropdown-item js-nav-item" role="menuitem" tabindex="-1"}}{{svg-jar "store"}} About Ghost{{/link-to}}</li>
             <li class="divider"></li>
-            <li role="presentation">{{#link-to "team.user" session.user.slug classNames="dropdown-item user-menu-profile js-nav-item" role="menuitem" tabindex="-1"}}{{inline-svg "user-circle"}} Your Profile{{/link-to}}</li>
-            <li role="presentation"><a class="dropdown-item help-menu-support" role="menuitem" tabindex="-1" href="https://help.ghost.org/" target="_blank">{{inline-svg "ambulance"}} Support Center</a></li>
-            <li role="presentation"><a class="dropdown-item help-menu-tweet" role="menuitem" tabindex="-1" href="https://twitter.com/intent/tweet?text=%40TryGhost+Hi%21+Can+you+help+me+with+&related=TryGhost" target="_blank" onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;">{{inline-svg "twitter"}} Tweet @TryGhost!</a></li>
-            <li role="presentation"><a class="dropdown-item help-menu-how-to" role="menuitem" tabindex="-1" href="https://ghosthelp.zendesk.com/hc/en-us/categories/203268947-Ghost-Pro-" target="_blank">{{inline-svg "book-open"}} How to Use Ghost</a></li>
+            <li role="presentation">{{#link-to "team.user" session.user.slug classNames="dropdown-item user-menu-profile js-nav-item" role="menuitem" tabindex="-1"}}{{svg-jar "user-circle"}} Your Profile{{/link-to}}</li>
+            <li role="presentation"><a class="dropdown-item help-menu-support" role="menuitem" tabindex="-1" href="https://help.ghost.org/" target="_blank">{{svg-jar "ambulance"}} Support Center</a></li>
+            <li role="presentation"><a class="dropdown-item help-menu-tweet" role="menuitem" tabindex="-1" href="https://twitter.com/intent/tweet?text=%40TryGhost+Hi%21+Can+you+help+me+with+&related=TryGhost" target="_blank" onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;">{{svg-jar "twitter"}} Tweet @TryGhost!</a></li>
+            <li role="presentation"><a class="dropdown-item help-menu-how-to" role="menuitem" tabindex="-1" href="https://ghosthelp.zendesk.com/hc/en-us/categories/203268947-Ghost-Pro-" target="_blank">{{svg-jar "book-open"}} How to Use Ghost</a></li>
             <li class="divider"></li>
 
             {{#if showDropdownExtension}}
@@ -26,13 +26,13 @@
                         <li role="presentation">
                           <a href="{{menuItem.href}}" target="_blank"
                              class="dropdown-item js-nav-item {{menuItem.classes}}"
-                             role="menuitem" tabindex="-1">{{inline-svg menuItem.icon}}{{menuItem.text}}</a>
+                             role="menuitem" tabindex="-1">{{svg-jar menuItem.icon}}{{menuItem.text}}</a>
                         </li>
                     {{/if}}
                 {{/each}}
 
             {{/if}}
-            <li role="presentation">{{#link-to "signout" classNames="dropdown-item user-menu-signout" role="menuitem" tabindex="-1"}}{{inline-svg "signout"}} Sign Out{{/link-to}}</li>
+            <li role="presentation">{{#link-to "signout" classNames="dropdown-item user-menu-signout" role="menuitem" tabindex="-1"}}{{svg-jar "signout"}} Sign Out{{/link-to}}</li>
         </ul>
     {{/dropdown.content}}
 {{/gh-basic-dropdown}}
@@ -41,31 +41,31 @@
         {{gh-search-input class="gh-nav-search-input"}}
     </section>
     <ul class="gh-nav-list gh-nav-main">
-        <li>{{#link-to "editor.new" classNames="gh-nav-main-editor"}}{{inline-svg "pen"}}New story{{/link-to}}</li>
+        <li>{{#link-to "editor.new" classNames="gh-nav-main-editor"}}{{svg-jar "pen"}}New story{{/link-to}}</li>
         <li>
             {{!-- clicking the Content link whilst on the content screen should reset the filter --}}
             {{#if (eq router.currentRouteName "posts.index")}}
-                {{#link-to "posts" (query-params type=null author=null tag=null order=null) classNames="gh-nav-main-content active"}}{{inline-svg "content"}}Stories{{/link-to}}
+                {{#link-to "posts" (query-params type=null author=null tag=null order=null) classNames="gh-nav-main-content active"}}{{svg-jar "content"}}Stories{{/link-to}}
             {{else}}
-                {{#link-to "posts" classNames="gh-nav-main-content"}}{{inline-svg "content"}}Stories{{/link-to}}
+                {{#link-to "posts" classNames="gh-nav-main-content"}}{{svg-jar "content"}}Stories{{/link-to}}
             {{/if}}
         </li>
-        <li>{{#link-to "team" classNames="gh-nav-main-users"}}{{inline-svg "account-group"}}Team{{/link-to}}</li>
+        <li>{{#link-to "team" classNames="gh-nav-main-users"}}{{svg-jar "account-group"}}Team{{/link-to}}</li>
         {{#if feature.subscribers}}
             {{#if (gh-user-can-admin session.user)}}
-                <li>{{#link-to "subscribers" classNames="gh-nav-main-subscribers"}}{{inline-svg "email"}}Subscribers{{/link-to}}</li>
+                <li>{{#link-to "subscribers" classNames="gh-nav-main-subscribers"}}{{svg-jar "email"}}Subscribers{{/link-to}}</li>
             {{/if}}
         {{/if}}
     </ul>
     {{#if (gh-user-can-admin session.user)}}
         <ul class="gh-nav-list gh-nav-settings">
             <li class="gh-nav-list-h">Settings</li>
-            <li>{{#link-to "settings.general" classNames="gh-nav-settings-general"}}{{inline-svg "settings"}}General{{/link-to}}</li>
-            <li>{{#link-to "settings.design" classNames="gh-nav-settings-navigation"}}{{inline-svg "compass"}}Design{{/link-to}}</li>
-            <li>{{#link-to "settings.tags" classNames="gh-nav-settings-tags"}}{{inline-svg "tag"}}Tags{{/link-to}}</li>
-            <li>{{#link-to "settings.code-injection" classNames="gh-nav-settings-code-injection"}}{{inline-svg "brackets"}}Code injection{{/link-to}}</li>
-            <li>{{#link-to "settings.apps" classNames="gh-nav-settings-apps"}}{{inline-svg "box"}}Apps{{/link-to}}</li>
-            <li>{{#link-to "settings.labs" classNames="gh-nav-settings-labs"}}{{inline-svg "wrench-double"}}Labs{{/link-to}}</li>
+            <li>{{#link-to "settings.general" classNames="gh-nav-settings-general"}}{{svg-jar "settings"}}General{{/link-to}}</li>
+            <li>{{#link-to "settings.design" classNames="gh-nav-settings-navigation"}}{{svg-jar "compass"}}Design{{/link-to}}</li>
+            <li>{{#link-to "settings.tags" classNames="gh-nav-settings-tags"}}{{svg-jar "tag"}}Tags{{/link-to}}</li>
+            <li>{{#link-to "settings.code-injection" classNames="gh-nav-settings-code-injection"}}{{svg-jar "brackets"}}Code injection{{/link-to}}</li>
+            <li>{{#link-to "settings.apps" classNames="gh-nav-settings-apps"}}{{svg-jar "box"}}Apps{{/link-to}}</li>
+            <li>{{#link-to "settings.labs" classNames="gh-nav-settings-labs"}}{{svg-jar "wrench-double"}}Labs{{/link-to}}</li>
         </ul>
     {{/if}}
 
@@ -74,7 +74,7 @@
             {{#if config.clientExtensions.menu.title}}<li class="gh-nav-list-h">{{config.clientExtensions.menu.title}}</li>{{/if}}
             {{#each config.clientExtensions.menu.items as |menuItem| }}
                 <li>
-                    <a href="{{menuItem.href}}" target="_blank">{{inline-svg menuItem.icon}}{{menuItem.text}}</a>
+                    <a href="{{menuItem.href}}" target="_blank">{{svg-jar menuItem.icon}}{{menuItem.text}}</a>
                 </li>
             {{/each}}
         </ul>
@@ -87,7 +87,7 @@
 
 </section>
 <footer class="gh-nav-foot">
-    <a class="gh-nav-foot-sitelink" href="{{config.blogUrl}}/" target="_blank">View site {{inline-svg "external"}}</a>
+    <a class="gh-nav-foot-sitelink" href="{{config.blogUrl}}/" target="_blank">View site {{svg-jar "external"}}</a>
 </footer>
 <div class="gh-autonav-toggle" {{action "openAutoNav" on="mouseEnter" target=ui}}></div>
 
diff --git a/ghost/admin/app/templates/components/gh-navitem.hbs b/ghost/admin/app/templates/components/gh-navitem.hbs
index 80b2b12a73..b2f2426f55 100644
--- a/ghost/admin/app/templates/components/gh-navitem.hbs
+++ b/ghost/admin/app/templates/components/gh-navitem.hbs
@@ -1,6 +1,6 @@
 {{#unless navItem.isNew}}
     <span class="gh-blognav-grab">
-        {{inline-svg "grab"}}
+        {{svg-jar "grab"}}
         <span class="sr-only">Reorder</span>
     </span>
 {{/unless}}
@@ -25,10 +25,10 @@
 
 {{#if navItem.isNew}}
     <button type="button" class="gh-blognav-add" {{action "addItem"}}>
-        {{inline-svg "add"}}<span class="sr-only">Add</span>
+        {{svg-jar "add"}}<span class="sr-only">Add</span>
     </button>
 {{else}}
     <button type="button" class="gh-blognav-delete" {{action "deleteItem" navItem}}>
-        {{inline-svg "trash"}}<span class="sr-only">Delete</span>
+        {{svg-jar "trash"}}<span class="sr-only">Delete</span>
     </button>
 {{/if}}
diff --git a/ghost/admin/app/templates/components/gh-notification.hbs b/ghost/admin/app/templates/components/gh-notification.hbs
index f822d723ae..89a15bc3f7 100644
--- a/ghost/admin/app/templates/components/gh-notification.hbs
+++ b/ghost/admin/app/templates/components/gh-notification.hbs
@@ -1,4 +1,4 @@
 <div class="gh-notification-content">
     {{message.message}}
 </div>
-<button class="gh-notification-close" {{action "closeNotification"}}>{{inline-svg "close"}}<span class="hidden">Close</span></button>
+<button class="gh-notification-close" {{action "closeNotification"}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
diff --git a/ghost/admin/app/templates/components/gh-post-settings-menu.hbs b/ghost/admin/app/templates/components/gh-post-settings-menu.hbs
index 8e376df5f2..dd8aec2012 100644
--- a/ghost/admin/app/templates/components/gh-post-settings-menu.hbs
+++ b/ghost/admin/app/templates/components/gh-post-settings-menu.hbs
@@ -4,7 +4,7 @@
             <div class="settings-menu-header">
                 <h4>Post Settings</h4>
                 <button class="close settings-menu-header-action" {{action "closeMenus" target=ui}} data-test-close-settings-menu>
-                    {{inline-svg "close"}}<span class="hidden">Close</span>
+                    {{svg-jar "close"}}<span class="hidden">Close</span>
                 </button>
             </div>
             <div class="settings-menu-content">
@@ -22,17 +22,17 @@
                     {{#unless post.isNew}}
                         {{#if post.isPublished}}
                         <a class="post-view-link" target="_blank" href="{{post.absoluteUrl}}">
-                            View post {{inline-svg "external"}}
+                            View post {{svg-jar "external"}}
                         </a>
                         {{else}}
                         <a class="post-view-link" target="_blank" href="{{post.previewUrl}}">
-                            Preview {{inline-svg "external"}}
+                            Preview {{svg-jar "external"}}
                         </a>
                         {{/if}}
                     {{/unless}}
 
                     <div class="gh-input-icon gh-icon-link">
-                        {{inline-svg "link"}}
+                        {{svg-jar "link"}}
                         {{gh-text-input
                             class="post-setting-slug"
                             id="url"
@@ -91,7 +91,7 @@
                 <div class="form-group for-select">
                     <label for="author-list">Author</label>
                     <span class="gh-input-icon gh-icon-user">
-                        {{inline-svg "user-circle"}}
+                        {{svg-jar "user-circle"}}
                         <span class="gh-select" tabindex="0">
                         {{one-way-select
                             selectedAuthor
@@ -102,7 +102,7 @@
                             optionLabelPath="name"
                             update=(action "changeAuthor")
                         }}
-                        {{inline-svg "arrow-down-small"}}
+                        {{svg-jar "arrow-down-small"}}
                         </span>
                     </span>
                 </div>
@@ -114,28 +114,28 @@
                             <b>Meta Data</b>
                             <span>Extra content for search engines</span>
                         </button>
-                        {{inline-svg "arrow-right"}}
+                        {{svg-jar "arrow-right"}}
                     </li>
                     <li class="nav-list-item" {{action "showSubview" "twitter-data"}} data-test-button="twitter-data">
                         <button type="button">
                             <b>Twitter Card</b>
                             <span>Customise structured data for Twitter</span>
                         </button>
-                        {{inline-svg "arrow-right"}}
+                        {{svg-jar "arrow-right"}}
                     </li>
                     <li class="nav-list-item" {{action "showSubview" "facebook-data"}} data-test-button="facebook-data">
                         <button type="button">
                             <b>Facebook Card</b>
                             <span>Customise Open Graph data</span>
                         </button>
-                        {{inline-svg "arrow-right"}}
+                        {{svg-jar "arrow-right"}}
                     </li>
                     <li class="nav-list-item" {{action "showSubview" "codeinjection"}} data-test-button="codeinjection">
                         <button type="button">
                             <b>Code Injection</b>
                             <span>Add styles/scripts to the header &amp; footer</span>
                         </button>
-                        {{inline-svg "arrow-right"}}
+                        {{svg-jar "arrow-right"}}
                     </li>
                 </ul>
 
@@ -172,7 +172,7 @@
                     onTemplateSelect=(action (mut post.customTemplate))}}
 
                 {{#unless post.isNew}}
-                    <button type="button" class="gh-btn gh-btn-link gh-btn-icon settings-menu-delete-button" {{action "deletePost"}}><span>{{inline-svg "trash"}} Delete Post</span></button>
+                    <button type="button" class="gh-btn gh-btn-link gh-btn-icon settings-menu-delete-button" {{action "deletePost"}}><span>{{svg-jar "trash"}} Delete Post</span></button>
                 {{/unless}}
 
                 </form>
@@ -184,7 +184,7 @@
                 {{#if isViewingSubview}}
                     {{#if (eq subview "meta-data")}}
                         <div class="settings-menu-header subview">
-                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{inline-svg "arrow-left"}}<span class="hidden">Back</span></button>
+                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{svg-jar "arrow-left"}}<span class="hidden">Back</span></button>
                             <h4>Meta Data</h4>
                             <div style="width:23px;"></div>
                         </div>
@@ -235,7 +235,7 @@
 
                     {{#if (eq subview "twitter-data")}}
                         <div class="settings-menu-header subview">
-                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{inline-svg "arrow-left"}}<span class="hidden">Back</span></button>
+                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{svg-jar "arrow-left"}}<span class="hidden">Back</span></button>
                             <h4>Twitter Card</h4>
                             <div style="width:23px;"></div>
                         </div>
@@ -306,7 +306,7 @@
 
                     {{#if (eq subview "facebook-data")}}
                         <div class="settings-menu-header subview">
-                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{inline-svg "arrow-left"}}<span class="hidden">Back</span></button>
+                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{svg-jar "arrow-left"}}<span class="hidden">Back</span></button>
                             <h4>Facebook Card</h4>
                             <div style="width:23px;"></div>
                         </div>
@@ -376,7 +376,7 @@
 
                     {{#if (eq subview "codeinjection")}}
                         <div class="settings-menu-header subview">
-                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{inline-svg "arrow-left"}}<span class="hidden">Back</span></button>
+                            <button {{action "closeSubview"}} class="back settings-menu-header-action" data-test-button="close-psm-subview">{{svg-jar "arrow-left"}}<span class="hidden">Back</span></button>
                             <h4>Code Injection</h4>
                             <div style="width:23px;"></div>
                         </div>
diff --git a/ghost/admin/app/templates/components/gh-profile-image.hbs b/ghost/admin/app/templates/components/gh-profile-image.hbs
index 0bb9851762..ae21fcf424 100644
--- a/ghost/admin/app/templates/components/gh-profile-image.hbs
+++ b/ghost/admin/app/templates/components/gh-profile-image.hbs
@@ -12,7 +12,7 @@
     {{/if}}
 
     <span class="edit-account-image" onclick={{action "openFileDialog"}} role="button">
-        {{inline-svg "photos"}}
+        {{svg-jar "photos"}}
         <span class="sr-only">Upload an image</span>
     </span>
 
diff --git a/ghost/admin/app/templates/components/gh-psm-template-select.hbs b/ghost/admin/app/templates/components/gh-psm-template-select.hbs
index 8a2fda7ebd..5efdcd162b 100644
--- a/ghost/admin/app/templates/components/gh-psm-template-select.hbs
+++ b/ghost/admin/app/templates/components/gh-psm-template-select.hbs
@@ -2,7 +2,7 @@
     <div class="form-group for-select" data-test-custom-template-form>
         <label for="author-list">Template</label>
         <span class="gh-input-icon gh-icon-user">
-            {{inline-svg "file-text-document"}}
+            {{svg-jar "file-text-document"}}
             <span class="gh-select {{if matchedSlugTemplate "disabled"}}">
                 {{one-way-select selectedTemplate
                     options=customTemplates
@@ -11,7 +11,7 @@
                     update=(action "selectTemplate")
                     disabled=matchedSlugTemplate
                     data-test-select="custom-template"}}
-                {{inline-svg "arrow-down-small"}}
+                {{svg-jar "arrow-down-small"}}
             </span>
         </span>
         {{#if matchedSlugTemplate}}
diff --git a/ghost/admin/app/templates/components/gh-publishmenu.hbs b/ghost/admin/app/templates/components/gh-publishmenu.hbs
index 9791d5edb0..d26bcae954 100644
--- a/ghost/admin/app/templates/components/gh-publishmenu.hbs
+++ b/ghost/admin/app/templates/components/gh-publishmenu.hbs
@@ -1,6 +1,6 @@
 {{#basic-dropdown verticalPosition="below" onOpen=(action "open") onClose=(action "close") as |dd|}}
     {{#dd.trigger class="gh-btn gh-btn-outline gh-publishmenu-trigger"}}
-        <span data-test-publishmenu-trigger>{{triggerText}} {{inline-svg "arrow-down"}}</span>
+        <span data-test-publishmenu-trigger>{{triggerText}} {{svg-jar "arrow-down"}}</span>
     {{/dd.trigger}}
 
     {{#dd.content class="gh-publishmenu-dropdown"}}
diff --git a/ghost/admin/app/templates/components/gh-search-input-trigger.hbs b/ghost/admin/app/templates/components/gh-search-input-trigger.hbs
index 8537370587..a9503880d3 100644
--- a/ghost/admin/app/templates/components/gh-search-input-trigger.hbs
+++ b/ghost/admin/app/templates/components/gh-search-input-trigger.hbs
@@ -8,5 +8,5 @@
         onmousedown={{action "captureMouseDown"}}
         onkeydown={{action "handleKeydown"}}
         onblur={{action "resetInput"}}>
-    <button class="gh-nav-search-button" {{action "focusInput"}}>{{inline-svg "search"}}<span class="sr-only">Search</span></button>
+    <button class="gh-nav-search-button" {{action "focusInput"}}>{{svg-jar "search"}}<span class="sr-only">Search</span></button>
 </div>
diff --git a/ghost/admin/app/templates/components/gh-subscribers-table-delete-cell.hbs b/ghost/admin/app/templates/components/gh-subscribers-table-delete-cell.hbs
index d116a1344f..e3f5cf81ea 100644
--- a/ghost/admin/app/templates/components/gh-subscribers-table-delete-cell.hbs
+++ b/ghost/admin/app/templates/components/gh-subscribers-table-delete-cell.hbs
@@ -1 +1 @@
-<button class="gh-btn gh-btn-link gh-btn-sm" {{action tableActions.delete row.content}}><span>{{inline-svg "trash"}}</span></button>
+<button class="gh-btn gh-btn-link gh-btn-sm" {{action tableActions.delete row.content}}><span>{{svg-jar "trash"}}</span></button>
diff --git a/ghost/admin/app/templates/components/gh-tag-settings-form.hbs b/ghost/admin/app/templates/components/gh-tag-settings-form.hbs
index 33f78ded83..9f8e4429e9 100644
--- a/ghost/admin/app/templates/components/gh-tag-settings-form.hbs
+++ b/ghost/admin/app/templates/components/gh-tag-settings-form.hbs
@@ -1,7 +1,7 @@
 <div class="{{if isViewingSubview 'settings-menu-pane-out-left' 'settings-menu-pane-in'}} settings-menu settings-menu-pane tag-settings-pane">
     <div class="settings-menu-header {{if isMobile 'subview'}}">
         {{#if isMobile}}
-            {{#link-to 'settings.tags' class="back settings-menu-header-action"}}{{inline-svg "arrow-left"}}<span class="hidden">Back</span>{{/link-to}}
+            {{#link-to 'settings.tags' class="back settings-menu-header-action"}}{{svg-jar "arrow-left"}}<span class="hidden">Back</span>{{/link-to}}
             <h4>{{title}}</h4>
             <div style="width:23px;">{{!flexbox space-between}}</div>
         {{else}}
@@ -58,12 +58,12 @@
                         <b>Meta Data</b>
                         <span>Extra content for SEO and social media.</span>
                     </button>
-                    {{inline-svg "arrow-right"}}
+                    {{svg-jar "arrow-right"}}
                 </li>
             </ul>
 
             {{#unless tag.isNew}}
-                <button type="button" class="gh-btn gh-btn-link gh-btn-sm gh-btn-icon settings-menu-delete-button" {{action "deleteTag"}}><span>{{inline-svg "trash"}} Delete Tag</span></button>
+                <button type="button" class="gh-btn gh-btn-link gh-btn-sm gh-btn-icon settings-menu-delete-button" {{action "deleteTag"}}><span>{{svg-jar "trash"}} Delete Tag</span></button>
             {{/unless}}
         </form>
     </div>
@@ -71,7 +71,7 @@
 
 <div class="{{if isViewingSubview 'settings-menu-pane-in' 'settings-menu-pane-out-right'}} settings-menu settings-menu-pane tag-meta-settings-pane">
     <div class="settings-menu-header subview">
-        <button {{action "closeMeta"}} class="back settings-menu-header-action">{{inline-svg "arrow-left"}}<span class="hidden">Back</span></button>
+        <button {{action "closeMeta"}} class="back settings-menu-header-action">{{svg-jar "arrow-left"}}<span class="hidden">Back</span></button>
         <h4>Meta Data</h4>
         <div style="width:23px;">{{!flexbox space-between}}</div>
     </div>
diff --git a/ghost/admin/app/templates/components/gh-task-button.hbs b/ghost/admin/app/templates/components/gh-task-button.hbs
index 9217adba0c..f42ad09468 100644
--- a/ghost/admin/app/templates/components/gh-task-button.hbs
+++ b/ghost/admin/app/templates/components/gh-task-button.hbs
@@ -7,9 +7,9 @@
     )}}
 {{else}}
     <span>
-    {{#if isRunning}}{{inline-svg "spinner" class="gh-icon-spinner"}}{{runningText}}{{/if}}
+    {{#if isRunning}}{{svg-jar "spinner" class="gh-icon-spinner"}}{{runningText}}{{/if}}
     {{#if isIdle}}{{buttonText}}{{/if}}
-    {{#if isSuccess}}{{inline-svg "check-circle"}} {{successText}}{{/if}}
-    {{#if isFailure}}{{inline-svg "retry"}} {{failureText}}{{/if}}
+    {{#if isSuccess}}{{svg-jar "check-circle"}} {{successText}}{{/if}}
+    {{#if isFailure}}{{svg-jar "retry"}} {{failureText}}{{/if}}
     </span>
 {{/if}}
diff --git a/ghost/admin/app/templates/components/gh-theme-error-li.hbs b/ghost/admin/app/templates/components/gh-theme-error-li.hbs
index 4196220003..2f44cb2098 100644
--- a/ghost/admin/app/templates/components/gh-theme-error-li.hbs
+++ b/ghost/admin/app/templates/components/gh-theme-error-li.hbs
@@ -4,9 +4,9 @@
     </h4>
     <div class="theme-validation-rule-icon">
         {{#if showDetails}}
-            {{inline-svg "arrow-down"}}
+            {{svg-jar "arrow-down"}}
         {{else}}
-            {{inline-svg "arrow-right"}}
+            {{svg-jar "arrow-right"}}
         {{/if}}
     </div>
 </a>
diff --git a/ghost/admin/app/templates/components/gh-timezone-select.hbs b/ghost/admin/app/templates/components/gh-timezone-select.hbs
index 1f25d9f0ea..700634f820 100644
--- a/ghost/admin/app/templates/components/gh-timezone-select.hbs
+++ b/ghost/admin/app/templates/components/gh-timezone-select.hbs
@@ -8,7 +8,7 @@
         value=selectedTimezone
         update=(action "setTimezone")
     }}
-    {{inline-svg "arrow-down-small"}}
+    {{svg-jar "arrow-down-small"}}
 </span>
 {{#if hasTimezoneOverride}}
     <p>Your timezone has been automatically set to {{activeTimezone}}.</p>
diff --git a/ghost/admin/app/templates/components/gh-unsplash-photo.hbs b/ghost/admin/app/templates/components/gh-unsplash-photo.hbs
index 891387e14c..6790883033 100644
--- a/ghost/admin/app/templates/components/gh-unsplash-photo.hbs
+++ b/ghost/admin/app/templates/components/gh-unsplash-photo.hbs
@@ -3,8 +3,8 @@
         <img src={{imageUrl}} alt={{photo.description}} width={{width}} height={{height}} data-test-unsplash-photo-image />
         <div class="gh-unsplash-photo-overlay">
             <div class="gh-unsplash-photo-header">
-                <a class="gh-unsplash-button-likes gh-unsplash-button" href="{{photo.links.html}}?utm_source=ghost&utm_medium=referral&utm_campaign=api-credit" target="_blank">{{inline-svg "unsplash-heart"}}{{photo.likes}}</a>
-                <a class="gh-unsplash-button-download gh-unsplash-button" href="{{photo.links.download}}/?utm_source=ghost&utm_medium=referral&utm_campaign=api-credit&force=true">{{inline-svg "download"}}</a>
+                <a class="gh-unsplash-button-likes gh-unsplash-button" href="{{photo.links.html}}?utm_source=ghost&utm_medium=referral&utm_campaign=api-credit" target="_blank">{{svg-jar "unsplash-heart"}}{{photo.likes}}</a>
+                <a class="gh-unsplash-button-download gh-unsplash-button" href="{{photo.links.download}}/?utm_source=ghost&utm_medium=referral&utm_campaign=api-credit&force=true">{{svg-jar "download"}}</a>
             </div>
             <div class="gh-unsplash-photo-footer">
                 <div class="gh-unsplash-photo-author">
diff --git a/ghost/admin/app/templates/components/gh-unsplash.hbs b/ghost/admin/app/templates/components/gh-unsplash.hbs
index f3e90bb0b8..3ce5ef6c67 100644
--- a/ghost/admin/app/templates/components/gh-unsplash.hbs
+++ b/ghost/admin/app/templates/components/gh-unsplash.hbs
@@ -2,14 +2,14 @@
     <div class="gh-unsplash {{if ui.hasSideNav "gh-unsplash--with-sidenav"}}">
         <div class="gh-unsplash-window">
             <div class="gh-unsplash-container">
-                <a class="gh-unsplash-logo" href="https://unsplash.com/?utm_source=ghost&utm_medium=referral&utm_campaign=api-credit" target="_blank">{{inline-svg "unsplash"}}</a>
-                <div class="gh-unsplash-close" aria-role="button" {{action "close"}}>{{inline-svg "close"}}</div>
+                <a class="gh-unsplash-logo" href="https://unsplash.com/?utm_source=ghost&utm_medium=referral&utm_campaign=api-credit" target="_blank">{{svg-jar "unsplash"}}</a>
+                <div class="gh-unsplash-close" aria-role="button" {{action "close"}}>{{svg-jar "close"}}</div>
                 <header class="gh-unsplash-header">
                     <h1 class="gh-unsplash-header-title">Unsplash</h1>
                     <p class="gh-unsplash-header-desc">Beautiful, free photos.<br>
         Gifted by the world’s most generous community of photographers. 🎁</p>
                     <span class="gh-input-icon">
-                        {{inline-svg "search"}}
+                        {{svg-jar "search"}}
                         {{gh-text-input
                             class="gh-unsplash-search"
                             name="searchKeyword"
diff --git a/ghost/admin/app/templates/components/gh-user-list-item.hbs b/ghost/admin/app/templates/components/gh-user-list-item.hbs
index 8b498cce52..dc538f7367 100644
--- a/ghost/admin/app/templates/components/gh-user-list-item.hbs
+++ b/ghost/admin/app/templates/components/gh-user-list-item.hbs
@@ -20,7 +20,7 @@
                         <span class="gh-badge {{role.lowerCaseName}}" data-test-role-name>{{role.name}}</span>
                     {{/each}}
                 {{/unless}}
-                {{inline-svg "arrow-right"}}
+                {{svg-jar "arrow-right"}}
             </div>
         </div>
     </article>
diff --git a/ghost/admin/app/templates/components/gh-view-title.hbs b/ghost/admin/app/templates/components/gh-view-title.hbs
index 3e537e29d8..5eb1a22d5c 100644
--- a/ghost/admin/app/templates/components/gh-view-title.hbs
+++ b/ghost/admin/app/templates/components/gh-view-title.hbs
@@ -1,2 +1,2 @@
-<button {{action "openMobileMenu" target=ui}} class="gh-mobilemenu-button" role="presentation">{{inline-svg "icon" class="icon-gh"}}<span class="sr-only">Menu</span></button>
+<button {{action "openMobileMenu" target=ui}} class="gh-mobilemenu-button" role="presentation">{{svg-jar "icon" class="icon-gh"}}<span class="sr-only">Menu</span></button>
 {{yield}}
diff --git a/ghost/admin/app/templates/components/modal-delete-all.hbs b/ghost/admin/app/templates/components/modal-delete-all.hbs
index 6309b26975..7157cc0115 100644
--- a/ghost/admin/app/templates/components/modal-delete-all.hbs
+++ b/ghost/admin/app/templates/components/modal-delete-all.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Would you really like to delete all content from your blog?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <p>This is permanent! No backups, no restores, no magic undo button. We warned you, k?</p>
diff --git a/ghost/admin/app/templates/components/modal-delete-post.hbs b/ghost/admin/app/templates/components/modal-delete-post.hbs
index 2455fb2a33..f4c5ebec5f 100644
--- a/ghost/admin/app/templates/components/modal-delete-post.hbs
+++ b/ghost/admin/app/templates/components/modal-delete-post.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure you want to delete this post?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <p>
diff --git a/ghost/admin/app/templates/components/modal-delete-subscriber.hbs b/ghost/admin/app/templates/components/modal-delete-subscriber.hbs
index 5fc98f8a81..3292221b4f 100644
--- a/ghost/admin/app/templates/components/modal-delete-subscriber.hbs
+++ b/ghost/admin/app/templates/components/modal-delete-subscriber.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <strong>WARNING:</strong> All data for this subscriber will be deleted. There is no way to recover this.
diff --git a/ghost/admin/app/templates/components/modal-delete-tag.hbs b/ghost/admin/app/templates/components/modal-delete-tag.hbs
index 0746f8f53e..5523657734 100644
--- a/ghost/admin/app/templates/components/modal-delete-tag.hbs
+++ b/ghost/admin/app/templates/components/modal-delete-tag.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure you want to delete this tag?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     {{#if tag.post_count}}
diff --git a/ghost/admin/app/templates/components/modal-delete-theme.hbs b/ghost/admin/app/templates/components/modal-delete-theme.hbs
index 320edaf368..4812f04943 100644
--- a/ghost/admin/app/templates/components/modal-delete-theme.hbs
+++ b/ghost/admin/app/templates/components/modal-delete-theme.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header" data-test-delete-theme-modal>
     <h1>Are you sure you want to delete this</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <p>You're about to delete "<strong>{{theme.label}}</strong>". This is permanent! We warned you, k? Maybe <a href="#" {{action download}}>Download your theme before continuing</a></p>
diff --git a/ghost/admin/app/templates/components/modal-delete-user.hbs b/ghost/admin/app/templates/components/modal-delete-user.hbs
index adf7607a5f..b0eb6e6714 100644
--- a/ghost/admin/app/templates/components/modal-delete-user.hbs
+++ b/ghost/admin/app/templates/components/modal-delete-user.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure you want to delete this user?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <p><strong>WARNING:</strong> You are about to delete the user '<strong>{{user.name}}</strong>'. There is no way to recover this.</p>
diff --git a/ghost/admin/app/templates/components/modal-import-subscribers.hbs b/ghost/admin/app/templates/components/modal-import-subscribers.hbs
index 7cd951fa6d..81df9f89dc 100644
--- a/ghost/admin/app/templates/components/modal-import-subscribers.hbs
+++ b/ghost/admin/app/templates/components/modal-import-subscribers.hbs
@@ -7,7 +7,7 @@
         {{/if}}
     </h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     {{#if response}}
diff --git a/ghost/admin/app/templates/components/modal-invite-new-user.hbs b/ghost/admin/app/templates/components/modal-invite-new-user.hbs
index 5efd10ffbd..cba5049785 100644
--- a/ghost/admin/app/templates/components/modal-invite-new-user.hbs
+++ b/ghost/admin/app/templates/components/modal-invite-new-user.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Invite a New User</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <fieldset>
@@ -38,7 +38,7 @@
                     value=role
                     update=(action "setRole")
                 }}
-                {{inline-svg "arrow-down-small"}}
+                {{svg-jar "arrow-down-small"}}
             </span>
         </div>
     </fieldset>
diff --git a/ghost/admin/app/templates/components/modal-leave-editor.hbs b/ghost/admin/app/templates/components/modal-leave-editor.hbs
index e2b7fba575..afec8ba38f 100644
--- a/ghost/admin/app/templates/components/modal-leave-editor.hbs
+++ b/ghost/admin/app/templates/components/modal-leave-editor.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure you want to leave this page?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <p>
diff --git a/ghost/admin/app/templates/components/modal-leave-settings.hbs b/ghost/admin/app/templates/components/modal-leave-settings.hbs
index c381eaeaf0..22e45d3435 100644
--- a/ghost/admin/app/templates/components/modal-leave-settings.hbs
+++ b/ghost/admin/app/templates/components/modal-leave-settings.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure you want to leave this page?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <p>
diff --git a/ghost/admin/app/templates/components/modal-markdown-help.hbs b/ghost/admin/app/templates/components/modal-markdown-help.hbs
index ebabdd0e70..feef1afa79 100644
--- a/ghost/admin/app/templates/components/modal-markdown-help.hbs
+++ b/ghost/admin/app/templates/components/modal-markdown-help.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Markdown Help</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <section class="markdown-help-container">
diff --git a/ghost/admin/app/templates/components/modal-new-subscriber.hbs b/ghost/admin/app/templates/components/modal-new-subscriber.hbs
index 5e892d3024..229d3e6086 100644
--- a/ghost/admin/app/templates/components/modal-new-subscriber.hbs
+++ b/ghost/admin/app/templates/components/modal-new-subscriber.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Add a Subscriber</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <fieldset>
diff --git a/ghost/admin/app/templates/components/modal-re-authenticate.hbs b/ghost/admin/app/templates/components/modal-re-authenticate.hbs
index afbf7047c8..87a61c937d 100644
--- a/ghost/admin/app/templates/components/modal-re-authenticate.hbs
+++ b/ghost/admin/app/templates/components/modal-re-authenticate.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Please re-authenticate</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body {{if authenticationError 'error'}}">
 
diff --git a/ghost/admin/app/templates/components/modal-suspend-user.hbs b/ghost/admin/app/templates/components/modal-suspend-user.hbs
index 4e8206cbb2..de39fc0e71 100644
--- a/ghost/admin/app/templates/components/modal-suspend-user.hbs
+++ b/ghost/admin/app/templates/components/modal-suspend-user.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure you want to suspend this user?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <strong>WARNING:</strong> This user will no longer be able to log in but their posts will be kept.
diff --git a/ghost/admin/app/templates/components/modal-theme-warnings.hbs b/ghost/admin/app/templates/components/modal-theme-warnings.hbs
index 7d0a41db68..f38e42a440 100644
--- a/ghost/admin/app/templates/components/modal-theme-warnings.hbs
+++ b/ghost/admin/app/templates/components/modal-theme-warnings.hbs
@@ -7,7 +7,7 @@
         {{/unless}}
     </h1>
 </header>
-<a class="close" href="#" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="#" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <ul class="theme-validation-errors" data-test-theme-warnings>
diff --git a/ghost/admin/app/templates/components/modal-transfer-owner.hbs b/ghost/admin/app/templates/components/modal-transfer-owner.hbs
index a1c7619b80..f5245103b2 100644
--- a/ghost/admin/app/templates/components/modal-transfer-owner.hbs
+++ b/ghost/admin/app/templates/components/modal-transfer-owner.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Transfer Ownership</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <p>
diff --git a/ghost/admin/app/templates/components/modal-unsuspend-user.hbs b/ghost/admin/app/templates/components/modal-unsuspend-user.hbs
index 05732f641a..d1b0acc142 100644
--- a/ghost/admin/app/templates/components/modal-unsuspend-user.hbs
+++ b/ghost/admin/app/templates/components/modal-unsuspend-user.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header">
     <h1>Are you sure you want to un-suspend this user?</h1>
 </header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     <strong>WARNING:</strong> This user will be able to log in again and will have the same permissions they had previously.
diff --git a/ghost/admin/app/templates/components/modal-upload-image.hbs b/ghost/admin/app/templates/components/modal-upload-image.hbs
index b753f1514d..849c258903 100644
--- a/ghost/admin/app/templates/components/modal-upload-image.hbs
+++ b/ghost/admin/app/templates/components/modal-upload-image.hbs
@@ -3,7 +3,7 @@
         <div class="gh-image-uploader -with-image">
             <div><img src={{url}}></div>
             <a class="image-cancel" title="Delete" {{action 'removeImage'}}>
-                {{inline-svg "trash"}}
+                {{svg-jar "trash"}}
                 <span class="hidden">Delete</span>
             </a>
         </div>
diff --git a/ghost/admin/app/templates/components/modal-upload-theme.hbs b/ghost/admin/app/templates/components/modal-upload-theme.hbs
index 4c93e0129e..67ab0f2cd6 100644
--- a/ghost/admin/app/templates/components/modal-upload-theme.hbs
+++ b/ghost/admin/app/templates/components/modal-upload-theme.hbs
@@ -13,7 +13,7 @@
         {{/if}}
     </h1>
 </header>
-<a class="close" href="#" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="#" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
     {{#if theme}}
diff --git a/ghost/admin/app/templates/components/power-select/trigger.hbs b/ghost/admin/app/templates/components/power-select/trigger.hbs
index da30729aeb..a3e0957e90 100644
--- a/ghost/admin/app/templates/components/power-select/trigger.hbs
+++ b/ghost/admin/app/templates/components/power-select/trigger.hbs
@@ -10,4 +10,4 @@
 {{else}}
     {{component placeholderComponent placeholder=placeholder}}
 {{/if}}
-{{inline-svg "arrow-down-small"}}
+{{svg-jar "arrow-down-small"}}
diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs
index 77ddb68d47..7da540ab93 100644
--- a/ghost/admin/app/templates/editor.hbs
+++ b/ghost/admin/app/templates/editor.hbs
@@ -35,7 +35,7 @@
                 {{/unless}}
 
                 <button type="button" class="post-settings" title="Settings" {{action "openSettingsMenu" target=ui}} data-test-psm-trigger>
-                    {{inline-svg "settings"}}
+                    {{svg-jar "settings"}}
                 </button>
             </section>
         </header>
@@ -142,7 +142,7 @@
                                 {{/each}}
 
                                 <button class="gh-btn gh-btn-grey gh-btn-icon" {{action upload.cancel}}>
-                                    <span>{{inline-svg "close"}} Close</span>
+                                    <span>{{svg-jar "close"}} Close</span>
                                 </button>
                             {{else}}
 
diff --git a/ghost/admin/app/templates/reset.hbs b/ghost/admin/app/templates/reset.hbs
index 6f0dbc0dce..f134e4ea96 100644
--- a/ghost/admin/app/templates/reset.hbs
+++ b/ghost/admin/app/templates/reset.hbs
@@ -4,7 +4,7 @@
             <form id="reset" class="gh-signin" method="post" novalidate="novalidate" {{action "submit" on="submit"}}>
                 {{#gh-form-group errors=errors hasValidated=hasValidated property="newPassword"}}
                     <span class="gh-input-icon gh-icon-lock">
-                        {{inline-svg "lock"}}
+                        {{svg-jar "lock"}}
                         {{gh-text-input
                             type="password"
                             name="newpassword"
@@ -18,7 +18,7 @@
                 {{/gh-form-group}}
                 {{#gh-form-group errors=errors hasValidated=hasValidated property="ne2Password"}}
                     <span class="gh-input-icon gh-icon-lock">
-                        {{inline-svg "lock"}}
+                        {{svg-jar "lock"}}
                         {{gh-text-input
                             type="password"
                             name="ne2password"
diff --git a/ghost/admin/app/templates/settings/apps/amp.hbs b/ghost/admin/app/templates/settings/apps/amp.hbs
index 716ce7ded3..357da7c99e 100644
--- a/ghost/admin/app/templates/settings/apps/amp.hbs
+++ b/ghost/admin/app/templates/settings/apps/amp.hbs
@@ -2,7 +2,7 @@
     <header class="gh-canvas-header">
         <h2 class="gh-canvas-title" data-test-screen-title>
             {{#link-to "settings.apps.index"}}Apps{{/link-to}}
-            <span>{{inline-svg "arrow-right"}}</span>
+            <span>{{svg-jar "arrow-right"}}</span>
             AMP
         </h2>
         <section class="view-actions">
diff --git a/ghost/admin/app/templates/settings/apps/index.hbs b/ghost/admin/app/templates/settings/apps/index.hbs
index b58a420017..3a45ff9ff8 100644
--- a/ghost/admin/app/templates/settings/apps/index.hbs
+++ b/ghost/admin/app/templates/settings/apps/index.hbs
@@ -23,7 +23,7 @@
                             {{else}}
                                 <span data-test-app-status>Configure</span>
                             {{/if}}
-                            {{inline-svg "arrow-right"}}
+                            {{svg-jar "arrow-right"}}
                         </div>
                     </div>
                 </article>
@@ -47,7 +47,7 @@
                             {{else}}
                                 <span data-test-app-status>Configure</span>
                             {{/if}}
-                            {{inline-svg "arrow-right"}}
+                            {{svg-jar "arrow-right"}}
                         </div>
                     </div>
                 </article>
@@ -71,7 +71,7 @@
                             {{else}}
                                 <span data-test-app-status>Configure</span>
                             {{/if}}
-                            {{inline-svg "arrow-right"}}
+                            {{svg-jar "arrow-right"}}
                         </div>
                     </div>
                 </article>
@@ -91,7 +91,7 @@
                     <div class="gh-card-right">
                         <div class="apps-configured">
                             <span data-test-app-status>Configure</span>
-                            {{inline-svg "arrow-right"}}
+                            {{svg-jar "arrow-right"}}
                         </div>
                     </div>
                 </article>
diff --git a/ghost/admin/app/templates/settings/apps/slack.hbs b/ghost/admin/app/templates/settings/apps/slack.hbs
index 4987774145..9378a1a2f1 100644
--- a/ghost/admin/app/templates/settings/apps/slack.hbs
+++ b/ghost/admin/app/templates/settings/apps/slack.hbs
@@ -2,7 +2,7 @@
     <header class="gh-canvas-header">
         <h2 class="gh-canvas-title" data-test-screen-title>
             {{#link-to "settings.apps.index"}}Apps{{/link-to}}
-            <span>{{inline-svg "arrow-right"}}</span>
+            <span>{{svg-jar "arrow-right"}}</span>
             Slack
         </h2>
         <section class="view-actions">
diff --git a/ghost/admin/app/templates/settings/apps/unsplash.hbs b/ghost/admin/app/templates/settings/apps/unsplash.hbs
index 5131da3ca4..2569d14c81 100644
--- a/ghost/admin/app/templates/settings/apps/unsplash.hbs
+++ b/ghost/admin/app/templates/settings/apps/unsplash.hbs
@@ -2,7 +2,7 @@
     <header class="gh-canvas-header">
         <h2 class="gh-canvas-title" data-test-screen-title>
             {{#link-to "settings.apps.index"}}Apps{{/link-to}}
-            <span>{{inline-svg "arrow-right"}}</span>
+            <span>{{svg-jar "arrow-right"}}</span>
             Unsplash
         </h2>
         <section class="view-actions">
diff --git a/ghost/admin/app/templates/settings/apps/zapier.hbs b/ghost/admin/app/templates/settings/apps/zapier.hbs
index a39f94ba31..59249f5671 100644
--- a/ghost/admin/app/templates/settings/apps/zapier.hbs
+++ b/ghost/admin/app/templates/settings/apps/zapier.hbs
@@ -2,7 +2,7 @@
     <header class="gh-canvas-header">
         <h2 class="gh-canvas-title" data-test-screen-title>
             {{#link-to "settings.apps.index"}}Apps{{/link-to}}
-            <span>{{inline-svg "arrow-right"}}</span>
+            <span>{{svg-jar "arrow-right"}}</span>
             Zapier
         </h2>
         <section class="view-actions">
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 627f6aade0..440c017b14 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -4,7 +4,7 @@
     </header>
 
     <section class="view-container settings-debug">
-        <p class="gh-box gh-box-info">{{inline-svg "idea"}}This is a testing ground for experimental features which aren't quite ready for primetime. They may change, break or inexplicably disappear at any time.</p>
+        <p class="gh-box gh-box-info">{{svg-jar "idea"}}This is a testing ground for experimental features which aren't quite ready for primetime. They may change, break or inexplicably disappear at any time.</p>
 
         <div class="gh-setting-header">Migration options</div>
         <div class="gh-setting">
@@ -137,9 +137,9 @@
                     >
                         <span>
                             {{#if redirectSuccess}}
-                                {{inline-svg "check-circle"}} Uploaded
+                                {{svg-jar "check-circle"}} Uploaded
                             {{else if redirectFailure}}
-                                {{inline-svg "retry"}} Upload Failed
+                                {{svg-jar "retry"}} Upload Failed
                             {{else}}
                                 Upload redirects JSON
                             {{/if}}
diff --git a/ghost/admin/app/templates/setup.hbs b/ghost/admin/app/templates/setup.hbs
index 4152d0e77a..06147e3ef5 100644
--- a/ghost/admin/app/templates/setup.hbs
+++ b/ghost/admin/app/templates/setup.hbs
@@ -2,19 +2,19 @@
     <header class="gh-flow-head">
         <nav class="gh-flow-nav">
             {{#if showBackLink}}
-                {{#link-to backRoute classNames="gh-flow-back"}}{{inline-svg "arrow-left-small"}} Back{{/link-to}}
+                {{#link-to backRoute classNames="gh-flow-back"}}{{svg-jar "arrow-left-small"}} Back{{/link-to}}
             {{/if}}
             <ol>
                 {{#gh-activating-list-item route="setup.one" linkClasses="step"}}
-                    {{inline-svg "check-circle"}}<span class="num">1</span>
+                    {{svg-jar "check-circle"}}<span class="num">1</span>
                 {{/gh-activating-list-item}}
                 <li class="divider"></li>
                 {{#gh-activating-list-item route="setup.two" linkClasses="step"}}
-                    {{inline-svg "check-circle"}}<span class="num">2</span>
+                    {{svg-jar "check-circle"}}<span class="num">2</span>
                 {{/gh-activating-list-item}}
                 <li class="divider"></li>
                 {{#gh-activating-list-item route="setup.three" linkClasses="step"}}
-                    {{inline-svg "check-circle"}}<span class="num">3</span>
+                    {{svg-jar "check-circle"}}<span class="num">3</span>
                 {{/gh-activating-list-item}}
             </ol>
         </nav>
diff --git a/ghost/admin/app/templates/setup/one.hbs b/ghost/admin/app/templates/setup/one.hbs
index 57c761e140..2421aea6ec 100644
--- a/ghost/admin/app/templates/setup/one.hbs
+++ b/ghost/admin/app/templates/setup/one.hbs
@@ -8,5 +8,5 @@
 </figure>
 
 {{#link-to "setup.two" classNames="gh-btn gh-btn-green gh-btn-lg gh-btn-icon gh-btn-icon-right"}}
-    <span>Create your account {{inline-svg "arrow-right-small"}}</span>
+    <span>Create your account {{svg-jar "arrow-right-small"}}</span>
 {{/link-to}}
diff --git a/ghost/admin/app/templates/setup/three.hbs b/ghost/admin/app/templates/setup/three.hbs
index 41202bd231..b3004cb96d 100644
--- a/ghost/admin/app/templates/setup/three.hbs
+++ b/ghost/admin/app/templates/setup/three.hbs
@@ -7,7 +7,7 @@
 
 <form class="gh-flow-invite" {{action "invite" on="submit"}}>
     {{#gh-form-group errors=errors hasValidated=hasValidated property="users"}}
-        <label for="users">Enter one email address per line, we’ll handle the rest! {{inline-svg "email"}}</label>
+        <label for="users">Enter one email address per line, we’ll handle the rest! {{svg-jar "email"}}</label>
         {{gh-textarea
             name="users"
             required="required"
@@ -27,7 +27,7 @@
     }}
         <span>
             {{#if task.isRunning}}
-                {{inline-svg "spinner" class="no-margin"}}
+                {{svg-jar "spinner" class="no-margin"}}
             {{else}}
                 {{buttonText}}
             {{/if}}
diff --git a/ghost/admin/app/templates/setup/two.hbs b/ghost/admin/app/templates/setup/two.hbs
index 4ff02500fa..19920362d2 100644
--- a/ghost/admin/app/templates/setup/two.hbs
+++ b/ghost/admin/app/templates/setup/two.hbs
@@ -12,7 +12,7 @@
     {{#gh-form-group errors=errors hasValidated=hasValidated property="blogTitle"}}
         <label for="blog-title">Blog title</label>
         <span class="gh-input-icon gh-icon-content">
-            {{inline-svg "content"}}
+            {{svg-jar "content"}}
             {{gh-trim-focus-input
                 tabindex="1"
                 type="text"
@@ -30,7 +30,7 @@
     {{#gh-form-group errors=errors hasValidated=hasValidated property="name"}}
         <label for="name">Full name</label>
         <span class="gh-input-icon gh-icon-user">
-            {{inline-svg "user-circle"}}
+            {{svg-jar "user-circle"}}
             {{gh-text-input
                 tabindex="2"
                 name="name"
@@ -47,7 +47,7 @@
     {{#gh-form-group errors=errors hasValidated=hasValidated property="email"}}
         <label for="email">Email address</label>
         <span class="gh-input-icon gh-icon-mail">
-            {{inline-svg "email"}}
+            {{svg-jar "email"}}
             {{gh-text-input
                 tabindex="3"
                 type="email"
@@ -65,7 +65,7 @@
     {{#gh-form-group errors=errors hasValidated=hasValidated property="password"}}
         <label for="password">Password</label>
         <span class="gh-input-icon gh-icon-lock">
-            {{inline-svg "lock"}}
+            {{svg-jar "lock"}}
             {{gh-text-input
                 tabindex="4"
                 type="password"
@@ -88,9 +88,9 @@
         as |task|
     }}
         {{#if task.isRunning}}
-            <span>{{inline-svg "spinner" class="gh-icon-spinner gh-btn-icon-no-margin"}}</span>
+            <span>{{svg-jar "spinner" class="gh-icon-spinner gh-btn-icon-no-margin"}}</span>
         {{else}}
-            <span>Last step: Invite your team {{inline-svg "arrow-right-small" class="gh-btn-icon-right"}}</span>
+            <span>Last step: Invite your team {{svg-jar "arrow-right-small" class="gh-btn-icon-right"}}</span>
         {{/if}}
     {{/gh-task-button}}
 </form>
diff --git a/ghost/admin/app/templates/signin.hbs b/ghost/admin/app/templates/signin.hbs
index 758a84a717..946c1a0cd7 100644
--- a/ghost/admin/app/templates/signin.hbs
+++ b/ghost/admin/app/templates/signin.hbs
@@ -4,7 +4,7 @@
             <form id="login" method="post" class="gh-signin" novalidate="novalidate" {{action "authenticate" on="submit"}}>
                 {{#gh-form-group errors=signin.errors hasValidated=hasValidated property="identification"}}
                     <span class="gh-input-icon gh-icon-mail">
-                        {{inline-svg "email"}}
+                        {{svg-jar "email"}}
                         {{gh-trim-focus-input
                             class="email"
                             type="email"
@@ -21,7 +21,7 @@
                 {{/gh-form-group}}
                 {{#gh-form-group errors=signin.errors hasValidated=hasValidated property="password"}}
                     <span class="gh-input-icon gh-icon-lock forgotten-wrap">
-                        {{inline-svg "lock"}}
+                        {{svg-jar "lock"}}
                         {{gh-text-input
                             class="password"
                             type="password"
@@ -41,7 +41,7 @@
                             failureClass=""
                             as |task|
                         }}
-                            <span>{{#if task.isRunning}}{{inline-svg "spinner" class="gh-spinner"}}{{else}}Forgot?{{/if}}</span>
+                            <span>{{#if task.isRunning}}{{svg-jar "spinner" class="gh-spinner"}}{{else}}Forgot?{{/if}}</span>
                         {{/gh-task-button}}
                     </span>
                 {{/gh-form-group}}
diff --git a/ghost/admin/app/templates/signup.hbs b/ghost/admin/app/templates/signup.hbs
index ed44f1c745..1ff4e5b826 100644
--- a/ghost/admin/app/templates/signup.hbs
+++ b/ghost/admin/app/templates/signup.hbs
@@ -16,7 +16,7 @@
                 {{#gh-form-group errors=signupDetails.errors hasValidated=hasValidated property="email"}}
                     <label for="email-address">Email address</label>
                     <span class="gh-input-icon gh-icon-mail">
-                        {{inline-svg "email"}}
+                        {{svg-jar "email"}}
                         {{gh-text-input
                             type="email"
                             name="email"
@@ -32,7 +32,7 @@
                 {{#gh-form-group errors=signupDetails.errors hasValidated=hasValidated property="name"}}
                     <label for="full-name">Full name</label>
                     <span class="gh-input-icon gh-icon-user">
-                        {{inline-svg "user-circle"}}
+                        {{svg-jar "user-circle"}}
                         {{gh-trim-focus-input
                             tabindex="1"
                             type="text"
@@ -53,7 +53,7 @@
                 {{#gh-form-group errors=signupDetails.errors hasValidated=hasValidated property="password"}}
                     <label for="password">Password</label>
                     <span class="gh-input-icon gh-icon-lock">
-                        {{inline-svg "lock"}}
+                        {{svg-jar "lock"}}
                         {{gh-text-input
                             tabindex="2"
                             type="password"
diff --git a/ghost/admin/app/templates/team/index.hbs b/ghost/admin/app/templates/team/index.hbs
index ab56648425..f57058d84b 100644
--- a/ghost/admin/app/templates/team/index.hbs
+++ b/ghost/admin/app/templates/team/index.hbs
@@ -29,7 +29,7 @@
                         <div class="apps-grid-cell" data-test-invite-id="{{invite.id}}">
                             <article class="apps-card-app">
                                 <div class="apps-card-left">
-                                    <span class="user-list-item-icon">{{inline-svg "email"}}ic</span>
+                                    <span class="user-list-item-icon">{{svg-jar "email"}}ic</span>
                                     <div class="apps-card-meta">
                                         <h3 class="apps-card-app-title" data-test-email>{{invite.email}}</h3>
                                         <p class="apps-card-app-desc">
diff --git a/ghost/admin/app/templates/team/user-loading.hbs b/ghost/admin/app/templates/team/user-loading.hbs
index 1f275b2647..b05b87e75c 100644
--- a/ghost/admin/app/templates/team/user-loading.hbs
+++ b/ghost/admin/app/templates/team/user-loading.hbs
@@ -2,7 +2,7 @@
     <header class="gh-canvas-header">
         <h2 class="gh-canvas-title" data-test-screen-title>
             {{link-to "Team" "team" data-test-team-link=true}}
-            <span>{{inline-svg "arrow-right"}}</span>
+            <span>{{svg-jar "arrow-right"}}</span>
             {{user.name}}
         </h2>
 
diff --git a/ghost/admin/app/templates/team/user.hbs b/ghost/admin/app/templates/team/user.hbs
index 57b60a1191..2a6a395068 100644
--- a/ghost/admin/app/templates/team/user.hbs
+++ b/ghost/admin/app/templates/team/user.hbs
@@ -2,7 +2,7 @@
     <header class="gh-canvas-header">
         <h2 class="gh-canvas-title" data-test-screen-title>
             {{link-to "Team" "team" data-test-team-link=true}}
-            <span>{{inline-svg "arrow-right"}}</span>
+            <span>{{svg-jar "arrow-right"}}</span>
             {{user.name}}
 
             {{#if user.isSuspended}}
@@ -22,7 +22,7 @@
                 <span class="dropdown">
                     {{#gh-dropdown-button dropdownName="user-actions-menu" classNames="gh-btn gh-btn-default gh-btn-icon only-has-icon user-actions-cog" title="User Actions" data-test-user-actions=true}}
                         <span>
-                            {{inline-svg "settings"}}
+                            {{svg-jar "settings"}}
                             <span class="hidden">User Settings</span>
                         </span>
                     {{/gh-dropdown-button}}
diff --git a/ghost/admin/ember-cli-build.js b/ghost/admin/ember-cli-build.js
index 02107a2dff..b94d14d30f 100644
--- a/ghost/admin/ember-cli-build.js
+++ b/ghost/admin/ember-cli-build.js
@@ -161,12 +161,12 @@ module.exports = function (defaults) {
                 import: ['simplemde.js', 'simplemde.css']
             }
         },
-        svg: {
+        svgJar: {
             paths: [
                 'public/assets/icons',
                 'lib/koenig-editor/public/icons'
             ],
-            optimize: {
+            optimizer: {
                 plugins: [
                     {removeDimensions: true},
                     {removeTitle: true},
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs
index f0f91b5091..b88ceff4c6 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs
@@ -1,4 +1,4 @@
-{{#if icon}}{{inline-svg icon class=iconClass}}{{/if}}
+{{#if icon}}{{svg-jar icon class=iconClass}}{{/if}}
 
 {{yield}}
 
@@ -13,7 +13,7 @@
                 onmousedown={{action item.action}}
             >
                 {{#if item.icon}}
-                    {{inline-svg item.icon}}
+                    {{svg-jar item.icon}}
                 {{else}}
                     {{item.title}}
                 {{/if}}
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
index be5ec1a815..dc994abcfe 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
@@ -1,30 +1,30 @@
 {{#if showButton}}
-    <button class="koenig-plus-menu-button" {{action "openMenu"}}>{{inline-svg "plus"}}</button>
+    <button class="koenig-plus-menu-button" {{action "openMenu"}}>{{svg-jar "plus"}}</button>
 {{/if}}
 
 {{#if showMenu}}
     <div class="koenig-cardmenu">
         {{!-- <div class="koenig-cardmenu-search">
-            {{inline-svg "koenig/search"}}
+            {{svg-jar "koenig/search"}}
             <input type="text" placeholder="Search for a card..." class="gh-input koenig-cardmenu-search-input">
         </div>
         <div class="koenig-cardmenu-divider">
             Primary
         </div> --}}
         <div class="koenig-cardmenu-card" {{action "replaceWithCardSection" "markdown" on="click"}}>
-            <div class="koenig-cardmenu-icon">{{inline-svg "koenig/markdown"}}</div>
+            <div class="koenig-cardmenu-icon">{{svg-jar "koenig/markdown"}}</div>
             <div class="koenig-cardmenu-label">Markdown</div>
         </div>
         <div class="koenig-cardmenu-card" {{action "replaceWithCardSection" "image" on="click"}}>
-            <div class="koenig-cardmenu-icon">{{inline-svg "koenig/image"}}</div>
+            <div class="koenig-cardmenu-icon">{{svg-jar "koenig/image"}}</div>
             <div class="koenig-cardmenu-label">Image</div>
         </div>
         <div class="koenig-cardmenu-card" {{action "replaceWithCardSection" "html" on="click"}}>
-            <div class="koenig-cardmenu-icon">{{inline-svg "koenig/embed"}}</div>
+            <div class="koenig-cardmenu-icon">{{svg-jar "koenig/embed"}}</div>
             <div class="koenig-cardmenu-label">Embed</div>
         </div>
         <div class="koenig-cardmenu-card" {{action "replaceWithCardSection" "hr" on="click"}}>
-            <div class="koenig-cardmenu-icon">{{inline-svg "koenig/divider"}}</div>
+            <div class="koenig-cardmenu-icon">{{svg-jar "koenig/divider"}}</div>
             <div class="koenig-cardmenu-label">Divider</div>
         </div>
     </div>
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs
index 8612cd6b0d..a5c926cea8 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs
@@ -2,7 +2,7 @@
     <div class="koenig-cardmenu">
         {{#each items as |item|}}
             <div class="koenig-cardmenu-card {{if item.selected "selected"}}" {{action "itemClicked" item on="click"}}>
-                <div class="koenig-cardmenu-icon">{{inline-svg item.icon}}</div>
+                <div class="koenig-cardmenu-icon">{{svg-jar item.icon}}</div>
                 <div class="koenig-cardmenu-label">{{item.label}}</div>
             </div>
         {{/each}}
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs
index 7e1500d702..a7fade321e 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs
@@ -40,7 +40,7 @@
     class="koenig-toolbar-btn koenig-toolbar-btn-list {{if activeSectionTagNames.isUl "selected"}}"
     {{action "toggleSection" "ul"}}
 >
-    {{inline-svg "koenig/list-bullets"}}
+    {{svg-jar "koenig/list-bullets"}}
 </button>
 <button
     type="button"
@@ -48,7 +48,7 @@
     class="koenig-toolbar-btn koenig-toolbar-btn-list {{if activeSectionTagNames.isOl "selected"}}"
     {{action "toggleSection" "ol"}}
 >
-    {{inline-svg "koenig/list-number"}}
+    {{svg-jar "koenig/list-number"}}
 </button>
 <button
     type="button"
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 901262344d..9a06c59e35 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -75,7 +75,6 @@
     "ember-fetch": "3.4.4",
     "ember-in-viewport": "3.0.0",
     "ember-infinity": "1.0.0-alpha.9",
-    "ember-inline-svg": "0.1.11",
     "ember-invoke-action": "1.5.0",
     "ember-light-table": "1.8.6",
     "ember-load": "0.0.12",
@@ -90,6 +89,7 @@
     "ember-simple-auth": "1.5.1",
     "ember-sinon": "1.0.1",
     "ember-source": "3.0.0",
+    "ember-svg-jar": "0.12.0",
     "ember-test-selectors": "0.3.8",
     "ember-truth-helpers": "2.0.0",
     "ember-wormhole": "0.5.4",
diff --git a/ghost/admin/tests/unit/components/gh-alert-test.js b/ghost/admin/tests/unit/components/gh-alert-test.js
index 7802a6c679..f5615eaed9 100644
--- a/ghost/admin/tests/unit/components/gh-alert-test.js
+++ b/ghost/admin/tests/unit/components/gh-alert-test.js
@@ -7,7 +7,7 @@ describe('Unit: Component: gh-alert', function () {
     setupComponentTest('gh-alert', {
         unit: true,
         // specify the other units that are required for this test
-        needs: ['service:notifications', 'helper:inline-svg']
+        needs: ['service:notifications', 'helper:svg-jar']
     });
 
     it('closes notification through notifications service', function () {
diff --git a/ghost/admin/tests/unit/components/gh-notification-test.js b/ghost/admin/tests/unit/components/gh-notification-test.js
index bbb2218726..e045504075 100644
--- a/ghost/admin/tests/unit/components/gh-notification-test.js
+++ b/ghost/admin/tests/unit/components/gh-notification-test.js
@@ -7,7 +7,7 @@ describe('Unit: Component: gh-notification', function () {
     setupComponentTest('gh-notification', {
         unit: true,
         // specify the other units that are required for this test
-        needs: ['service:notifications', 'helper:inline-svg']
+        needs: ['service:notifications', 'helper:svg-jar']
     });
 
     it('closes notification through notifications service', function () {
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index 85354dcfb6..7705880a2e 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -46,6 +46,10 @@ JSONStream@^1.0.3:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
+abab@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -68,6 +72,12 @@ accepts@~1.3.4:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
+acorn-globals@^1.0.4:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
+  dependencies:
+    acorn "^2.1.0"
+
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -81,6 +91,10 @@ acorn-node@^1.2.0:
     acorn "^5.4.1"
     xtend "^4.0.1"
 
+acorn@^2.1.0, acorn@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -1198,6 +1212,10 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
@@ -1338,6 +1356,17 @@ broccoli-caching-writer@3.0.3, broccoli-caching-writer@^3.0.3:
     rsvp "^3.0.17"
     walk-sync "^0.3.0"
 
+broccoli-caching-writer@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.2.5"
+    broccoli-plugin "1.1.0"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.2.5"
+
 broccoli-clean-css@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
@@ -1373,6 +1402,19 @@ broccoli-concat@3.2.2, broccoli-concat@^3.2.2:
     lodash.uniq "^4.2.0"
     walk-sync "^0.3.1"
 
+broccoli-concat@^2.2.0:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-2.3.8.tgz#590cdcc021bb905b6c121d87c2d1d57df44a2a48"
+  dependencies:
+    broccoli-caching-writer "^2.3.1"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-stew "^1.3.3"
+    fast-sourcemap-concat "^1.0.1"
+    fs-extra "^0.30.0"
+    lodash.merge "^4.3.0"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+
 broccoli-config-loader@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
@@ -1437,15 +1479,6 @@ broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
     symlink-or-copy "^1.0.1"
     walk-sync "^0.3.1"
 
-broccoli-flatiron@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-flatiron/-/broccoli-flatiron-0.0.0.tgz#e97504016b56eea04813b5d862fda18b6f11a77f"
-  dependencies:
-    broccoli-kitchen-sink-helpers "~0.2.4"
-    broccoli-writer "~0.1.1"
-    mkdirp "^0.3.5"
-    rsvp "~3.0.6"
-
 broccoli-funnel-reducer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
@@ -1504,7 +1537,7 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@~0.2.0, broccoli-kitchen-sink-helpers@~0.2.4:
+broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
   dependencies:
@@ -1587,6 +1620,15 @@ broccoli-persistent-filter@1.4.3, broccoli-persistent-filter@^1.0.3, broccoli-pe
     symlink-or-copy "^1.0.1"
     walk-sync "^0.3.1"
 
+broccoli-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.0.1"
+
 broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz#bee704a8e42da08cb58e513aaa436efb7f0ef1ee"
@@ -1668,13 +1710,32 @@ broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.0, broccoli-stew@
     symlink-or-copy "^1.1.8"
     walk-sync "^0.3.0"
 
-broccoli-string-replace@^0.1.1:
+broccoli-string-replace@^0.1.1, broccoli-string-replace@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-string-replace/-/broccoli-string-replace-0.1.2.tgz#1ed92f85680af8d503023925e754e4e33676b91f"
   dependencies:
     broccoli-persistent-filter "^1.1.5"
     minimatch "^3.0.3"
 
+broccoli-svg-optimizer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-svg-optimizer/-/broccoli-svg-optimizer-1.0.2.tgz#b12e84e65912f3134939cbf766c3fa0b4d0d92d9"
+  dependencies:
+    broccoli-persistent-filter "^1.2.0"
+    json-stable-stringify "^1.0.1"
+    rsvp "^3.2.1"
+    svgo "^0.6.6"
+
+broccoli-symbolizer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/broccoli-symbolizer/-/broccoli-symbolizer-0.5.0.tgz#c666d4158ff4484263daaee9a6284d684b6eb3a2"
+  dependencies:
+    broccoli-concat "^2.2.0"
+    broccoli-persistent-filter "^1.2.0"
+    cheerio "^0.20.0"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.13.1"
+
 broccoli-templater@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-templater/-/broccoli-templater-1.0.0.tgz#7c054aacf596d1868d1a44291f9ec7b907d30ecf"
@@ -2056,6 +2117,18 @@ charm@^1.0.0:
   dependencies:
     inherits "^2.0.1"
 
+cheerio@^0.20.0:
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35"
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.0"
+    entities "~1.1.1"
+    htmlparser2 "~3.8.1"
+    lodash "^4.1.0"
+  optionalDependencies:
+    jsdom "^7.0.2"
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2584,10 +2657,23 @@ css-declaration-sorter@^2.0.1:
     timsort "^0.3.0"
     write-file-stdout "0.0.2"
 
+css-select@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
 css-unit-converter@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
 
+css-what@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+
 csscomb@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/csscomb/-/csscomb-4.2.0.tgz#5f948bc94afa61c033c3984e4192f0e6fef67fdb"
@@ -2680,6 +2766,16 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
+cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.29 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  dependencies:
+    cssom "0.3.x"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -2916,10 +3012,38 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-serializer@0, dom-serializer@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
 domain-browser@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
+domelementtype@1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
+  dependencies:
+    domelementtype "1"
+
+domutils@1.5, domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 dot-prop@^4.1.0, dot-prop@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
@@ -3640,22 +3764,6 @@ ember-inflector@^2.0.0:
   dependencies:
     ember-cli-babel "^6.0.0"
 
-ember-inline-svg@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/ember-inline-svg/-/ember-inline-svg-0.1.11.tgz#bb5af24cef1db3ab2e1a8aec543bee262a368c37"
-  dependencies:
-    broccoli-caching-writer "^3.0.3"
-    broccoli-flatiron "0.0.0"
-    broccoli-funnel "^1.0.1"
-    broccoli-merge-trees "^2.0.0"
-    ember-cli-babel "^5.1.6"
-    merge "^1.2.0"
-    mkdirp "^0.5.1"
-    promise-map-series "^0.2.1"
-    rsvp "^3.2.1"
-    svgo "^0.6.3"
-    walk-sync "^0.3.1"
-
 ember-invoke-action@1.5.0, ember-invoke-action@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/ember-invoke-action/-/ember-invoke-action-1.5.0.tgz#0370f187f39f22d54ddd039cd01aa7e685edbbec"
@@ -3897,6 +4005,22 @@ ember-source@3.0.0:
     jquery "^3.2.1"
     resolve "^1.3.3"
 
+ember-svg-jar@0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-0.12.0.tgz#558253e7b6f2617e1d04aa13fb2bb6c6c1924020"
+  dependencies:
+    broccoli-caching-writer "^2.3.1"
+    broccoli-funnel "^1.0.1"
+    broccoli-merge-trees "^1.1.1"
+    broccoli-string-replace "^0.1.2"
+    broccoli-svg-optimizer "^1.0.2"
+    broccoli-symbolizer "^0.5.0"
+    cheerio "^0.20.0"
+    ember-cli-babel "^6.6.0"
+    lodash "^4.13.1"
+    mkdirp "^0.5.1"
+    path-posix "^1.0.0"
+
 ember-test-selectors@0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-0.3.8.tgz#1e8ae3e78c64bacc4bbfe87f9973c85805699db2"
@@ -3993,6 +4117,10 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz#a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"
 
+entities@1.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
+
 entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
@@ -4085,7 +4213,7 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@^1.8.0:
+escodegen@^1.6.1, escodegen@^1.8.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
   dependencies:
@@ -5298,6 +5426,16 @@ htmlescape@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
 
+htmlparser2@~3.8.1:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
+  dependencies:
+    domelementtype "1"
+    domhandler "2.3"
+    domutils "1.5"
+    entities "1.0"
+    readable-stream "1.1"
+
 http-errors@1.6.2, http-errors@~1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
@@ -5848,6 +5986,26 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
+jsdom@^7.0.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e"
+  dependencies:
+    abab "^1.0.0"
+    acorn "^2.4.0"
+    acorn-globals "^1.0.4"
+    cssom ">= 0.3.0 < 0.4.0"
+    cssstyle ">= 0.2.29 < 0.3.0"
+    escodegen "^1.6.1"
+    nwmatcher ">= 1.3.7 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.55.0"
+    sax "^1.1.4"
+    symbol-tree ">= 3.1.0 < 4.0.0"
+    tough-cookie "^2.2.0"
+    webidl-conversions "^2.0.0"
+    whatwg-url-compat "~0.6.5"
+    xml-name-validator ">= 2.0.1 < 3.0.0"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -6482,7 +6640,7 @@ lodash@^3.10.0, lodash@^3.9.3, lodash@~3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1:
+lodash@^4.1.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
@@ -6686,7 +6844,7 @@ merge-trees@^1.0.1:
     rimraf "^2.4.3"
     symlink-or-copy "^1.0.0"
 
-merge@1.2.0, merge@^1.1.3, merge@^1.2.0:
+merge@1.2.0, merge@^1.1.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
@@ -7096,6 +7254,12 @@ npmlog@^4.0.0, npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nth-check@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  dependencies:
+    boolbase "~1.0.0"
+
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -7104,6 +7268,10 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
+"nwmatcher@>= 1.3.7 < 2.0.0":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
@@ -7302,6 +7470,10 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
 parsejson@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
@@ -7968,6 +8140,15 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
+readable-stream@1.1:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^2, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
@@ -8174,6 +8355,33 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@^2.55.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 request@^2.72.0, request@^2.79.0:
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
@@ -8431,7 +8639,7 @@ sane@^2.2.0, sane@^2.4.1:
   optionalDependencies:
     fsevents "^1.1.1"
 
-sax@~1.2.1:
+sax@^1.1.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -9041,7 +9249,7 @@ supports-color@^5.1.0, supports-color@^5.2.0:
   dependencies:
     has-flag "^3.0.0"
 
-svgo@^0.6.3:
+svgo@^0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.6.6.tgz#b340889036f20f9b447543077d0f5573ed044c08"
   dependencies:
@@ -9065,6 +9273,10 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
+"symbol-tree@>= 3.1.0 < 4.0.0":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
 symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#5d49108e2ab824a34069b68974486c290020b393"
@@ -9275,12 +9487,16 @@ top-gh-contribs@2.0.4:
     lodash "^4.11.1"
     request "^2.72.0"
 
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@^2.2.0, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
+tr46@~0.0.1:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
 tree-sync@^1.2.1, tree-sync@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.2.2.tgz#2cf76b8589f59ffedb58db5a3ac7cb013d0158b7"
@@ -9589,7 +9805,7 @@ walk-sync@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583"
 
-walk-sync@^0.2.6, walk-sync@^0.2.7:
+walk-sync@^0.2.5, walk-sync@^0.2.6, walk-sync@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
   dependencies:
@@ -9625,6 +9841,10 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+webidl-conversions@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
+
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
@@ -9640,6 +9860,12 @@ whatwg-fetch@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
 
+whatwg-url-compat@~0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz#00898111af689bb097541cd5a45ca6c8798445bf"
+  dependencies:
+    tr46 "~0.0.1"
+
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
@@ -9751,6 +9977,10 @@ xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
+"xml-name-validator@>= 2.0.1 < 3.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
 xmldom@^0.1.19:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"