diff --git a/src/components/Person.js b/src/components/Person.js
index 7276d23a..c84f3808 100644
--- a/src/components/Person.js
+++ b/src/components/Person.js
@@ -2,13 +2,8 @@ import React from 'react';
 import { name } from 'country-emoji';
 import styled from 'styled-components';
 import { Tag, Tags } from './Topics';
-import iphone from '../images/iphone.png';
-import android from '../images/android.png';
-import windows from '../images/windows.svg';
-import apple from '../images/apple.svg';
-import linux from '../images/linux.svg';
+import * as icons from '../util/icons';
 
-const icons = { iphone, android, windows, apple, linux };
 export default function Person({ person, currentTag }) {
   const url = new URL(person.url);
   const img = `https://logo.clearbit.com/${url.host}`;
diff --git a/src/components/Topics.js b/src/components/Topics.js
index c549bc01..57cac06b 100644
--- a/src/components/Topics.js
+++ b/src/components/Topics.js
@@ -1,6 +1,7 @@
 import React, { useContext } from 'react';
 import styled from 'styled-components';
 import FilterContext from '../context/FilterContext';
+import * as icons from '../util/icons';
 
 export default function Topics() {
   const { countries, tags, devices, currentTag, setCurrentTag } = useContext(
@@ -63,7 +64,7 @@ export default function Topics() {
             checked={tag.name === currentTag}
             onChange={e => setCurrentTag(e.currentTarget.value)}
           />
-          {tag.name}
+          <img height="20px" src={icons[tag.name]} alt={tag.name} />
           <TagCount>{tag.count}</TagCount>
         </Tag>
       ))}
diff --git a/src/util/icons.js b/src/util/icons.js
index e69de29b..aa9584be 100644
--- a/src/util/icons.js
+++ b/src/util/icons.js
@@ -0,0 +1,7 @@
+import iphone from '../images/iphone.png';
+import android from '../images/android.png';
+import windows from '../images/windows.svg';
+import apple from '../images/apple.svg';
+import linux from '../images/linux.svg';
+
+export { iphone, android, windows, apple, linux };