diff --git a/docs/getting-started/app-custom-theme.md b/docs/getting-started/app-custom-theme.md
index 25e5ff9237..97d57540a9 100644
--- a/docs/getting-started/app-custom-theme.md
+++ b/docs/getting-started/app-custom-theme.md
@@ -277,54 +277,7 @@ const LogoFull = () => {
 
 You can also customize the Project's _default_ icons.
 
-We can change the following icons:
-
-<div align="center">
-   <table>
-        <tr>
-            <th style="text-align:center" colspan="2">Icons</th>
-        </tr>
-        <tr>
-            <td align="center">brokenImage</td>
-            <td align="center">chat</td>
-        </tr>
-            <td align="center">dashboard</td>
-             <td align="center">docs</td>
-        </tr>
-        <tr>
-            <td align="center">email</td>
-            <td align="center">github</td>
-        </tr>
-        <tr>
-            <td align="center">group</td>
-            <td align="center">help</td>
-        </tr>
-        <tr>
-            <td align="center">"kind:api"</td>
-            <td align="center">"kind:component"</td>
-        </tr>
-        <tr>
-            <td align="center">"kind:domain"</td>
-            <td align="center">"kind:group"</td>
-        </tr>
-        <tr>
-            <td align="center">"kind:location"</td>
-            <td align="center">"kind:system"</td>
-        </tr>
-        <tr>
-            <td align="center">"kind:user"</td>
-            <td align="center">scaffolder</td>
-        </tr>
-        <tr>
-            <td align="center">search</td>
-            <td align="center">techdocs</td>
-        </tr>
-        <tr>
-            <td align="center">user</td>
-            <td align="center">warning</td>
-        </tr>
-   </table>
-</div>
+We can change the following [icons](https://github.com/backstage/backstage/blob/master/packages/app-defaults/src/defaults/icons.tsx).
 
 ### Requirements
 
@@ -338,15 +291,24 @@ In your front-end application, locate the `src` folder. We suggest creating the
 In the `icons` directory, upload the files in `.svg` format.
 
 In the `assets` directory, you can create the `customIcons.tsx` file.
-
+> Another example [here](https://github.com/backstage/backstage/blob/master/plugins/azure-devops/src/components/AzurePipelinesIcon/AzurePipelinesIcon.tsx), if you want to ensure proper behavior in light and dark themes.
 ```tsx
 // customIcons.tsx
-import React from 'react';
-import ExampleSVG from './icons/example.svg';
+import { SvgIcon, SvgIconProps } from '@material-ui/core';
 
-export const ExampleIcon = () => {
-  return <img alt="" src={ExampleSVG} />;
-};
+import React from 'react';
+
+export const HeaderIcon = (props: SvgIconProps) => (
+  <SvgIcon {...props} viewBox="0 0 24 24">
+    <path
+        fill="currentColor"
+        width="1em"
+        height="1em"
+        display="inline-block"
+        d="M11.6335 10.8398C11.6335 11.6563 12.065 12.9922 13.0863 12.9922C14.1075 12.9922 14.539 11.6563 14.539 10.8398C14.539 10.0234 14.1075 8.6875 13.0863 8.6875C12.065 8.6875 11.6335 10.0234 11.6335 10.8398V10.8398ZM2.38419e-07 8.86719C2.38419e-07 10.1133 0.126667 11.4336 0.692709 12.5781C2.19292 15.5703 6.3175 15.5 9.27042 15.5C12.2708 15.5 16.6408 15.6055 18.2004 12.5781C18.7783 11.4453 19 10.1133 19 8.86719C19 7.23047 18.4498 5.68359 17.3573 4.42969C17.5631 3.8125 17.6621 3.16406 17.6621 2.52344C17.6621 1.68359 17.4681 1.26172 17.0842 0.5C15.291 0.5 14.1431 0.851562 12.7775 1.90625C11.6296 1.63672 10.45 1.51562 9.26646 1.51562C8.19771 1.51562 7.12104 1.62891 6.08396 1.875C4.73813 0.832031 3.59021 0.5 1.81687 0.5C1.42896 1.26172 1.23896 1.68359 1.23896 2.52344C1.23896 3.16406 1.34188 3.80078 1.54375 4.40625C0.455209 5.67188 2.38419e-07 7.23047 2.38419e-07 8.86719V8.86719ZM2.54521 10.8398C2.54521 9.125 3.60208 7.61328 5.45458 7.61328C6.20271 7.61328 6.91917 7.74609 7.67125 7.84766C8.26104 7.9375 8.85083 7.97266 9.45646 7.97266C10.0581 7.97266 10.6479 7.9375 11.2417 7.84766C11.9819 7.74609 12.7063 7.61328 13.4583 7.61328C15.3108 7.61328 16.3677 9.125 16.3677 10.8398C16.3677 14.2695 13.1852 14.7969 10.4144 14.7969H8.50646C5.72375 14.7969 2.54521 14.2734 2.54521 10.8398V10.8398ZM5.81479 8.6875C6.83604 8.6875 7.2675 10.0234 7.2675 10.8398C7.2675 11.6563 6.83604 12.9922 5.81479 12.9922C4.79354 12.9922 4.36208 11.6563 4.36208 10.8398C4.36208 10.0234 4.79354 8.6875 5.81479 8.6875Z"
+    />
+  </SvgIcon>
+);
 ```
 
 ### Using the custom icon