diff --git a/css/_base.scss b/css/_base.scss
index 119db372e..c535f571f 100644
--- a/css/_base.scss
+++ b/css/_base.scss
@@ -33,7 +33,7 @@ body {
     }
 }
 
-svg {
+.jitsi-icon svg {
     fill: white;
 }
 
diff --git a/react/features/base/icons/components/Icon.js b/react/features/base/icons/components/Icon.js
index 243677144..460909006 100644
--- a/react/features/base/icons/components/Icon.js
+++ b/react/features/base/icons/components/Icon.js
@@ -11,7 +11,7 @@ type Props = {
     /**
      * Class name for the web platform, if any.
      */
-    className?: string,
+    className: string,
 
     /**
      * Color of the icon (if not provided by the style object).
@@ -68,7 +68,7 @@ export default function Icon(props: Props) {
 
     return (
         <Container
-            className = { className }
+            className = { `jitsi-icon ${className}` }
             style = { restStyle }>
             <IconComponent
                 fill = { calculatedColor }
@@ -79,3 +79,6 @@ export default function Icon(props: Props) {
     );
 }
 
+Icon.defaultProps = {
+    className: ''
+};