diff --git a/src/components/Icon.scss b/src/components/Icon.scss
index d17e190..fbe78de 100644
--- a/src/components/Icon.scss
+++ b/src/components/Icon.scss
@@ -56,7 +56,7 @@
 
   &--golden {
     .icon__frame {
-      background-image: url('../images/icons/large/gold.png');
+      background-image: url('../images/icon-meta/large/gold.png');
     }
   }
 
@@ -78,7 +78,7 @@
 
   &__frame {
     position: absolute;
-    background-image: url('../images/icons/large/default.png');
+    background-image: url('../images/icon-meta/large/default.png');
     background-repeat: no-repeat;
     background-size: contain;
   }
diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx
index d615c9d..7adfff9 100644
--- a/src/components/Icon.tsx
+++ b/src/components/Icon.tsx
@@ -18,7 +18,7 @@ export const Icon = React.forwardRef<HTMLDivElement, Props>((props, ref) => {
   const [name, setName] = useState(defaultName)
 
   const bgSize = size !== 'small' ? 'large' : 'medium'
-  const url = name && `https://wow.zamimg.com/images/wow/icons/${bgSize}/${name}.jpg`
+  const url = name && iconUrl(name, bgSize)
 
   const start = Date.now()
 
@@ -51,4 +51,11 @@ export const Icon = React.forwardRef<HTMLDivElement, Props>((props, ref) => {
       {children}
     </div>
   )
-})
\ No newline at end of file
+})
+
+const iconUrl = (name: string, size: string): string => {
+  if (name === NOT_FOUND_ICON) {
+    return require(`../images/icons/${size}/${name}.jpg`)
+  }
+  return `https://wow.zamimg.com/images/wow/icons/${size}/${name}.jpg`
+}
\ No newline at end of file
diff --git a/src/components/Talent.scss b/src/components/Talent.scss
index d94aa15..6f1a9f0 100644
--- a/src/components/Talent.scss
+++ b/src/components/Talent.scss
@@ -45,7 +45,7 @@
     bottom: -1px;
     left: -4px;
     border-radius: 6px;
-    background-image: url('../images/icons/large/default.png');
+    background-image: url('../images/icon-meta/large/default.png');
     background-size: 100%;
 
     &:after {
diff --git a/src/images/icons/large/default.png b/src/images/icon-meta/large/default.png
similarity index 100%
rename from src/images/icons/large/default.png
rename to src/images/icon-meta/large/default.png
diff --git a/src/images/icons/large/gold.png b/src/images/icon-meta/large/gold.png
similarity index 100%
rename from src/images/icons/large/gold.png
rename to src/images/icon-meta/large/gold.png
diff --git a/src/images/icons/medium/default.png b/src/images/icon-meta/medium/default.png
similarity index 100%
rename from src/images/icons/medium/default.png
rename to src/images/icon-meta/medium/default.png
diff --git a/src/images/icons/medium/gold.png b/src/images/icon-meta/medium/gold.png
similarity index 100%
rename from src/images/icons/medium/gold.png
rename to src/images/icon-meta/medium/gold.png
diff --git a/src/images/icons/large/inv_misc_questionmark.jpg b/src/images/icons/large/inv_misc_questionmark.jpg
new file mode 100644
index 0000000..5aadda3
Binary files /dev/null and b/src/images/icons/large/inv_misc_questionmark.jpg differ
diff --git a/src/images/icons/medium/inv_misc_questionmark.jpg b/src/images/icons/medium/inv_misc_questionmark.jpg
new file mode 100644
index 0000000..e2e8fe0
Binary files /dev/null and b/src/images/icons/medium/inv_misc_questionmark.jpg differ