diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web.V2/src/components/softwareIcon/SoftwareIcon.tsx
new file mode 100644
index 000000000..b0e799f4b
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/SoftwareIcon.tsx
@@ -0,0 +1,90 @@
+import * as React from 'react';
+
+import {
+    img01,
+    img02,
+    img03,
+    img04,
+    img05,
+    img06,
+    img07,
+    img08,
+    img10,
+    img11,
+    img12,
+    img13,
+    img14,
+    img15,
+    img16,
+    img17,
+    img18,
+    img19,
+    img20,
+    img21,
+    img22,
+    img23,
+    img24,
+    img25,
+    img26,
+    img27,
+    img28,
+    img29,
+    img30,
+    img31,
+    img32,
+    img33,
+    img34
+} from './imgs';
+
+interface Props {
+    id: number;
+};
+
+export const SoftwareIcon = (props: Props) =>
+    icons[props.id]
+        ? <img src={icons[props.id].image}
+            height="20"
+            alt={icons[props.id].imageTitle}
+            title={icons[props.id].imageTitle} />
+        : null;
+
+interface Icon {
+    image: any;
+    imageTitle: string;
+};
+
+const icons: { [id: number]: Icon; } = {
+    1: { image: img01, imageTitle: "uBlock Origin" },
+    2: { image: img02, imageTitle: "Adblock Plus" },
+    3: { image: img03, imageTitle: "AdGuard" },
+    4: { image: img04, imageTitle: "DNS66" },
+    5: { image: img05, imageTitle: "Nano Adblocker" },
+    6: { image: img06, imageTitle: "AdBlock" },
+    7: { image: img07, imageTitle: "AdAway" },
+    8: { image: img08, imageTitle: "Personal Blocklist" },
+    10: { image: img10, imageTitle: "Redirector" },
+    11: { image: img11, imageTitle: "Hosts File Editor" },
+    12: { image: img12, imageTitle: "Gas Mask" },
+    13: { image: img13, imageTitle: "MinerBlock" },
+    14: { image: img14, imageTitle: "Pi-hole" },
+    15: { image: img15, imageTitle: "uBlock" },
+    16: { image: img16, imageTitle: "Internet Explorer (TPL)" },
+    17: { image: img17, imageTitle: "Google Hit Hider by Domain" },
+    18: { image: img18, imageTitle: "FireHOL" },
+    19: { image: img19, imageTitle: "Samsung Knox" },
+    20: { image: img20, imageTitle: "Little Snitch" },
+    21: { image: img21, imageTitle: "Privoxy" },
+    22: { image: img22, imageTitle: "Diversion" },
+    23: { image: img23, imageTitle: "dnsmasq" },
+    24: { image: img24, imageTitle: "Slimjet" },
+    25: { image: img25, imageTitle: "uMatrix" },
+    26: { image: img26, imageTitle: "Blokada" },
+    27: { image: img27, imageTitle: "hostsmgr" },
+    28: { image: img28, imageTitle: "personalDNSfilter" },
+    29: { image: img29, imageTitle: "Unbound" },
+    30: { image: img30, imageTitle: "BIND" },
+    31: { image: img31, imageTitle: "AdGuard Home" },
+    32: { image: img32, imageTitle: "AdNauseam" },
+    33: { image: img33, imageTitle: "Legacy Unix derivatives" },
+    34: { image: img34, imageTitle: "Windows command line" },
+};
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/01-uBlock-Origin.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/01-uBlock-Origin.svg
new file mode 100644
index 000000000..03e7a9ebb
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/01-uBlock-Origin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="8.5 1 111.5 127" version="1"><g fill="maroon" stroke="#fff" stroke-linecap="round" stroke-width="2"><path stroke-linejoin="round" d="M448 669c-81-57-81-57-81-200 35 0 46 0 81-28m0 228c80-57 80-57 80-200-34 0-46 0-80-28" transform="matrix(-.69452 0 0 .5611 375 -247)"/></g><g stroke="#fff" transform="translate(-18 -17)"><ellipse cx="102" cy="81" fill="none" stroke-width="6" rx="12" ry="12" transform="matrix(1.33333 0 0 1.33333 -42 -31)"/><path fill="#fff" stroke="none" stroke-width="2" d="M82 81c0 11-5 16-16 16s-16-5-16-16V57h8v24c0 7 1 8 8 8s8-1 8-8V57h8z"/></g></svg>
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/02-Adblock-Plus.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/02-Adblock-Plus.svg
new file mode 100644
index 000000000..71ab1252f
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/02-Adblock-Plus.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="619.25" height="620.5"
+     xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" viewBox="0 0 619.25001 620.49998">
+  <defs>
+    <linearGradient osb:paint="solid">
+      <stop offset="0" stop-color="#fff" />
+    </linearGradient>
+  </defs>
+  <g>
+    <path fill="#fff" d="M44.45 196.24h525.28V422.5H44.45z" />
+    <path fill="#fff" stroke="#dadbdb" stroke-width="3"
+          d="M91.8 528.68l-90.3-90.3V182.1l90.32-90.3 90.3-90.32h255l90.32 90.32 90.3 90.3V438.4l-90.3 90.3L437.1 619h-255l-90.3-90.32zm416.26-20.6l82.2-82.2V194.62l-82.2-82.2-82.2-82.17H194.6l-82.18 82.2-82.16 82.17v231.25l82.17 82.2 82.2 82.18h231.24l82.2-82.18z" />
+    <path fill="#e00000" stroke="#cb0000" stroke-width="3.004"
+          d="M111.94 508.64l-81.77-81.56V193.33l81.77-81.56 81.78-81.56h231.82l82.4 82.2 82.4 82.18V425.85l-82.4 82.18-82.4 82.2H193.7l-81.76-81.58zm231.4-94.2c31.23-6.7 48.93-26.18 51.1-56.18 1.5-20.3-4.52-37.73-16.16-46.9-5.57-4.4-17.6-9.9-21.63-9.9-3.28 0-3.16-2.23.18-3.06 10.03-2.5 21.35-14.97 25.48-28 3.1-9.74 3.4-28 .67-37.2-2.66-8.93-10.25-19.1-18.23-24.46-14.4-9.64-31.54-12.17-83-12.24l-32.26-.04v220.62l42.3-.3c33.1-.26 44.3-.77 51.57-2.33zm-50-64.74v-28.24h16.7c18.67 0 27.14 1.8 33.4 7.05 6.02 5.06 7.95 9.92 7.96 20.07 0 13-3.66 19.7-13.55 24.76-7.03 3.6-8.16 3.77-25.93 4.18l-18.58.44V349.7zm0-88.86V236.2l16.6.46c18.4.5 24.16 2.27 29.06 8.96 3.94 5.38 3.73 22.13-.36 28.7-4.98 8-10.8 10.1-29.32 10.66l-15.98.48v-24.62zm-192.5 134.68c2.58-11.5 5.24-23.05 5.9-25.62l1.22-4.7h57.35l2.74 12.2c1.5 6.7 4.14 18.23 5.85 25.62l3.1 13.44h23.22c18.02 0 23.1-.35 22.67-1.56-.3-.86-13.72-50.08-29.84-109.38l-29.3-107.8h-52.8l-3.4 12.8c-4.82 18.05-54.73 201.1-55.57 203.75-.64 2.03.95 2.2 21.72 2.2h22.4l4.7-20.95zm16.3-72.5c1.8-5.94 8.9-37.52 13.74-60.94 3.24-15.7 5.72-25.24 6.2-23.75.42 1.38 3.04 13.2 5.8 26.25 2.78 13.07 6.96 32.05 9.3 42.2l4.24 18.43h-19.97c-18.44 0-19.93-.16-19.32-2.18zm350.4 56.56V342.7h17.43c21.16 0 33.8-2.2 46.23-8.1 17.52-8.3 31.24-26.2 35.42-46.27 2.25-10.78 1.95-33.3-.57-43.12-6.4-24.85-22.82-40.23-48.65-45.5-7.68-1.58-18.28-2-51.7-2h-42.03v218.76h43.86v-36.88zm0-109.37v-32.5h16.68c19.82 0 27.7 1.87 33.87 8.02 5.55 5.55 7.54 13.1 6.83 26.04-1.3 23.42-11.5 30.95-41.96 30.95h-15.44v-32.5z" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/03-AdGuard.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/03-AdGuard.svg
new file mode 100644
index 000000000..b9cb8ebd4
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/03-AdGuard.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 25.3 25.3" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <path fill="#68bc71" d="M12.6512986,0 C8.69689131,0 3.92688756,0.929914894 3.87976037e-06,2.9767234 C3.87976037e-06,7.3972766 -0.0542007083,18.4102128 12.6512986,25.935 C25.3570787,18.4102128 25.3031549,7.3972766 25.3031549,2.9767234 C21.3759904,0.929914894 16.6059867,0 12.6512986,0 L12.6512986,0 Z"/>
+    <path fill="#67b279" d="M12.6383754,25.9273425 C-0.0541639467,18.4027433 3.87976037e-06,7.39577733 3.87976037e-06,2.9767234 C3.9226108,0.932144068 8.68650231,0.00202686119 12.6383754,3.30925217e-06 L12.6383754,25.9273451 Z"/>
+    <path fill="#fff" d="M12.1898292,17.3046764 L19.8402793,6.99357039 C19.2796699,6.54422358 18.7879353,6.86136327 18.517241,7.10689078 L18.5073636,7.10767773 L12.1284291,13.7434783 L9.72501633,10.8511853 C8.57843655,9.52649092 7.01967536,10.536931 6.65554618,10.8039684 L12.1898292,17.3046764"/>
+</svg>
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/04-DNS66.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/04-DNS66.png
new file mode 100644
index 000000000..a32dc2c2f
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/04-DNS66.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/05-Nano-Adblocker.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/05-Nano-Adblocker.png
new file mode 100644
index 000000000..cd2b2a06d
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/05-Nano-Adblocker.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/06-AdBlock.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/06-AdBlock.png
new file mode 100644
index 000000000..84b1d1195
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/06-AdBlock.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/07-AdAway.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/07-AdAway.png
new file mode 100644
index 000000000..0826b7478
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/07-AdAway.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/08-Personal-Blocklist.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/08-Personal-Blocklist.png
new file mode 100644
index 000000000..9b6888a1b
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/08-Personal-Blocklist.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/10-Redirector.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/10-Redirector.png
new file mode 100644
index 000000000..33fa33b01
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/10-Redirector.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/11-Hosts-File-Editor.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/11-Hosts-File-Editor.png
new file mode 100644
index 000000000..e758cf5da
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/11-Hosts-File-Editor.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/12-Gas-Mask.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/12-Gas-Mask.png
new file mode 100644
index 000000000..062dcbd76
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/12-Gas-Mask.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/13-MinerBlock.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/13-MinerBlock.svg
new file mode 100644
index 000000000..a2c2b0064
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/13-MinerBlock.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+     width="128.000000pt" height="128.000000pt" viewBox="0 0 128.000000 128.000000"
+     preserveAspectRatio="xMidYMid meet">
+  <metadata>
+    Created by potrace 1.15, written by Peter Selinger 2001-2017
+  </metadata>
+  <g transform="translate(0.000000,128.000000) scale(0.100000,-0.100000)"
+     fill="#bf3d27" stroke="none">
+    <path
+      d="M500 1204 c-321 -86 -507 -413 -413 -727 43 -146 165 -292 295 -355
+327 -159 712 7 817 352 25 82 28 233 6 316 -53 199 -220 364 -420 415 -74 19
+-213 18 -285 -1z m242 -85 c222 -46 388 -249 388 -473 0 -138 -46 -251 -140
+-346 -242 -243 -640 -175 -786 135 -171 361 147 766 538 684z" />
+    <path
+      d="M507 1060 c-157 -50 -270 -183 -299 -350 -43 -250 146 -490 400 -507 166 -12 309 57 403 194 136 197 75 488 -129 617 -104 66 -256 84 -375 46z m133 -190 c0 26z"
+      fill="white" />
+    <path
+      d="M510 1072 c-78 -26 -116 -48 -167 -95 -117 -107 -171 -263 -144 -412
+42 -230 246 -390 475 -372 188 14 345 136 397 307 27 91 24 228 -9 310 -44
+111 -143 209 -252 251 -78 31 -226 36 -300 11z m86 -264 c-20 -29 -36 -60 -36
+-68 0 -9 19 -35 43 -58 l44 -43 46 50 c26 28 47 53 47 56 0 3 -18 33 -40 66
+-23 32 -37 59 -33 59 5 0 32 -16 61 -36 42 -27 59 -34 81 -29 31 7 43 -8 34
+-43 -3 -13 8 -39 31 -73 20 -30 36 -57 36 -62 0 -4 -27 10 -59 33 -33 22 -63
+40 -66 40 -11 0 -95 -83 -95 -94 0 -6 34 -45 76 -87 67 -67 73 -77 59 -89 -14
+-12 -26 -3 -96 66 l-79 79 -78 -78 c-79 -79 -98 -89 -109 -61 -4 11 19 40 73
+95 l78 79 -38 39 c-21 22 -47 41 -57 44 -11 3 -40 -10 -74 -35 -31 -22 -58
+-38 -60 -36 -2 2 13 30 35 62 30 47 37 64 30 81 -11 30 5 45 40 38 21 -4 41 4
+81 31 29 19 55 34 57 32 2 -3 -12 -28 -32 -58z" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/14-Pi-hole.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/14-Pi-hole.svg
new file mode 100644
index 000000000..3d3bd57f7
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/14-Pi-hole.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 88.32 129.93" preserveAspectRatio="xMinYMid"><defs><style>.cls-1{fill:url(#New_Gradient_Swatch_1);}.cls-2{fill:#980200;}.cls-3{fill:red;}</style><linearGradient id="New_Gradient_Swatch_1" x1="2.71" y1="20.04" x2="69.77" y2="20.04" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#12b212"/><stop offset="1" stop-color="lime"/></linearGradient></defs><title>NewVortex</title><g id="Layer_2" data-name="Layer 2"><g id="RedBerry"><path id="Leaf_Path" data-name="Leaf Path" class="cls-1" d="M36.56,39.93m0,0C20.34,38.2,4,25.94,2.71,0,27.88,0,41.34,14.9,42.64,38.51c4.76-28.32,27.07-25,27.07-25,1.06,16.05-12.12,25.78-27.07,26.59C38.44,31.25,13.28,9.54,13.28,9.54a.07.07,0,0,0-.11.08S37.45,30.77,36.56,39.93"/><path id="LeftBerry" class="cls-2" d="M44.16,129.93c-1.57-.09-16.22-.65-17.11-17.11-.72-10,7.18-17.37,7.18-27.08C32.44,61.53,0,64.53,0,85.74H0A19.94,19.94,0,0,0,5.83,99.88L30,124.06a19.94,19.94,0,0,0,14.14,5.83"/><path id="BottomBerry" class="cls-3" d="M88.32,85.75c-.09,1.57-.65,16.22-17.11,17.11-10,.72-17.38-7.18-27.08-7.18-24.21,1.79-21.21,34.22,0,34.22h0a19.94,19.94,0,0,0,14.14-5.83L82.46,99.9a19.94,19.94,0,0,0,5.83-14.14"/><path id="RightBerry" class="cls-2" d="M44.16,41.59c1.57.09,16.22.65,17.11,17.11.72,10-7.18,17.37-7.18,27.08,1.79,24.21,34.22,21.21,34.22,0h0a19.94,19.94,0,0,0-5.83-14.14L58.3,47.45a19.94,19.94,0,0,0-14.14-5.83"/><path id="TopBerry" class="cls-3" d="M.08,85.75c.09-1.57.65-16.22,17.11-17.11,10-.72,17.38,7.18,27.08,7.18C68.48,74,65.48,41.6,44.27,41.6h0a19.94,19.94,0,0,0-14.14,5.83L5.94,71.61A19.94,19.94,0,0,0,.11,85.75"/></g></g></svg>
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/15-uBlock.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/15-uBlock.svg
new file mode 100644
index 000000000..6488ebb04
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/15-uBlock.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <linearGradient id="a">
+      <stop offset="0" /><stop offset="1" stop-opacity="0" />
+    </linearGradient>
+    <radialGradient cx="82.145" cy="81.055" r="22.573" xlink:href="#a" fx="82.145" fy="81.055"
+                    gradientTransform="matrix(1 0 0 1.258 0 -20.947)" gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g stroke="#fff">
+    <path fill="#800000" stroke-width="3" d="M1.5 36.78v54.44l35.28 35.28h54.44l35.28-35.28V36.78L91.22 1.5H36.78z" />
+    <g fill="#fff" stroke-width="2" style="text-align:center;line-height:125%;-inkscape-font-specification:Ubuntu"
+       font-size="100.219" letter-spacing="0" word-spacing="0" text-anchor="middle" font-family="Ubuntu">
+      <path
+        d="M83.97 90.23c-2.03.56-4.7 1.16-8.05 1.8-3.33.62-7.2.94-11.57.94-3.8 0-7-.62-9.6-1.85-2.6-1.23-4.7-2.97-6.3-5.22-1.58-2.25-2.72-4.9-3.42-7.96-.7-3.05-1.05-6.44-1.05-10.17V37h8.85v28.66c0 6.68.96 11.46 2.86 14.34 1.9 2.88 5.1 4.32 9.6 4.32.96 0 1.94-.03 2.96-.1 1-.07 1.97-.16 2.85-.27.9-.1 1.7-.2 2.44-.3.73-.12 1.26-.24 1.57-.38V37h8.87z"
+        style="-inkscape-font-specification:Ubuntu" />
+    </g>
+  </g>
+</svg> 
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/16-Internet-Explorer-TPL.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/16-Internet-Explorer-TPL.svg
new file mode 100644
index 000000000..69780795f
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/16-Internet-Explorer-TPL.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 256 252" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M256 131.593c0-20.238-5.232-39.25-14.408-55.772 39.11-88.514-41.906-75.55-46.417-74.667-17.164 3.359-33.044 8.751-47.691 15.587-2.16-.122-4.334-.189-6.523-.189-54.665 0-100.423 38.128-112.134 89.241C57.639 73.47 77.802 60.428 89.877 55.21a274.318 274.318 0 0 0-5.67 5.218c-.618.583-1.213 1.175-1.822 1.761a284.903 284.903 0 0 0-3.638 3.545c-.71.707-1.4 1.42-2.1 2.133a307.038 307.038 0 0 0-3.145 3.235c-.734.77-1.45 1.541-2.17 2.312a286.466 286.466 0 0 0-2.865 3.104c-.73.807-1.45 1.613-2.168 2.422a319.307 319.307 0 0 0-4.796 5.52 331.84 331.84 0 0 0-2.45 2.927c-.714.864-1.426 1.726-2.125 2.589a341.74 341.74 0 0 0-2.234 2.794c-.716.902-1.431 1.802-2.13 2.703-.666.857-1.312 1.711-1.963 2.566-.735.967-1.476 1.933-2.191 2.894-.512.688-1.003 1.37-1.506 2.055a356.843 356.843 0 0 0-12.449 18.128c-.01.014-.02.028-.027.043a367.82 367.82 0 0 0-2.875 4.557c-.05.081-.102.163-.152.246a361.864 361.864 0 0 0-2.719 4.458l-.094.155a369.532 369.532 0 0 0-6.537 11.338C11.69 160.689 6.646 173.807 6.428 174.586c-32.718 116.97 69.396 67.575 83.645 60.201 15.343 7.58 32.615 11.846 50.888 11.846 50.021 0 92.58-31.93 108.422-76.519h-60.446c-8.944 15.11-26.163 25.345-45.945 25.345-28.984 0-52.479-21.96-52.479-49.05h164.54c.624-4.851.947-9.796.947-14.816zM234.51 18.386c9.907 6.687 17.852 17.187 4.207 52.55-13.088-21.048-32.778-37.559-56.181-46.634 10.646-5.141 37.01-16.016 51.974-5.916zM23.98 234.552c-8.07-8.275-9.496-28.429 8.31-65.154 8.985 25.835 26.916 47.482 50.092 61.22-11.526 6.345-42.126 20.629-58.402 3.934zm66.279-119.601c.92-26.329 23.834-47.41 51.987-47.41 28.153 0 51.068 21.081 51.988 47.41H90.259z" fill="#1EBBEE"/></svg>
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/17-Google-Hit-Hider-by-Domain.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/17-Google-Hit-Hider-by-Domain.png
new file mode 100644
index 000000000..ca830def3
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/17-Google-Hit-Hider-by-Domain.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/18-FireHOL.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/18-FireHOL.png
new file mode 100644
index 000000000..5db30bb01
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/18-FireHOL.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/19-Samsung-Knox.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/19-Samsung-Knox.png
new file mode 100644
index 000000000..bdb2f96a1
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/19-Samsung-Knox.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/20-Little-Snitch.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/20-Little-Snitch.png
new file mode 100644
index 000000000..1562eec0a
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/20-Little-Snitch.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/21-Privoxy.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/21-Privoxy.png
new file mode 100644
index 000000000..0ba2b59a1
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/21-Privoxy.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/22-Diversion.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/22-Diversion.png
new file mode 100644
index 000000000..511c8c8cd
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/22-Diversion.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/23-dnsmasq.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/23-dnsmasq.png
new file mode 100644
index 000000000..99e986ba9
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/23-dnsmasq.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/24-Slimjet.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/24-Slimjet.png
new file mode 100644
index 000000000..00f899268
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/24-Slimjet.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/25-uMatrix.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/25-uMatrix.png
new file mode 100644
index 000000000..82663fc9e
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/25-uMatrix.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/26-Blokada.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/26-Blokada.png
new file mode 100644
index 000000000..cfd376114
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/26-Blokada.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/27-hostsmgr.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/27-hostsmgr.png
new file mode 100644
index 000000000..349d5b17e
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/27-hostsmgr.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/28-personalDNSfilter.svg b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/28-personalDNSfilter.svg
new file mode 100644
index 000000000..90fd8f734
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/28-personalDNSfilter.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="enable-background:new 0 0 56 56;" xml:space="preserve" width="688" height="880"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none" class="" style=""/>
+<style type="text/css">
+	.st0{fill:#0097A7;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#00BCD4;}
+</style>
+
+<g class="currentLayer" style=""><title>Layer 1</title><g id="Ebene_2" class="">
+	<g id="Ebene_3">
+		<path id="XMLID_16_" class="st0" d="M344.1184284363063,799.570125922042 V87.96842249322498 c0,0 162.09059592452832,10.99605281236583 282.4548998288811,50.26766999938664 c0,0 -1.60485738539137,127.24003968594741 -1.60485738539137,252.90921468441405 c0,175.9368449978532 -138.01773514365777,364.44060749555314 -280.85004244348966,398.99963062013137 M687.5579089100594,92.6810165556675 c-146.04202207061462,-48.6968053119058 -332.2054787760135,-62.834587499233294 -343.439480473753,-62.834587499233294 c-11.23400169773959,0 -194.1877436323557,14.13778218732749 -343.439480473753,62.834587499233294 c0,0 0,153.9447393731216 0,306.3186140587623 C0.6789479625532715,612.637228111823 172.39868819942984,838.8417431090629 344.1184284363063,879.6842249835645 c171.7197402368765,-42.41334656198248 343.439480473753,-267.0469968717415 343.439480473753,-479.11372968165387 C687.5579089100594,248.1966206162699 687.5579089100594,92.6810165556675 687.5579089100594,92.6810165556675 "/>
+		<polygon id="XMLID_15_" class="st1" points="623.3636474609375,600.070322238108 334.4892578125,843.5543626155804 339.30389404296875,45.555075835946354 631.387939453125,109.9605252590718 "/>
+	</g>
+	<g id="Ebene_2_1_">
+		<path id="XMLID_12_" class="st2" d="M344.1184284363063,783.8614790472337 V53.40939936864668 c0,0 157.27602376835424,21.99210562473165 280.85004244348966,62.834587499233294 c0,0 1.60485738539137,130.3817690609091 1.60485738539137,259.19267343433734 c0,175.9368449978532 -138.01773514365777,388.0035778077656 -280.85004244348966,422.56260093234386 M687.5579089100594,75.40150499337834 C539.9110294540535,26.704699681472533 355.3524301340459,-5.701622285414487e-9 344.1184284363063,-5.701622285414487e-9 S149.93068480395064,25.133834993991698 0.6789479625532715,75.40150499337834 c0,0 0,153.9447393731216 0,306.3186140587623 c0,212.06673280991237 170.11488285148516,438.2712478071522 343.439480473753,479.11372968165387 c171.7197402368765,-42.41334656198248 343.439480473753,-267.0469968717415 343.439480473753,-479.11372968165387 C687.5579089100594,227.77537967901907 687.5579089100594,75.40150499337834 687.5579089100594,75.40150499337834 "/>
+	</g>
+	<g id="Ebene_1_2_">
+		<path id="XMLID_7_" class="st2" d="M559.1693180787498,400.5704953019106 c0,-114.67312218610077 -94.68658573809081,-210.49586812243152 -215.0508896424435,-210.49586812243152 v42.41334656198248 c17.653431239305068,25.13383499969332 30.492290322436016,51.83853468686746 40.12143463478424,83.25582843648412 H344.1184284363063 v40.84248187450164 h49.75057894713245 c1.60485738539137,14.13778218732749 3.2097147707827394,26.704699687174156 3.2097147707827394,40.84248187450164 s-1.60485738539137,28.27556437465498 -3.2097147707827394,40.84248187450164 H344.1184284363063 v40.84248187450164 h40.12143463478424 c-9.629144312348222,29.84642906213581 -24.072860780870542,58.1219934367908 -40.12143463478424,83.25582843648412 v42.41334656198248 C461.2730175698763,607.9246340493805 559.1693180787498,515.2436174880113 559.1693180787498,400.5704953019106 zM509.4187391316173,356.58628405244735 c3.2097147707827394,14.13778218732749 4.814572156174111,26.704699687174156 4.814572156174111,40.84248187450164 s-1.60485738539137,28.27556437465498 -4.814572156174111,40.84248187450164 h-73.82343972800298 c1.60485738539137,-14.13778218732749 3.2097147707827394,-26.704699687174156 3.2097147707827394,-40.84248187450164 s-1.60485738539137,-28.27556437465498 -3.2097147707827394,-40.84248187450164 H509.4187391316173 L509.4187391316173,356.58628405244735 zM493.3701652777037,315.7438021779457 h-62.58943803026341 c-8.024286926956847,-26.704699687174156 -16.048573853913695,-51.83853468686746 -28.88743293704465,-73.83064031159911 C438.8050141743971,254.4800793661932 470.9021618822245,281.1847790533673 493.3701652777037,315.7438021779457 zM398.6835795396129,557.6569640499938 c12.838859083130957,-23.562970312212485 22.46800339547917,-48.6968053119058 28.88743293704465,-75.40150499907996 h62.58943803026341 C470.9021618822245,518.385346862973 438.8050141743971,545.0900465501472 398.6835795396129,557.6569640499938 z"/>
+		<path id="XMLID_2_" class="st1" d="M344.1184284363063,607.9246340493805 V565.511287487398 c-17.653431239305068,-25.13383499969332 -30.492290322436016,-51.83853468686746 -40.12143463478424,-83.25582843648412 H344.1184284363063 v-40.84248187450164 h-49.75057894713245 c-1.60485738539137,-14.13778218732749 -3.2097147707827394,-26.704699687174156 -3.2097147707827394,-40.84248187450164 s1.60485738539137,-28.27556437465498 3.2097147707827394,-40.84248187450164 H344.1184284363063 v-40.84248187450164 h-40.12143463478424 c9.629144312348222,-29.84642906213581 24.072860780870542,-58.1219934367908 40.12143463478424,-83.25582843648412 v-42.41334656198248 c-117.15458913356997,0 -215.0508896424435,92.68101656136912 -215.0508896424435,210.49586812243152 C129.0675387938628,515.2436174880113 226.96383930273635,607.9246340493805 344.1184284363063,607.9246340493805 zM251.0367000836069,356.58628405244735 c-1.60485738539137,14.13778218732749 -3.2097147707827394,26.704699687174156 -3.2097147707827394,40.84248187450164 s1.60485738539137,28.27556437465498 3.2097147707827394,40.84248187450164 h-72.21858234261163 c-3.2097147707827394,-14.13778218732749 -4.814572156174111,-26.704699687174156 -4.814572156174111,-40.84248187450164 s1.60485738539137,-28.27556437465498 4.814572156174111,-40.84248187450164 H251.0367000836069 L251.0367000836069,356.58628405244735 zM289.5532773329998,241.91316186634654 c-12.838859083130957,23.562970312212485 -22.46800339547917,48.6968053119058 -28.88743293704465,73.83064031159911 h-62.58943803026341 C217.33469499038816,281.1847790533673 249.43184269821558,254.4800793661932 289.5532773329998,241.91316186634654 zM194.86669159490896,482.25545905091394 h62.58943803026341 c8.024286926956847,26.704699687174156 16.048573853913695,51.83853468686746 28.88743293704465,75.40150499907996 C249.43184269821558,545.0900465501472 217.33469499038816,518.385346862973 194.86669159490896,482.25545905091394 z"/>
+	</g>
+</g></g></svg>
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/29-Unbound.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/29-Unbound.png
new file mode 100644
index 000000000..e6100dd8a
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/29-Unbound.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/30-BIND.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/30-BIND.png
new file mode 100644
index 000000000..74723afaf
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/30-BIND.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/31-AdGuard-Home.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/31-AdGuard-Home.png
new file mode 100644
index 000000000..e217b6879
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/31-AdGuard-Home.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/32-AdNauseam.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/32-AdNauseam.png
new file mode 100644
index 000000000..773f3c556
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/32-AdNauseam.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/33-Legacy-Unix-Derivatives.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/33-Legacy-Unix-Derivatives.png
new file mode 100644
index 000000000..617ecf5bd
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/33-Legacy-Unix-Derivatives.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/34-Windows-command-line.png b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/34-Windows-command-line.png
new file mode 100644
index 000000000..0741aa5b9
Binary files /dev/null and b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/34-Windows-command-line.png differ
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/imgs.d.ts b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/imgs.d.ts
new file mode 100644
index 000000000..1090848f7
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/imgs.d.ts
@@ -0,0 +1,9 @@
+declare module "*.svg" {
+    const content: any;
+    export default content;
+}
+
+declare module "*.png" {
+    const content: any;
+    export default content;
+}
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/index.ts
new file mode 100644
index 000000000..ecb632bbf
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/imgs/index.ts
@@ -0,0 +1,69 @@
+import img01 from './01-uBlock-Origin.svg';
+import img02 from './02-Adblock-Plus.svg';
+import img03 from './03-AdGuard.svg';
+import img04 from './04-DNS66.png';
+import img05 from './05-Nano-Adblocker.png';
+import img06 from './06-AdBlock.png';
+import img07 from './07-AdAway.png';
+import img08 from './08-Personal-Blocklist.png';
+import img10 from './10-Redirector.png';
+import img11 from './11-Hosts-File-Editor.png';
+import img12 from './12-Gas-Mask.png';
+import img13 from './13-MinerBlock.svg';
+import img14 from './14-Pi-hole.svg';
+import img15 from './15-uBlock.svg';
+import img16 from './16-Internet-Explorer-TPL.svg';
+import img17 from './17-Google-Hit-Hider-by-Domain.png';
+import img18 from './18-FireHOL.png';
+import img19 from './19-Samsung-Knox.png';
+import img20 from './20-Little-Snitch.png';
+import img21 from './21-Privoxy.png';
+import img22 from './22-Diversion.png';
+import img23 from './23-dnsmasq.png';
+import img24 from './24-Slimjet.png';
+import img25 from './25-uMatrix.png';
+import img26 from './26-Blokada.png';
+import img27 from './27-hostsmgr.png';
+import img28 from './28-personalDNSfilter.svg';
+import img29 from './29-Unbound.png';
+import img30 from './30-BIND.png';
+import img31 from './31-AdGuard-Home.png';
+import img32 from './32-AdNauseam.png';
+import img33 from './33-Legacy-Unix-Derivatives.png';
+import img34 from './34-Windows-command-line.png';
+
+export {
+    img01,
+    img02,
+    img03,
+    img04,
+    img05,
+    img06,
+    img07,
+    img08,
+    img10,
+    img11,
+    img12,
+    img13,
+    img14,
+    img15,
+    img16,
+    img17,
+    img18,
+    img19,
+    img20,
+    img21,
+    img22,
+    img23,
+    img24,
+    img25,
+    img26,
+    img27,
+    img28,
+    img29,
+    img30,
+    img31,
+    img32,
+    img33,
+    img34
+};
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/softwareIcon/index.ts b/src/FilterLists.Web.V2/src/components/softwareIcon/index.ts
new file mode 100644
index 000000000..1947f1089
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/softwareIcon/index.ts
@@ -0,0 +1,3 @@
+import { SoftwareIcon } from './SoftwareIcon';
+
+export { SoftwareIcon };
\ No newline at end of file