diff --git a/.changeset/selfish-geese-mix.md b/.changeset/selfish-geese-mix.md
new file mode 100644
index 0000000000..83798ea533
--- /dev/null
+++ b/.changeset/selfish-geese-mix.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Use `EntityRefLinks` with `noIcons` property for `TemplateCard` component to avoid double icons
diff --git a/.changeset/tidy-gorillas-carry.md b/.changeset/tidy-gorillas-carry.md
new file mode 100644
index 0000000000..47d8de8f30
--- /dev/null
+++ b/.changeset/tidy-gorillas-carry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Move the `EntityRefLink` icon to the left hand side as per Material-UI guidelines