diff --git a/.changeset/loud-walls-compare.md b/.changeset/loud-walls-compare.md
new file mode 100644
index 0000000000..3616006675
--- /dev/null
+++ b/.changeset/loud-walls-compare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/app-defaults': patch
+---
+
+Fixed inconsistencies in icons used for System and Template
diff --git a/packages/app-defaults/src/defaults/icons.tsx b/packages/app-defaults/src/defaults/icons.tsx
index fbdfb14e5b..9f83b01988 100644
--- a/packages/app-defaults/src/defaults/icons.tsx
+++ b/packages/app-defaults/src/defaults/icons.tsx
@@ -17,7 +17,7 @@
 import { IconComponent } from '@backstage/core-plugin-api';
 import MuiApartmentIcon from '@material-ui/icons/Apartment';
 import MuiBrokenImageIcon from '@material-ui/icons/BrokenImage';
-import MuiCategoryIcon from '@material-ui/icons/Category';
+import MuiBusinessIcon from '@material-ui/icons/Business';
 import MuiCreateNewFolderIcon from '@material-ui/icons/CreateNewFolder';
 import MuiSubjectIcon from '@material-ui/icons/Subject';
 import MuiSearchIcon from '@material-ui/icons/Search';
@@ -35,7 +35,7 @@ import MuiPeopleIcon from '@material-ui/icons/People';
 import MuiPersonIcon from '@material-ui/icons/Person';
 import MuiWarningIcon from '@material-ui/icons/Warning';
 import MuiWorkIcon from '@material-ui/icons/Work';
-import MuiFeaturedPlayListIcon from '@material-ui/icons/FeaturedPlayList';
+import MuiLibraryAddIcon from '@material-ui/icons/LibraryAdd';
 
 export const icons = {
   brokenImage: MuiBrokenImageIcon as IconComponent,
@@ -56,10 +56,10 @@ export const icons = {
   'kind:domain': MuiApartmentIcon as IconComponent,
   'kind:group': MuiPeopleIcon as IconComponent,
   'kind:location': MuiLocationOnIcon as IconComponent,
-  'kind:system': MuiCategoryIcon as IconComponent,
+  'kind:system': MuiBusinessIcon as IconComponent,
   'kind:user': MuiPersonIcon as IconComponent,
   'kind:resource': MuiWorkIcon as IconComponent,
-  'kind:template': MuiFeaturedPlayListIcon as IconComponent,
+  'kind:template': MuiLibraryAddIcon as IconComponent,
   user: MuiPersonIcon as IconComponent,
   warning: MuiWarningIcon as IconComponent,
 };