diff --git a/src/FilterLists.Services/FilterList/Models/SyntaxSupportedSoftwareDto.cs b/src/FilterLists.Services/FilterList/Models/SyntaxSupportedSoftwareDto.cs
index 0c6cc4438..400e6288d 100644
--- a/src/FilterLists.Services/FilterList/Models/SyntaxSupportedSoftwareDto.cs
+++ b/src/FilterLists.Services/FilterList/Models/SyntaxSupportedSoftwareDto.cs
@@ -5,7 +5,6 @@ namespace FilterLists.Services.FilterList.Models
     [UsedImplicitly]
     public class SyntaxSupportedSoftwareDto
     {
-        public uint Id { get; set; }
         public string HomeUrl { get; set; }
         public string Name { get; set; }
     }
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IFilterListDetailsDto.ts b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IFilterListDetailsDto.ts
index 1f41ce79b..e3afa5d43 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IFilterListDetailsDto.ts
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IFilterListDetailsDto.ts
@@ -57,6 +57,5 @@ export interface IMaintainerAdditionalListDto {
 
 export interface ISyntaxSupportedSoftwareDto {
     homeUrl: string;
-    id: number;
     name: string;
 }
\ No newline at end of file
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx
index 41259e77d..045b5a662 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx
@@ -6,7 +6,6 @@ import { Languages } from "./Languages";
 import { License } from "./License";
 import { PublishedDate } from "./PublishedDate";
 import { RuleCount } from "./RuleCount";
-import { SoftwareIcons } from "../../SoftwareIcons";
 import { Syntax } from "./Syntax";
 import { Tags } from "./Tags";
 import { UpdatedDate } from "./UpdatedDate";
@@ -27,7 +26,6 @@ interface IProps {
 
 export const InfoCard = (props: IProps) => {
     return <div className="col-9">
-               <SoftwareIcons software={props.syntax.supportedSoftware} mdNone={true}/>
                <Tags tags={props.tags}/>
                <Description {...props} url={props.descriptionSourceUrl}/>
                <ul className="list-group list-group-flush">
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx
index a5abf538e..7546bd6a0 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx
@@ -6,7 +6,7 @@ import ReactTable from "react-table"
 import "react-table/react-table.css"
 import "./listsTable.css";
 import * as moment from "moment";
-import { SoftwareIcons } from "../SoftwareIcons";
+import { SoftwareIcon } from "./SoftwareIcon";
 import { getContrast } from "../../../../utils/GetContrast";
 import { DetailsExpander } from "../../components";
 
@@ -54,7 +54,7 @@ export const ListsTable = (props: IProps) => {
                                {props.software.map((s: any, i) => <option value={s.id} key={i}>{s.name}</option>)}
                            </select>,
                        sortable: false,
-                       Cell: (c: any) => <SoftwareIcons {...c}/>,
+                       Cell: (c: any) => c.value.map((s: number, i: any) => <SoftwareIcon id={s} key={i}/>),
                        width: 155,
                        headerClassName: "d-none d-md-block",
                        className: "d-none d-md-block",
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx
similarity index 100%
rename from src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/SoftwareIcon.tsx
rename to src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/SoftwareIcons.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/SoftwareIcons.tsx
deleted file mode 100644
index 79580c041..000000000
--- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/SoftwareIcons.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import * as React from "react";
-import { ISyntaxSupportedSoftwareDto } from "../detailsExpander/IFilterListDetailsDto";
-import { SoftwareIcon } from "./SoftwareIcon"
-
-interface IProps {
-    software: ISyntaxSupportedSoftwareDto[];
-    mdNone: boolean;
-}
-
-export const SoftwareIcons = (props: IProps) => {
-    return props.software
-               ? <div className={props.mdNone ? "d-md-none" : undefined}>
-                     {props.software.map(
-                         (s: ISyntaxSupportedSoftwareDto, i: any) => <SoftwareIcon id={s.id} key={i}/>)}
-                 </div>
-               : null;
-};
\ No newline at end of file
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/index.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/index.ts
deleted file mode 100644
index 9c8d9db62..000000000
--- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcons/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SoftwareIcons } from "./SoftwareIcons";
-
-export {
-    SoftwareIcons
-    };
\ No newline at end of file