diff --git a/packages/grafana-icons/src/IconBase.tsx b/packages/grafana-icons/src/IconBase.tsx
index cc4149e7413..5c3983f0442 100644
--- a/packages/grafana-icons/src/IconBase.tsx
+++ b/packages/grafana-icons/src/IconBase.tsx
@@ -33,8 +33,6 @@ export const IconBase = ({ title, size = 'md', color = 'currentColor', ...props
   return (
     <svg
       {...props}
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 24 24"
       height={svgSize}
       width={svgSize}
       style={{
diff --git a/packages/grafana-icons/templates/icon.cjs b/packages/grafana-icons/templates/icon.cjs
index 2514571e00e..ec784905a7b 100644
--- a/packages/grafana-icons/templates/icon.cjs
+++ b/packages/grafana-icons/templates/icon.cjs
@@ -4,6 +4,7 @@
 const modifyJSX = (jsx) => {
   jsx.openingElement.name.name = 'IconBase';
   jsx.openingElement.attributes = [
+    ...jsx.openingElement.attributes,
     {
       type: 'JSXSpreadAttribute',
       argument: {