diff --git a/packages/lucide-react/tests/lucide-react.spec.tsx b/packages/lucide-react/tests/lucide-react.spec.tsx
index 30c30af67a..8dea7b482f 100644
--- a/packages/lucide-react/tests/lucide-react.spec.tsx
+++ b/packages/lucide-react/tests/lucide-react.spec.tsx
@@ -76,7 +76,7 @@ describe('Using lucide icon components', () => {
     expect( container.innerHTML ).toMatchSnapshot();
   });
 
-  it('should merge default classNames with the provided classNames', () => {
+  it('should apply all classNames to the element', () => {
     const testClass = 'my-class';
     const { container } = render(
       <Club className={testClass} />,
diff --git a/packages/lucide-solid/tests/lucide-solid.spec.tsx b/packages/lucide-solid/tests/lucide-solid.spec.tsx
index 013d2a5a71..9dbcf74e9a 100644
--- a/packages/lucide-solid/tests/lucide-solid.spec.tsx
+++ b/packages/lucide-solid/tests/lucide-solid.spec.tsx
@@ -80,7 +80,7 @@ describe('Using lucide icon components', () => {
     cleanup()
   });
 
-  it('should merge default classes with the provided classes', () => {
+  it('should add all classes to the element', () => {
     const testClass = 'my-class';
     const { container } = render(() =>
       <Droplet class={testClass} />,
diff --git a/packages/lucide-static/scripts/buildLib.mjs b/packages/lucide-static/scripts/buildLib.mjs
index b9caab8862..aa28c6169d 100644
--- a/packages/lucide-static/scripts/buildLib.mjs
+++ b/packages/lucide-static/scripts/buildLib.mjs
@@ -48,7 +48,10 @@ svgs.forEach(({ name, contents }) => {
   const importString = `module.exports.${componentName} = require('./icons/${name}');\n`;
   appendFile(importString, `index.js`, LIB_DIR);
 
-  const exportString = `${jsLicense}module.exports = \`${contents}\`;\n`;
+  const svgContent = contents.replace('<svg', `<svg
+  class="lucide lucide-${name}"`);
+
+  const exportString = `${jsLicense}module.exports = \`${svgContent}\`;\n`;
   appendFile(exportString, `${name}.js`, ICON_MODULE_DIR);
 });
 
diff --git a/packages/lucide-static/scripts/copyIcons.mjs b/packages/lucide-static/scripts/copyIcons.mjs
index dbbdc1574d..6624c169dc 100644
--- a/packages/lucide-static/scripts/copyIcons.mjs
+++ b/packages/lucide-static/scripts/copyIcons.mjs
@@ -13,7 +13,8 @@ export default async function copyIcons(parsedSvgs, packageDir, license) {
   }
   // eslint-disable-next-line arrow-body-style
   const writeIconPromises = parsedSvgs.map(({ name, contents }) => {
-    const content = `<!-- ${license} -->\n${contents}`;
+    let content = `<!-- ${license} -->\n${contents}`;
+    content = content.replace('<svg', `<svg\n  class="lucide lucide-${name}"`);
 
     return writeFile(`${iconsDirectory}/${name}.svg`, content);
   });