diff --git a/ui/admin/public/app-icons/action-session.svg b/addons/core/public/app-icons/action-session.svg
similarity index 100%
rename from ui/admin/public/app-icons/action-session.svg
rename to addons/core/public/app-icons/action-session.svg
diff --git a/ui/admin/public/app-icons/auth-method.svg b/addons/core/public/app-icons/auth-method.svg
similarity index 100%
rename from ui/admin/public/app-icons/auth-method.svg
rename to addons/core/public/app-icons/auth-method.svg
diff --git a/ui/admin/public/app-icons/gear.svg b/addons/core/public/app-icons/gear.svg
similarity index 100%
rename from ui/admin/public/app-icons/gear.svg
rename to addons/core/public/app-icons/gear.svg
diff --git a/ui/admin/public/app-icons/global.svg b/addons/core/public/app-icons/global.svg
similarity index 100%
rename from ui/admin/public/app-icons/global.svg
rename to addons/core/public/app-icons/global.svg
diff --git a/ui/admin/public/app-icons/group.svg b/addons/core/public/app-icons/group.svg
similarity index 100%
rename from ui/admin/public/app-icons/group.svg
rename to addons/core/public/app-icons/group.svg
diff --git a/ui/admin/public/app-icons/host-catalogs.svg b/addons/core/public/app-icons/host-catalogs.svg
similarity index 100%
rename from ui/admin/public/app-icons/host-catalogs.svg
rename to addons/core/public/app-icons/host-catalogs.svg
diff --git a/ui/admin/public/app-icons/org.svg b/addons/core/public/app-icons/org.svg
similarity index 100%
rename from ui/admin/public/app-icons/org.svg
rename to addons/core/public/app-icons/org.svg
diff --git a/ui/admin/public/app-icons/project.svg b/addons/core/public/app-icons/project.svg
similarity index 100%
rename from ui/admin/public/app-icons/project.svg
rename to addons/core/public/app-icons/project.svg
diff --git a/ui/admin/public/app-icons/roles.svg b/addons/core/public/app-icons/roles.svg
similarity index 100%
rename from ui/admin/public/app-icons/roles.svg
rename to addons/core/public/app-icons/roles.svg
diff --git a/ui/admin/public/app-icons/target.svg b/addons/core/public/app-icons/target.svg
similarity index 100%
rename from ui/admin/public/app-icons/target.svg
rename to addons/core/public/app-icons/target.svg
diff --git a/ui/admin/public/app-icons/user-profile.svg b/addons/core/public/app-icons/user-profile.svg
similarity index 100%
rename from ui/admin/public/app-icons/user-profile.svg
rename to addons/core/public/app-icons/user-profile.svg
diff --git a/ui/admin/public/app-icons/users.svg b/addons/core/public/app-icons/users.svg
similarity index 100%
rename from ui/admin/public/app-icons/users.svg
rename to addons/core/public/app-icons/users.svg
diff --git a/ui/admin/public/logo-app.svg b/addons/core/public/logo-app.svg
similarity index 100%
rename from ui/admin/public/logo-app.svg
rename to addons/core/public/logo-app.svg
diff --git a/ui/admin/public/logo-company.svg b/addons/core/public/logo-company.svg
similarity index 100%
rename from ui/admin/public/logo-company.svg
rename to addons/core/public/logo-company.svg
diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js
index 8d6513cf5..c089df924 100644
--- a/ui/admin/ember-cli-build.js
+++ b/ui/admin/ember-cli-build.js
@@ -18,6 +18,11 @@ module.exports = function (defaults) {
     emberNotify: {
       importCss: false,
     },
+    svg: {
+      paths: [
+        '../../addons/core/public'
+      ]
+    }
   });
 
   // Only import when in development or test mode
diff --git a/ui/admin/package.json b/ui/admin/package.json
index eb3340116..5879140d7 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -35,11 +35,11 @@
     "@glimmer/tracking": "^1.0.0",
     "api": "*",
     "auth": "*",
-    "core": "*",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "clipboard": "^2.0.6",
+    "core": "*",
     "doctoc": "^1.4.0",
     "ember-a11y-testing": "^3.0.0",
     "ember-auto-import": "^1.6.0",
diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js
index cc31a1b6c..b3af84373 100644
--- a/ui/desktop/ember-cli-build.js
+++ b/ui/desktop/ember-cli-build.js
@@ -18,6 +18,11 @@ module.exports = function (defaults) {
     emberNotify: {
       importCss: false,
     },
+    svg: {
+      paths: [
+        '../../addons/core/public'
+      ]
+    }
   });
 
   // Use `app.import` to add additional libraries to the generated