diff --git a/.changeset/loud-walls-compare.md b/.changeset/loud-walls-compare.md
new file mode 100644
index 0000000000..495ad933d9
--- /dev/null
+++ b/.changeset/loud-walls-compare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Fixed inconsistencies in icons used for System and Template
diff --git a/plugins/catalog/src/apis/EntityPresentationApi/defaults.tsx b/plugins/catalog/src/apis/EntityPresentationApi/defaults.tsx
index 84f04c6f83..c2abeb5e6a 100644
--- a/plugins/catalog/src/apis/EntityPresentationApi/defaults.tsx
+++ b/plugins/catalog/src/apis/EntityPresentationApi/defaults.tsx
@@ -18,10 +18,10 @@ import { IconComponent } from '@backstage/core-plugin-api';
 import { defaultEntityPresentation } from '@backstage/plugin-catalog-react';
 import { HumanDuration } from '@backstage/types';
 import ApartmentIcon from '@material-ui/icons/Apartment';
-import BusinessIcon from '@material-ui/icons/Business';
+import CategoryIcon from '@material-ui/icons/Category';
 import ExtensionIcon from '@material-ui/icons/Extension';
 import HelpIcon from '@material-ui/icons/Help';
-import LibraryAddIcon from '@material-ui/icons/LibraryAdd';
+import FeaturedPlayListIcon from '@material-ui/icons/FeaturedPlayList';
 import LocationOnIcon from '@material-ui/icons/LocationOn';
 import MemoryIcon from '@material-ui/icons/Memory';
 import PeopleIcon from '@material-ui/icons/People';
@@ -38,13 +38,13 @@ export const UNKNOWN_KIND_ICON: IconComponent = HelpIcon;
 export const DEFAULT_ICONS: Record<string, IconComponent> = {
   api: ExtensionIcon,
   component: MemoryIcon,
-  system: BusinessIcon,
+  system: CategoryIcon,
   resource: WorkIcon,
   domain: ApartmentIcon,
   location: LocationOnIcon,
   user: PersonIcon,
   group: PeopleIcon,
-  template: LibraryAddIcon,
+  template: FeaturedPlayListIcon,
 };
 
 export function createDefaultRenderer(options: {