From 01a34f3858100154d2d3afeffae545397854a252 Mon Sep 17 00:00:00 2001
From: Oksamies <asko.soisalo@gmail.com>
Date: Tue, 2 Jul 2024 23:13:23 +0300
Subject: [PATCH] Remove Pro Fontawesome

---
 .../app/(navigation)/DevelopersDropDown.tsx   |  2 +-
 .../app/(navigation)/HeaderUserNav.tsx        |  4 +--
 .../app/(navigation)/Navigation.tsx           |  2 +-
 .../app/(navigation)/UserActions.tsx          |  2 +-
 .../app/(navigation)/UserDropDown.tsx         |  2 +-
 .../@community/@communityCard/page.tsx        |  6 ++--
 .../@packageCard/@packageManagement/page.tsx  |  2 +-
 .../[package]/(pkg)/@packageCard/layout.tsx   |  6 ++--
 .../@packageDependencyList/layout.tsx         |  4 +--
 .../@packageDetail/@packageTagList/page.tsx   | 11 ++++----
 .../@packageTeamMemberList/page.tsx           |  2 +-
 .../[package]/(pkg)/@packageDetail/layout.tsx |  2 +-
 .../@packageTabs/@packageVersions/page.tsx    |  2 +-
 .../[package]/(pkg)/@packageTabs/layout.tsx   |  6 ++--
 .../app/communities/@communityList/page.tsx   |  2 +-
 .../app/communities/@searchAndOrder/page.tsx  |  2 +-
 .../manifest-validator/@validator/page.tsx    |  2 +-
 .../teams/[team]/@settingsContent/layout.tsx  |  2 +-
 .../members/TeamMemberList.tsx                |  2 +-
 .../[team]/@settingsContent/members/page.tsx  |  2 +-
 .../service-accounts/page.tsx                 |  2 +-
 .../[team]/@settingsContent/settings/page.tsx |  9 ++----
 apps/cyberstorm-nextjs/app/teams/layout.tsx   |  2 +-
 apps/cyberstorm-remix/app/c/community.tsx     |  6 ++--
 .../PackageSearch/PackageOrder.tsx            |  2 +-
 .../PackageSearch/PackageSearch.tsx           |  2 +-
 .../app/communities/communities.tsx           |  2 +-
 .../app/namespace/namespace.tsx               |  6 ++--
 .../components/Dependencies/Dependencies.tsx  |  4 +--
 .../app/p/components/TagList/TagList.tsx      | 11 ++++----
 .../p/components/TeamMembers/TeamMembers.tsx  |  2 +-
 .../cyberstorm-remix/app/p/packageListing.tsx |  2 +-
 .../app/p/tabs/Versions/Versions.tsx          |  2 +-
 .../app/settings/teams/Teams.tsx              |  2 +-
 .../teams/team/tabs/Members/Members.tsx       |  2 +-
 .../team/tabs/Members/TeamMemberList.tsx      |  2 +-
 .../tabs/ServiceAccounts/ServiceAccounts.tsx  |  2 +-
 .../teams/team/tabs/Settings/Settings.tsx     |  9 ++----
 .../app/settings/teams/team/teamSettings.tsx  |  2 +-
 .../navigation/DevelopersDropDown.tsx         |  2 +-
 .../cyberstorm/navigation/HeaderUserNav.tsx   |  4 +--
 .../cyberstorm/navigation/Navigation.tsx      |  2 +-
 .../cyberstorm/navigation/UserActions.tsx     |  2 +-
 .../cyberstorm/navigation/UserDropDown.tsx    |  2 +-
 .../stories/components/Alert.stories.tsx      |  4 +--
 .../stories/components/NewTabs.stories.tsx    |  2 +-
 .../stories/components/Tag.stories.tsx        |  2 +-
 packages/cyberstorm-forms/package.json        |  1 -
 .../src/components/FormSelect.tsx             |  2 +-
 .../src/forms/AddServiceAccountForm.tsx       |  2 +-
 .../src/forms/DeleteAccountForm.tsx           |  2 +-
 .../src/forms/PackageEditForm.tsx             |  2 +-
 .../src/forms/RemoveServiceAccountForm.tsx    |  2 +-
 packages/cyberstorm/package.json              |  4 ---
 .../components/AdContainer/AdContainer.tsx    |  2 +-
 .../src/components/Avatar/AvatarButton.tsx    |  2 +-
 .../components/BreadCrumbs/BreadCrumbs.tsx    |  2 +-
 .../src/components/CopyButton/CopyButton.tsx  |  2 +-
 .../src/components/Dialog/Dialog.tsx          |  4 +--
 .../src/components/DropDown/DropDownLink.tsx  |  4 +--
 .../src/components/Footer/Footer.tsx          |  6 ++--
 .../components/Header/DevelopersDropDown.tsx  |  2 +-
 .../src/components/Header/Header.tsx          |  4 +--
 .../src/components/Header/HeaderUserNav.tsx   |  2 +-
 .../src/components/Header/UserDropDown.tsx    |  2 +-
 .../ImageWithFallback/ImageWithFallback.tsx   |  4 +--
 .../CommunityProfileLayout.tsx                |  9 ++++--
 .../ManifestValidatorLayout.tsx               |  2 +-
 .../PackageFormatDocsLayout.tsx               |  2 +-
 .../PackageDependencyList.tsx                 |  3 +-
 .../PackageDetailLayout.tsx                   | 12 ++++----
 .../PackageManagementForm.tsx                 |  2 +-
 .../PackageTagList/PackageTagList.tsx         | 11 ++++----
 .../PackageTeamMemberList.tsx                 |  7 +++--
 .../PackageVersions/PackageVersions.tsx       |  2 +-
 .../Layout/Settings/SettingsLayout.tsx        |  2 +-
 .../TeamLeaveAndDisband.tsx                   |  9 ++----
 .../TeamMembers/TeamMemberList.tsx            |  2 +-
 .../TeamSettings/TeamMembers/TeamMembers.tsx  |  2 +-
 .../TeamServiceAccounts.tsx                   |  2 +-
 .../Teams/TeamSettings/TeamSettingsLayout.tsx |  2 +-
 .../components/Layout/Teams/TeamsLayout.tsx   |  2 +-
 .../cyberstorm/src/components/Link/Link.tsx   |  4 +--
 .../MultiSelectSearch/MultiSelectSearch.tsx   |  2 +-
 .../components/PackageCard/PackageCard.tsx    |  6 ++--
 .../components/PackageList/PackageOrder.tsx   |  4 +--
 .../src/components/Select/Select.tsx          |  2 +-
 .../components/SelectSearch/SelectSearch.tsx  |  2 +-
 .../cyberstorm/src/components/Table/Table.tsx |  6 +++-
 .../src/components/TextInput/TextInput.tsx    |  2 +-
 .../cyberstorm/src/components/Toast/Toast.tsx | 10 +++----
 yarn.lock                                     | 28 -------------------
 92 files changed, 154 insertions(+), 190 deletions(-)

diff --git a/apps/cyberstorm-nextjs/app/(navigation)/DevelopersDropDown.tsx b/apps/cyberstorm-nextjs/app/(navigation)/DevelopersDropDown.tsx
index 1d0bb08d6..11833e533 100644
--- a/apps/cyberstorm-nextjs/app/(navigation)/DevelopersDropDown.tsx
+++ b/apps/cyberstorm-nextjs/app/(navigation)/DevelopersDropDown.tsx
@@ -1,4 +1,4 @@
-import { faCaretDown, faCode } from "@fortawesome/pro-solid-svg-icons";
+import { faCaretDown, faCode } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import styles from "./Navigation.module.css";
diff --git a/apps/cyberstorm-nextjs/app/(navigation)/HeaderUserNav.tsx b/apps/cyberstorm-nextjs/app/(navigation)/HeaderUserNav.tsx
index 70c568b35..16925113a 100644
--- a/apps/cyberstorm-nextjs/app/(navigation)/HeaderUserNav.tsx
+++ b/apps/cyberstorm-nextjs/app/(navigation)/HeaderUserNav.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faUpload, faXmarkLarge } from "@fortawesome/pro-solid-svg-icons";
+import { faUpload, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
@@ -61,7 +61,7 @@ export const HeaderUserNav = () => {
               className={styles.navAccountPopoverCloseButton}
             >
               <Icon inline noWrapper>
-                <FontAwesomeIcon icon={faXmarkLarge} />
+                <FontAwesomeIcon icon={faXmark} />
               </Icon>
             </button>
             <nav className={styles.mobileNavPopoverList}>
diff --git a/apps/cyberstorm-nextjs/app/(navigation)/Navigation.tsx b/apps/cyberstorm-nextjs/app/(navigation)/Navigation.tsx
index 58db00aaa..96f2c620e 100644
--- a/apps/cyberstorm-nextjs/app/(navigation)/Navigation.tsx
+++ b/apps/cyberstorm-nextjs/app/(navigation)/Navigation.tsx
@@ -3,7 +3,7 @@ import {
   faGamepad,
   faLongArrowLeft,
   faCaretRight,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import styles from "./Navigation.module.css";
diff --git a/apps/cyberstorm-nextjs/app/(navigation)/UserActions.tsx b/apps/cyberstorm-nextjs/app/(navigation)/UserActions.tsx
index 93f1c21ac..cf24700e8 100644
--- a/apps/cyberstorm-nextjs/app/(navigation)/UserActions.tsx
+++ b/apps/cyberstorm-nextjs/app/(navigation)/UserActions.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faSignOut } from "@fortawesome/pro-solid-svg-icons";
+import { faSignOut } from "@fortawesome/free-solid-svg-icons";
 import { faDiscord, faGithub } from "@fortawesome/free-brands-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
diff --git a/apps/cyberstorm-nextjs/app/(navigation)/UserDropDown.tsx b/apps/cyberstorm-nextjs/app/(navigation)/UserDropDown.tsx
index 85f20c799..1a56e3d87 100644
--- a/apps/cyberstorm-nextjs/app/(navigation)/UserDropDown.tsx
+++ b/apps/cyberstorm-nextjs/app/(navigation)/UserDropDown.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faSignOut, faUsers } from "@fortawesome/pro-solid-svg-icons";
+import { faSignOut, faUsers } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as RadixDropDown from "@radix-ui/react-dropdown-menu";
 
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(community)/@community/@communityCard/page.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(community)/@community/@communityCard/page.tsx
index d32de3e65..f9f77e4d6 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(community)/@community/@communityCard/page.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(community)/@community/@communityCard/page.tsx
@@ -11,8 +11,8 @@ import { formatInteger } from "@thunderstore/cyberstorm/src/utils/utils";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
 import { faDiscord } from "@fortawesome/free-brands-svg-icons";
-import { faBoxOpen, faDownload } from "@fortawesome/pro-regular-svg-icons";
-import { faArrowUpRight } from "@fortawesome/pro-solid-svg-icons";
+import { faBoxOpen, faDownload } from "@fortawesome/free-solid-svg-icons";
+import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 export default function Page({ params }: { params: { community: string } }) {
@@ -55,7 +55,7 @@ export default function Page({ params }: { params: { community: string } }) {
                   </Button.ButtonIcon>
                   <Button.ButtonLabel>Join our community</Button.ButtonLabel>
                   <Button.ButtonIcon>
-                    <FontAwesomeIcon icon={faArrowUpRight} />
+                    <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
                   </Button.ButtonIcon>
                 </Button.Root>
               </a>
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/@packageManagement/page.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/@packageManagement/page.tsx
index cabb209d1..7937697d2 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/@packageManagement/page.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/@packageManagement/page.tsx
@@ -3,7 +3,7 @@ import { Alert, Button, Tag, TextInput } from "@thunderstore/cyberstorm";
 import styles from "./PackageManagementForm.module.css";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
-import { faCircleExclamation } from "@fortawesome/pro-solid-svg-icons";
+import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 export default function Page({
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/layout.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/layout.tsx
index 7331cee90..432d7ee23 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/layout.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageCard/layout.tsx
@@ -10,10 +10,10 @@ import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
 import { ThunderstoreLogo } from "@thunderstore/cyberstorm/src/svg/svg";
 import {
-  faArrowUpRight,
+  faArrowUpRightFromSquare,
   faUsers,
   faCog,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { ReactNode, Suspense } from "react";
 
@@ -54,7 +54,7 @@ export default function PackageCardLayout({
         <Button.Root plain colorScheme="transparentPrimary" paddingSize="small">
           <Button.ButtonLabel>{packageData.website_url}</Button.ButtonLabel>
           <Button.ButtonIcon>
-            <FontAwesomeIcon icon={faArrowUpRight} />
+            <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
           </Button.ButtonIcon>
         </Button.Root>
       </a>
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageDependencyList/layout.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageDependencyList/layout.tsx
index 794c5941b..9a66f1716 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageDependencyList/layout.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageDependencyList/layout.tsx
@@ -5,8 +5,8 @@ import {
   ImageWithFallback,
   CyberstormLink,
 } from "@thunderstore/cyberstorm";
-import { faBoxOpen } from "@fortawesome/pro-regular-svg-icons";
-import { faCaretRight } from "@fortawesome/pro-solid-svg-icons";
+import { faBoxOpen } from "@fortawesome/free-solid-svg-icons";
+import { faCaretRight } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import styles from "./PackageDependencyList.module.css";
 import { useDapper } from "@thunderstore/dapper";
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTagList/page.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTagList/page.tsx
index 1845c5cf6..7aafc3c3a 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTagList/page.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTagList/page.tsx
@@ -8,13 +8,12 @@ import { usePromise } from "@thunderstore/use-promise";
 import { ReactNode } from "react";
 
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faTag } from "@fortawesome/pro-regular-svg-icons";
+import { faTag } from "@fortawesome/free-solid-svg-icons";
 import {
   faThumbtack,
   faWarning,
-  faLips,
-  faSparkles,
-} from "@fortawesome/pro-solid-svg-icons";
+  faBomb,
+} from "@fortawesome/free-solid-svg-icons";
 
 export default function Page({
   params,
@@ -84,7 +83,7 @@ function getPackageFlags(packageData: PackageListingDetails) {
         label="NSFW"
         colorScheme="pink"
         size="mediumPlus"
-        leftIcon={<FontAwesomeIcon icon={faLips} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
@@ -95,7 +94,7 @@ function getPackageFlags(packageData: PackageListingDetails) {
         label="New"
         colorScheme="green"
         size="mediumPlus"
-        leftIcon={<FontAwesomeIcon icon={faSparkles} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTeamMemberList/page.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTeamMemberList/page.tsx
index 8181c2592..6a2c28291 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTeamMemberList/page.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/@packageTeamMemberList/page.tsx
@@ -4,7 +4,7 @@ import {
   faUsers,
   faCaretRight,
   faCrown,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import styles from "./PackageTeamMemberList.module.css";
 import { useDapper } from "@thunderstore/dapper";
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/layout.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/layout.tsx
index e29c1eea7..31dd5e616 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/layout.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageDetail/layout.tsx
@@ -7,7 +7,7 @@ import {
   faThumbsUp,
   faFlag,
   faBoxes,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import styles from "./PackageDetailsLayout.module.css";
 import { Button, Icon, Tag } from "@thunderstore/cyberstorm";
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/@packageVersions/page.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/@packageVersions/page.tsx
index fe42a4f5a..71952c16f 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/@packageVersions/page.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/@packageVersions/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons";
-import { faBoltLightning } from "@fortawesome/pro-solid-svg-icons";
+import { faBoltLightning } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
diff --git a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/layout.tsx b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/layout.tsx
index e4c1d3e78..376af1aa3 100644
--- a/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/layout.tsx
+++ b/apps/cyberstorm-nextjs/app/c/[community]/(package)/@tspackage/p/[namespace]/(packageRoute)/[package]/(pkg)/@packageTabs/layout.tsx
@@ -5,9 +5,9 @@ import { ReactNode, Suspense } from "react";
 import Tabs from "@thunderstore/cyberstorm/src/components/NewTabs/Tabs";
 import {
   faFileLines,
-  faFilePlus,
+  faFileCirclePlus,
   faCodeBranch,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 
 export default function PacakgeTabsLayout({
   packageReadme,
@@ -38,7 +38,7 @@ export default function PacakgeTabsLayout({
       <Tabs.Tab
         name="changelog"
         label="Changelog"
-        icon={faFilePlus}
+        icon={faFileCirclePlus}
         disabled={!packageData.has_changelog}
       >
         <Suspense fallback={<p>TODO: Changelog Skeleton</p>}>
diff --git a/apps/cyberstorm-nextjs/app/communities/@communityList/page.tsx b/apps/cyberstorm-nextjs/app/communities/@communityList/page.tsx
index e8f565014..e333e4f65 100644
--- a/apps/cyberstorm-nextjs/app/communities/@communityList/page.tsx
+++ b/apps/cyberstorm-nextjs/app/communities/@communityList/page.tsx
@@ -1,4 +1,4 @@
-import { faGhost } from "@fortawesome/pro-solid-svg-icons";
+import { faGhost } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 
diff --git a/apps/cyberstorm-nextjs/app/communities/@searchAndOrder/page.tsx b/apps/cyberstorm-nextjs/app/communities/@searchAndOrder/page.tsx
index 914b88821..ade10e84a 100644
--- a/apps/cyberstorm-nextjs/app/communities/@searchAndOrder/page.tsx
+++ b/apps/cyberstorm-nextjs/app/communities/@searchAndOrder/page.tsx
@@ -10,7 +10,7 @@ import {
   faArrowDownAZ,
   faStar,
 } from "@fortawesome/free-solid-svg-icons";
-import { faFire } from "@fortawesome/pro-solid-svg-icons";
+import { faFire } from "@fortawesome/free-solid-svg-icons";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useRouter } from "next/navigation";
 
diff --git a/apps/cyberstorm-nextjs/app/developers/manifest-validator/@validator/page.tsx b/apps/cyberstorm-nextjs/app/developers/manifest-validator/@validator/page.tsx
index 9d544a5be..ddd984a55 100644
--- a/apps/cyberstorm-nextjs/app/developers/manifest-validator/@validator/page.tsx
+++ b/apps/cyberstorm-nextjs/app/developers/manifest-validator/@validator/page.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faWarning } from "@fortawesome/pro-solid-svg-icons";
+import { faWarning } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
diff --git a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/layout.tsx b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/layout.tsx
index 2ef497d23..d286558dc 100644
--- a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/layout.tsx
+++ b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/layout.tsx
@@ -10,7 +10,7 @@ import {
   faUsers,
   faUserCog,
   faCog,
-} from "@fortawesome/pro-regular-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
 
 export default function TeamsLayout(props: {
diff --git a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/TeamMemberList.tsx b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/TeamMemberList.tsx
index b55d17b0c..35e5a0b2a 100644
--- a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/TeamMemberList.tsx
+++ b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/TeamMemberList.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faTrashCan } from "@fortawesome/pro-solid-svg-icons";
+import { faTrashCan } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { TeamMember } from "@thunderstore/dapper/types";
 
diff --git a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/page.tsx b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/page.tsx
index c8881b734..7a66a72fb 100644
--- a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/page.tsx
+++ b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/members/page.tsx
@@ -3,7 +3,7 @@ import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
 import { TeamMemberList } from "./TeamMemberList";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { AddTeamMemberForm } from "@thunderstore/cyberstorm-forms";
 import { useState } from "react";
 import { SettingItem, Dialog, Button } from "@thunderstore/cyberstorm";
diff --git a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/service-accounts/page.tsx b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/service-accounts/page.tsx
index 8025f810f..62874bd3f 100644
--- a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/service-accounts/page.tsx
+++ b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/service-accounts/page.tsx
@@ -5,7 +5,7 @@ import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
 import { ServiceAccountList } from "./ServiceAccountList/ServiceAccountList";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 
 export default function Page(props: { params: { team: string } }) {
   const dapper = useDapper();
diff --git a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/settings/page.tsx b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/settings/page.tsx
index 617e78b1a..44e04b5b0 100644
--- a/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/settings/page.tsx
+++ b/apps/cyberstorm-nextjs/app/teams/[team]/@settingsContent/settings/page.tsx
@@ -6,10 +6,7 @@ import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
 import { useState } from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
-  faOctagonExclamation,
-  faTrashCan,
-} from "@fortawesome/pro-solid-svg-icons";
+import { faBomb, faTrashCan } from "@fortawesome/free-solid-svg-icons";
 
 export default function Page(props: { params: { team: string } }) {
   const [disbandTeamDialogOpen, setDisbandTeamDialogOpen] = useState(false);
@@ -27,7 +24,7 @@ export default function Page(props: { params: { team: string } }) {
         content={
           <div className={styles.content}>
             <Alert
-              icon={<FontAwesomeIcon icon={faOctagonExclamation} />}
+              icon={<FontAwesomeIcon icon={faBomb} />}
               content={
                 "You cannot currently leave this team as you are it's last owner."
               }
@@ -68,7 +65,7 @@ export default function Page(props: { params: { team: string } }) {
         content={
           <div className={styles.content}>
             <Alert
-              icon={<FontAwesomeIcon icon={faOctagonExclamation} />}
+              icon={<FontAwesomeIcon icon={faBomb} />}
               content={
                 "You cannot currently disband this team as it has packages."
               }
diff --git a/apps/cyberstorm-nextjs/app/teams/layout.tsx b/apps/cyberstorm-nextjs/app/teams/layout.tsx
index 318b6997c..4a11d3ec5 100644
--- a/apps/cyberstorm-nextjs/app/teams/layout.tsx
+++ b/apps/cyberstorm-nextjs/app/teams/layout.tsx
@@ -5,7 +5,7 @@ import React, { ReactNode, Suspense, useState } from "react";
 
 import styles from "./TeamsLayout.module.css";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { CreateTeamForm } from "@thunderstore/cyberstorm-forms";
 import {
   BreadCrumbs,
diff --git a/apps/cyberstorm-remix/app/c/community.tsx b/apps/cyberstorm-remix/app/c/community.tsx
index 456cfc51c..38b091490 100644
--- a/apps/cyberstorm-remix/app/c/community.tsx
+++ b/apps/cyberstorm-remix/app/c/community.tsx
@@ -18,8 +18,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import {
   faBoxOpen,
   faDownload,
-  faArrowUpRight,
-} from "@fortawesome/pro-regular-svg-icons";
+  faArrowUpRightFromSquare,
+} from "@fortawesome/free-solid-svg-icons";
 import { faDiscord } from "@fortawesome/free-brands-svg-icons";
 import { ApiError } from "@thunderstore/thunderstore-api";
 
@@ -204,7 +204,7 @@ export default function Community() {
                         Join our community
                       </Button.ButtonLabel>
                       <Button.ButtonIcon>
-                        <FontAwesomeIcon icon={faArrowUpRight} />
+                        <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
                       </Button.ButtonIcon>
                     </Button.Root>
                   </a>
diff --git a/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageOrder.tsx b/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageOrder.tsx
index 5bebbd93b..47dd5226f 100644
--- a/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageOrder.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageOrder.tsx
@@ -3,7 +3,7 @@ import {
   faDownload,
   faThumbsUp,
 } from "@fortawesome/free-solid-svg-icons";
-import { faSparkles } from "@fortawesome/pro-solid-svg-icons";
+import { faSparkles } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Dispatch, SetStateAction } from "react";
 
diff --git a/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageSearch.tsx b/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageSearch.tsx
index 10e9254f5..b432ff369 100644
--- a/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageSearch.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/PackageSearch/PackageSearch.tsx
@@ -1,5 +1,5 @@
 import { faSearch } from "@fortawesome/free-solid-svg-icons";
-import { faXmarkLarge, faSlidersUp } from "@fortawesome/pro-regular-svg-icons";
+import { faXmarkLarge, faSlidersUp } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import {
   PackageCategory,
diff --git a/apps/cyberstorm-remix/app/communities/communities.tsx b/apps/cyberstorm-remix/app/communities/communities.tsx
index 60f4d5827..4b345ed66 100644
--- a/apps/cyberstorm-remix/app/communities/communities.tsx
+++ b/apps/cyberstorm-remix/app/communities/communities.tsx
@@ -19,7 +19,7 @@ import {
   faArrowDownAZ,
   faStar,
 } from "@fortawesome/free-solid-svg-icons";
-import { faGhost, faFire } from "@fortawesome/pro-solid-svg-icons";
+import { faGhost, faFire } from "@fortawesome/free-solid-svg-icons";
 import { useDebounce } from "use-debounce";
 import {
   useLoaderData,
diff --git a/apps/cyberstorm-remix/app/namespace/namespace.tsx b/apps/cyberstorm-remix/app/namespace/namespace.tsx
index f7eecba13..a5178c45c 100644
--- a/apps/cyberstorm-remix/app/namespace/namespace.tsx
+++ b/apps/cyberstorm-remix/app/namespace/namespace.tsx
@@ -18,8 +18,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import {
   faBoxOpen,
   faDownload,
-  faArrowUpRight,
-} from "@fortawesome/pro-regular-svg-icons";
+  faArrowUpRightFromSquare,
+} from "@fortawesome/free-solid-svg-icons";
 import { faDiscord } from "@fortawesome/free-brands-svg-icons";
 import { ApiError } from "@thunderstore/thunderstore-api";
 
@@ -172,7 +172,7 @@ export default function Community() {
                         Join our community
                       </Button.ButtonLabel>
                       <Button.ButtonIcon>
-                        <FontAwesomeIcon icon={faArrowUpRight} />
+                        <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
                       </Button.ButtonIcon>
                     </Button.Root>
                   </a>
diff --git a/apps/cyberstorm-remix/app/p/components/Dependencies/Dependencies.tsx b/apps/cyberstorm-remix/app/p/components/Dependencies/Dependencies.tsx
index 33637629c..c8d649f3e 100644
--- a/apps/cyberstorm-remix/app/p/components/Dependencies/Dependencies.tsx
+++ b/apps/cyberstorm-remix/app/p/components/Dependencies/Dependencies.tsx
@@ -4,8 +4,8 @@ import {
   ImageWithFallback,
   CyberstormLink,
 } from "@thunderstore/cyberstorm";
-import { faBoxOpen } from "@fortawesome/pro-regular-svg-icons";
-import { faCaretRight } from "@fortawesome/pro-solid-svg-icons";
+import { faBoxOpen } from "@fortawesome/free-solid-svg-icons";
+import { faCaretRight } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import styles from "./Dependencies.module.css";
 import { WrapperCard } from "@thunderstore/cyberstorm/src/components/WrapperCard/WrapperCard";
diff --git a/apps/cyberstorm-remix/app/p/components/TagList/TagList.tsx b/apps/cyberstorm-remix/app/p/components/TagList/TagList.tsx
index f1ae642f3..f99bf03cf 100644
--- a/apps/cyberstorm-remix/app/p/components/TagList/TagList.tsx
+++ b/apps/cyberstorm-remix/app/p/components/TagList/TagList.tsx
@@ -5,13 +5,12 @@ import { PackageListingDetails } from "@thunderstore/dapper/types";
 import { ReactNode } from "react";
 
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faTag } from "@fortawesome/pro-regular-svg-icons";
 import {
   faThumbtack,
   faWarning,
-  faLips,
-  faSparkles,
-} from "@fortawesome/pro-solid-svg-icons";
+  faBomb,
+  faTag,
+} from "@fortawesome/free-solid-svg-icons";
 
 export default function TagList(props: { listing: PackageListingDetails }) {
   return (
@@ -70,7 +69,7 @@ function getPackageFlags(packageData: PackageListingDetails) {
         label="NSFW"
         colorScheme="pink"
         size="mediumPlus"
-        leftIcon={<FontAwesomeIcon icon={faLips} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
@@ -81,7 +80,7 @@ function getPackageFlags(packageData: PackageListingDetails) {
         label="New"
         colorScheme="green"
         size="mediumPlus"
-        leftIcon={<FontAwesomeIcon icon={faSparkles} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
diff --git a/apps/cyberstorm-remix/app/p/components/TeamMembers/TeamMembers.tsx b/apps/cyberstorm-remix/app/p/components/TeamMembers/TeamMembers.tsx
index d0f4f3641..9adf6d5cc 100644
--- a/apps/cyberstorm-remix/app/p/components/TeamMembers/TeamMembers.tsx
+++ b/apps/cyberstorm-remix/app/p/components/TeamMembers/TeamMembers.tsx
@@ -3,7 +3,7 @@ import {
   faUsers,
   faCaretRight,
   faCrown,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import styles from "./TeamMembers.module.css";
 import { WrapperCard } from "@thunderstore/cyberstorm/src/components/WrapperCard/WrapperCard";
diff --git a/apps/cyberstorm-remix/app/p/packageListing.tsx b/apps/cyberstorm-remix/app/p/packageListing.tsx
index cb9b22a9c..1c246eb3f 100644
--- a/apps/cyberstorm-remix/app/p/packageListing.tsx
+++ b/apps/cyberstorm-remix/app/p/packageListing.tsx
@@ -37,7 +37,7 @@ import {
   faCodeBranch,
   faBook,
   faCodeSimple,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { WrapperCard } from "@thunderstore/cyberstorm/src/components/WrapperCard/WrapperCard";
 import Meta from "./components/Meta/Meta";
 import TagList from "./components/TagList/TagList";
diff --git a/apps/cyberstorm-remix/app/p/tabs/Versions/Versions.tsx b/apps/cyberstorm-remix/app/p/tabs/Versions/Versions.tsx
index 53347684c..2690ffe18 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Versions/Versions.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Versions/Versions.tsx
@@ -1,5 +1,5 @@
 import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons";
-import { faBoltLightning } from "@fortawesome/pro-solid-svg-icons";
+import { faBoltLightning } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import styles from "./Versions.module.css";
diff --git a/apps/cyberstorm-remix/app/settings/teams/Teams.tsx b/apps/cyberstorm-remix/app/settings/teams/Teams.tsx
index cfe3d284c..55856ea9e 100644
--- a/apps/cyberstorm-remix/app/settings/teams/Teams.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/Teams.tsx
@@ -9,7 +9,7 @@ import {
   SettingItem,
   Table,
 } from "@thunderstore/cyberstorm";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import styles from "./TeamsLayout.module.css";
 import rootStyles from "../../RootLayout.module.css";
 import { getDapper } from "cyberstorm/dapper/sessionUtils";
diff --git a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/Members.tsx b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/Members.tsx
index 501dc5a4e..72341ca9c 100644
--- a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/Members.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/Members.tsx
@@ -1,6 +1,6 @@
 import { TeamMemberList } from "./TeamMemberList";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { AddTeamMemberForm } from "@thunderstore/cyberstorm-forms";
 import { SettingItem, Dialog, Button } from "@thunderstore/cyberstorm";
 import { LoaderFunctionArgs } from "@remix-run/node";
diff --git a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/TeamMemberList.tsx b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/TeamMemberList.tsx
index 9b7150641..5071f9fa5 100644
--- a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/TeamMemberList.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/TeamMemberList.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faTrashCan } from "@fortawesome/pro-solid-svg-icons";
+import { faTrashCan } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { TeamMember } from "@thunderstore/dapper/types";
 
diff --git a/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccounts.tsx b/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccounts.tsx
index bc288fb97..8fd1ba850 100644
--- a/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccounts.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccounts.tsx
@@ -2,7 +2,7 @@ import { SettingItem, Dialog, Button } from "@thunderstore/cyberstorm";
 import { AddServiceAccountForm } from "@thunderstore/cyberstorm-forms";
 import { ServiceAccountList } from "./ServiceAccountList/ServiceAccountList";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { LoaderFunctionArgs } from "@remix-run/node";
 import { useLoaderData, useRevalidator } from "@remix-run/react";
 import { serviceAccountSchema } from "@thunderstore/dapper-ts/src/methods/team";
diff --git a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.tsx b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.tsx
index 75290d401..93f55d914 100644
--- a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.tsx
@@ -3,10 +3,7 @@ import { SettingItem, Alert, Dialog, Button } from "@thunderstore/cyberstorm";
 import { LeaveTeamForm, DisbandTeamForm } from "@thunderstore/cyberstorm-forms";
 import { useState } from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
-  faOctagonExclamation,
-  faTrashCan,
-} from "@fortawesome/pro-solid-svg-icons";
+import { faBomb, faTrashCan } from "@fortawesome/free-solid-svg-icons";
 import { currentUserSchema } from "@thunderstore/dapper-ts";
 import { getDapper } from "cyberstorm/dapper/sessionUtils";
 import { LoaderFunctionArgs } from "@remix-run/node";
@@ -75,7 +72,7 @@ export default function Settings() {
         content={
           <div className={styles.content}>
             <Alert
-              icon={<FontAwesomeIcon icon={faOctagonExclamation} />}
+              icon={<FontAwesomeIcon icon={faBomb} />}
               content={
                 "You cannot currently leave this team as you are it's last owner."
               }
@@ -113,7 +110,7 @@ export default function Settings() {
         content={
           <div className={styles.content}>
             <Alert
-              icon={<FontAwesomeIcon icon={faOctagonExclamation} />}
+              icon={<FontAwesomeIcon icon={faBomb} />}
               content={
                 "You cannot currently disband this team as it has packages."
               }
diff --git a/apps/cyberstorm-remix/app/settings/teams/team/teamSettings.tsx b/apps/cyberstorm-remix/app/settings/teams/team/teamSettings.tsx
index e581dc6ed..3c3cbd49d 100644
--- a/apps/cyberstorm-remix/app/settings/teams/team/teamSettings.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/team/teamSettings.tsx
@@ -17,7 +17,7 @@ import {
   faFilePlus,
   faCodeBranch,
   faBook,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
 
 export const meta: MetaFunction<typeof loader> = ({ data }) => {
diff --git a/apps/cyberstorm-remix/cyberstorm/navigation/DevelopersDropDown.tsx b/apps/cyberstorm-remix/cyberstorm/navigation/DevelopersDropDown.tsx
index 52d76032f..74f6faefe 100644
--- a/apps/cyberstorm-remix/cyberstorm/navigation/DevelopersDropDown.tsx
+++ b/apps/cyberstorm-remix/cyberstorm/navigation/DevelopersDropDown.tsx
@@ -1,4 +1,4 @@
-import { faCaretDown } from "@fortawesome/pro-solid-svg-icons";
+import { faCaretDown } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { DropDown, Button, DropDownItem } from "@thunderstore/cyberstorm";
diff --git a/apps/cyberstorm-remix/cyberstorm/navigation/HeaderUserNav.tsx b/apps/cyberstorm-remix/cyberstorm/navigation/HeaderUserNav.tsx
index 0cdbece6a..4231acdd2 100644
--- a/apps/cyberstorm-remix/cyberstorm/navigation/HeaderUserNav.tsx
+++ b/apps/cyberstorm-remix/cyberstorm/navigation/HeaderUserNav.tsx
@@ -1,4 +1,4 @@
-import { faUpload, faXmarkLarge } from "@fortawesome/pro-solid-svg-icons";
+import { faUpload, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { UserDropDown } from "./UserDropDown";
@@ -57,7 +57,7 @@ export const HeaderUserNav = (props: { user: CurrentUser }) => {
               className={styles.navAccountPopoverCloseButton}
             >
               <Icon inline noWrapper>
-                <FontAwesomeIcon icon={faXmarkLarge} />
+                <FontAwesomeIcon icon={faXmark} />
               </Icon>
             </button>
             <nav className={styles.mobileNavPopoverList}>
diff --git a/apps/cyberstorm-remix/cyberstorm/navigation/Navigation.tsx b/apps/cyberstorm-remix/cyberstorm/navigation/Navigation.tsx
index 6f81cdb2c..c410b5aeb 100644
--- a/apps/cyberstorm-remix/cyberstorm/navigation/Navigation.tsx
+++ b/apps/cyberstorm-remix/cyberstorm/navigation/Navigation.tsx
@@ -3,7 +3,7 @@ import {
   faGamepad,
   faLongArrowLeft,
   faCaretRight,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import styles from "./Navigation.module.css";
diff --git a/apps/cyberstorm-remix/cyberstorm/navigation/UserActions.tsx b/apps/cyberstorm-remix/cyberstorm/navigation/UserActions.tsx
index 821e972ce..befc8ec16 100644
--- a/apps/cyberstorm-remix/cyberstorm/navigation/UserActions.tsx
+++ b/apps/cyberstorm-remix/cyberstorm/navigation/UserActions.tsx
@@ -1,4 +1,4 @@
-import { faSignOut, faUsers } from "@fortawesome/pro-solid-svg-icons";
+import { faSignOut, faUsers } from "@fortawesome/free-solid-svg-icons";
 import { faDiscord, faGithub } from "@fortawesome/free-brands-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
diff --git a/apps/cyberstorm-remix/cyberstorm/navigation/UserDropDown.tsx b/apps/cyberstorm-remix/cyberstorm/navigation/UserDropDown.tsx
index 299587870..11ff76d58 100644
--- a/apps/cyberstorm-remix/cyberstorm/navigation/UserDropDown.tsx
+++ b/apps/cyberstorm-remix/cyberstorm/navigation/UserDropDown.tsx
@@ -1,4 +1,4 @@
-import { faSignOut, faUsers } from "@fortawesome/pro-solid-svg-icons";
+import { faSignOut, faUsers } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as RadixDropDown from "@radix-ui/react-dropdown-menu";
 
diff --git a/apps/cyberstorm-storybook/stories/components/Alert.stories.tsx b/apps/cyberstorm-storybook/stories/components/Alert.stories.tsx
index 81da59a9a..840966a19 100644
--- a/apps/cyberstorm-storybook/stories/components/Alert.stories.tsx
+++ b/apps/cyberstorm-storybook/stories/components/Alert.stories.tsx
@@ -7,7 +7,7 @@ import {
   faCircleCheck,
   faTriangleExclamation,
 } from "@fortawesome/free-solid-svg-icons";
-import { faOctagonExclamation } from "@fortawesome/pro-solid-svg-icons";
+import { faBomb } from "@fortawesome/free-solid-svg-icons";
 
 const meta = {
   title: "Cyberstorm/Components/Alert",
@@ -45,7 +45,7 @@ DangerAlert.args = {
   content:
     "Lorem ipsum dolor sit amet, lollero pollero long ass text right here ellipsis just kidding it’s not that long.",
   variant: "danger",
-  icon: <FontAwesomeIcon icon={faOctagonExclamation} />,
+  icon: <FontAwesomeIcon icon={faBomb} />,
 };
 
 const WarningAlert = Template.bind({});
diff --git a/apps/cyberstorm-storybook/stories/components/NewTabs.stories.tsx b/apps/cyberstorm-storybook/stories/components/NewTabs.stories.tsx
index c32f870a1..29ef7a61e 100644
--- a/apps/cyberstorm-storybook/stories/components/NewTabs.stories.tsx
+++ b/apps/cyberstorm-storybook/stories/components/NewTabs.stories.tsx
@@ -2,7 +2,7 @@ import { StoryFn, Meta } from "@storybook/react";
 import { NewTabs } from "@thunderstore/cyberstorm";
 import { usePromise } from "@thunderstore/use-promise";
 import { Suspense } from "react";
-import { faCog, faFlag, faThumbsUp } from "@fortawesome/pro-solid-svg-icons";
+import { faCog, faFlag, faThumbsUp } from "@fortawesome/free-solid-svg-icons";
 
 const meta = {
   title: "Cyberstorm/Components/Tabs",
diff --git a/apps/cyberstorm-storybook/stories/components/Tag.stories.tsx b/apps/cyberstorm-storybook/stories/components/Tag.stories.tsx
index 13e8e75a3..b700aea1a 100644
--- a/apps/cyberstorm-storybook/stories/components/Tag.stories.tsx
+++ b/apps/cyberstorm-storybook/stories/components/Tag.stories.tsx
@@ -2,7 +2,7 @@ import { StoryFn, Meta } from "@storybook/react";
 import { Tag } from "@thunderstore/cyberstorm";
 import React from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faTag, faXmark } from "@fortawesome/pro-solid-svg-icons";
+import { faTag, faXmark } from "@fortawesome/free-solid-svg-icons";
 
 const meta = {
   title: "Cyberstorm/Components/Tag",
diff --git a/packages/cyberstorm-forms/package.json b/packages/cyberstorm-forms/package.json
index b9491c701..dc82f1461 100644
--- a/packages/cyberstorm-forms/package.json
+++ b/packages/cyberstorm-forms/package.json
@@ -18,7 +18,6 @@
     "@babel/runtime": "^7.17.0",
     "@fortawesome/fontawesome-svg-core": "6.2.0",
     "@fortawesome/free-solid-svg-icons": "6.2.0",
-    "@fortawesome/pro-solid-svg-icons": "6.2.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@radix-ui/react-select": "^2.0.0",
     "@thunderstore/cyberstorm": "*",
diff --git a/packages/cyberstorm-forms/src/components/FormSelect.tsx b/packages/cyberstorm-forms/src/components/FormSelect.tsx
index 6c45504c8..f093dc40e 100644
--- a/packages/cyberstorm-forms/src/components/FormSelect.tsx
+++ b/packages/cyberstorm-forms/src/components/FormSelect.tsx
@@ -7,7 +7,7 @@ import styles from "./FormSelect.module.css";
 import * as Select from "@radix-ui/react-select";
 import React, { PropsWithChildren } from "react";
 import { Icon } from "@thunderstore/cyberstorm";
-import { faCaretDown, faCheckCircle } from "@fortawesome/pro-solid-svg-icons";
+import { faCaretDown, faCheckCircle } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 export type FormSelectProps<
diff --git a/packages/cyberstorm-forms/src/forms/AddServiceAccountForm.tsx b/packages/cyberstorm-forms/src/forms/AddServiceAccountForm.tsx
index ec0a12a84..845ae0934 100644
--- a/packages/cyberstorm-forms/src/forms/AddServiceAccountForm.tsx
+++ b/packages/cyberstorm-forms/src/forms/AddServiceAccountForm.tsx
@@ -14,7 +14,7 @@ import {
 import { useState } from "react";
 import { Alert, Button, CopyButton, Dialog } from "@thunderstore/cyberstorm";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleExclamation } from "@fortawesome/pro-solid-svg-icons";
+import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons";
 import { isRecord } from "@thunderstore/cyberstorm/src/utils/type_guards";
 
 interface ServiceAccountSuccessResponse {
diff --git a/packages/cyberstorm-forms/src/forms/DeleteAccountForm.tsx b/packages/cyberstorm-forms/src/forms/DeleteAccountForm.tsx
index dfabb02e4..cf7e92986 100644
--- a/packages/cyberstorm-forms/src/forms/DeleteAccountForm.tsx
+++ b/packages/cyberstorm-forms/src/forms/DeleteAccountForm.tsx
@@ -14,7 +14,7 @@ import {
 
 import { Alert } from "@thunderstore/cyberstorm";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faTrashCan, faWarning } from "@fortawesome/pro-solid-svg-icons";
+import { faTrashCan, faWarning } from "@fortawesome/free-solid-svg-icons";
 
 export function DeleteAccountForm(props: { userName: string }) {
   const toast = useFormToaster({
diff --git a/packages/cyberstorm-forms/src/forms/PackageEditForm.tsx b/packages/cyberstorm-forms/src/forms/PackageEditForm.tsx
index 22b18f40f..5fb4d4d66 100644
--- a/packages/cyberstorm-forms/src/forms/PackageEditForm.tsx
+++ b/packages/cyberstorm-forms/src/forms/PackageEditForm.tsx
@@ -13,7 +13,7 @@ import {
 } from "@thunderstore/cyberstorm-forms";
 import { Alert, MultiSelectSearchOption, Tag } from "@thunderstore/cyberstorm";
 import { ReactNode } from "react";
-import { faCircleExclamation } from "@fortawesome/pro-solid-svg-icons";
+import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 // TODO: Separate deprecation action from this form
diff --git a/packages/cyberstorm-forms/src/forms/RemoveServiceAccountForm.tsx b/packages/cyberstorm-forms/src/forms/RemoveServiceAccountForm.tsx
index f2b70ec18..1d8c18eac 100644
--- a/packages/cyberstorm-forms/src/forms/RemoveServiceAccountForm.tsx
+++ b/packages/cyberstorm-forms/src/forms/RemoveServiceAccountForm.tsx
@@ -10,7 +10,7 @@ import {
 
 import { z } from "zod";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faTriangleExclamation } from "@fortawesome/pro-solid-svg-icons";
+import { faTriangleExclamation } from "@fortawesome/free-solid-svg-icons";
 import { Alert } from "@thunderstore/cyberstorm";
 
 export function RemoveServiceAccountForm(props: {
diff --git a/packages/cyberstorm/package.json b/packages/cyberstorm/package.json
index 6592ddab1..b9ffe698e 100644
--- a/packages/cyberstorm/package.json
+++ b/packages/cyberstorm/package.json
@@ -20,10 +20,6 @@
     "@fortawesome/fontawesome-svg-core": "6.2.0",
     "@fortawesome/free-brands-svg-icons": "6.2.0",
     "@fortawesome/free-solid-svg-icons": "6.2.0",
-    "@fortawesome/pro-light-svg-icons": "6.2.0",
-    "@fortawesome/pro-regular-svg-icons": "6.2.0",
-    "@fortawesome/pro-solid-svg-icons": "6.2.0",
-    "@fortawesome/pro-thin-svg-icons": "6.2.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@radix-ui/react-checkbox": "^1.0.1",
     "@radix-ui/react-dialog": "^1.0.2",
diff --git a/packages/cyberstorm/src/components/AdContainer/AdContainer.tsx b/packages/cyberstorm/src/components/AdContainer/AdContainer.tsx
index 9f13c9412..987947605 100644
--- a/packages/cyberstorm/src/components/AdContainer/AdContainer.tsx
+++ b/packages/cyberstorm/src/components/AdContainer/AdContainer.tsx
@@ -1,6 +1,6 @@
 import styles from "./AdContainer.module.css";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faHeart } from "@fortawesome/pro-solid-svg-icons";
+import { faHeart } from "@fortawesome/free-solid-svg-icons";
 import { Icon } from "../Icon/Icon";
 
 interface AdContainerProps {
diff --git a/packages/cyberstorm/src/components/Avatar/AvatarButton.tsx b/packages/cyberstorm/src/components/Avatar/AvatarButton.tsx
index 51e283add..b79b948b1 100644
--- a/packages/cyberstorm/src/components/Avatar/AvatarButton.tsx
+++ b/packages/cyberstorm/src/components/Avatar/AvatarButton.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { classnames } from "../../utils/utils";
 import styles from "./Avatar.module.css";
 import React, { PropsWithChildren, useRef } from "react";
-import { faUser } from "@fortawesome/pro-solid-svg-icons";
+import { faUser } from "@fortawesome/free-solid-svg-icons";
 import { Icon } from "../Icon/Icon";
 
 export interface AvatarButtonProps {
diff --git a/packages/cyberstorm/src/components/BreadCrumbs/BreadCrumbs.tsx b/packages/cyberstorm/src/components/BreadCrumbs/BreadCrumbs.tsx
index f06f8165a..2b26945ea 100644
--- a/packages/cyberstorm/src/components/BreadCrumbs/BreadCrumbs.tsx
+++ b/packages/cyberstorm/src/components/BreadCrumbs/BreadCrumbs.tsx
@@ -1,6 +1,6 @@
 import React, { PropsWithChildren } from "react";
 
-import { faHouse } from "@fortawesome/pro-regular-svg-icons";
+import { faHouse } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import styles from "./BreadCrumbs.module.css";
 import { CyberstormLink } from "../Links/Links";
diff --git a/packages/cyberstorm/src/components/CopyButton/CopyButton.tsx b/packages/cyberstorm/src/components/CopyButton/CopyButton.tsx
index dea275b57..c46c2355d 100644
--- a/packages/cyberstorm/src/components/CopyButton/CopyButton.tsx
+++ b/packages/cyberstorm/src/components/CopyButton/CopyButton.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faClone, faCheck } from "@fortawesome/pro-regular-svg-icons";
+import { faClone, faCheck } from "@fortawesome/free-solid-svg-icons";
 import { Dispatch, SetStateAction, useEffect, useState } from "react";
 import styles from "./CopyButton.module.css";
 import { Tooltip } from "../Tooltip/Tooltip";
diff --git a/packages/cyberstorm/src/components/Dialog/Dialog.tsx b/packages/cyberstorm/src/components/Dialog/Dialog.tsx
index 038d8bbec..faccb620f 100644
--- a/packages/cyberstorm/src/components/Dialog/Dialog.tsx
+++ b/packages/cyberstorm/src/components/Dialog/Dialog.tsx
@@ -4,7 +4,7 @@ import styles from "./Dialog.module.css";
 import * as RadixDialog from "@radix-ui/react-dialog";
 import * as Button from "../Button/";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faXmarkLarge } from "@fortawesome/pro-solid-svg-icons";
+import { faXmark } from "@fortawesome/free-solid-svg-icons";
 import { Tooltip } from "../..";
 import { classnames } from "../../utils/utils";
 
@@ -62,7 +62,7 @@ export function Dialog(props: DialogProps) {
                       <Button.ButtonIcon>
                         <FontAwesomeIcon
                           className={styles.closeIcon}
-                          icon={faXmarkLarge}
+                          icon={faXmark}
                         />
                       </Button.ButtonIcon>
                     </Button.Root>
diff --git a/packages/cyberstorm/src/components/DropDown/DropDownLink.tsx b/packages/cyberstorm/src/components/DropDown/DropDownLink.tsx
index 4a58d5409..14e4b05cd 100644
--- a/packages/cyberstorm/src/components/DropDown/DropDownLink.tsx
+++ b/packages/cyberstorm/src/components/DropDown/DropDownLink.tsx
@@ -1,7 +1,7 @@
 import styles from "./DropDownLink.module.css";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { ReactElement } from "react";
-import { faArrowUpRight } from "@fortawesome/pro-solid-svg-icons";
+import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { Icon } from "../Icon/Icon";
 
 export interface DropDownLinkProps {
@@ -23,7 +23,7 @@ export function DropDownLink(props: DropDownLinkProps) {
       </div>
       {isExternal ? (
         <Icon inline iconClasses={styles.arrowUpRightIcon}>
-          <FontAwesomeIcon icon={faArrowUpRight} />
+          <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
         </Icon>
       ) : null}
     </div>
diff --git a/packages/cyberstorm/src/components/Footer/Footer.tsx b/packages/cyberstorm/src/components/Footer/Footer.tsx
index dc55da2e5..1f722bcb0 100644
--- a/packages/cyberstorm/src/components/Footer/Footer.tsx
+++ b/packages/cyberstorm/src/components/Footer/Footer.tsx
@@ -4,9 +4,9 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faDiscord, faGithub } from "@fortawesome/free-brands-svg-icons";
 import { CyberstormLink } from "../Links/Links";
 import {
-  faArrowUpRight,
+  faArrowUpRightFromSquare,
   faBoltLightning,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { ThunderstoreLogoHorizontal } from "../../svg/svg";
 import { Tooltip } from "../Tooltip/Tooltip";
 import { Icon } from "../Icon/Icon";
@@ -126,7 +126,7 @@ export function Footer() {
                       Get Manager
                     </Button.ButtonLabel>
                     <Button.ButtonIcon>
-                      <FontAwesomeIcon icon={faArrowUpRight} />
+                      <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
                     </Button.ButtonIcon>
                   </Button.Root>
                 </div>
diff --git a/packages/cyberstorm/src/components/Header/DevelopersDropDown.tsx b/packages/cyberstorm/src/components/Header/DevelopersDropDown.tsx
index 1d6b5549c..bf8460098 100644
--- a/packages/cyberstorm/src/components/Header/DevelopersDropDown.tsx
+++ b/packages/cyberstorm/src/components/Header/DevelopersDropDown.tsx
@@ -1,4 +1,4 @@
-import { faCaretDown, faCode } from "@fortawesome/pro-solid-svg-icons";
+import { faCaretDown, faCode } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import * as Button from "../Button/";
diff --git a/packages/cyberstorm/src/components/Header/Header.tsx b/packages/cyberstorm/src/components/Header/Header.tsx
index 3073051d7..2ae3f0cc0 100644
--- a/packages/cyberstorm/src/components/Header/Header.tsx
+++ b/packages/cyberstorm/src/components/Header/Header.tsx
@@ -1,4 +1,4 @@
-import { faGamepadModern } from "@fortawesome/pro-solid-svg-icons";
+import { faGamepad } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import styles from "./Header.module.css";
@@ -31,7 +31,7 @@ export function Header() {
           tooltipText="Communities"
         >
           <Button.ButtonIcon>
-            <FontAwesomeIcon icon={faGamepadModern} />
+            <FontAwesomeIcon icon={faGamepad} />
           </Button.ButtonIcon>
         </Button.Root>
         <DevelopersDropDown squareButton />
diff --git a/packages/cyberstorm/src/components/Header/HeaderUserNav.tsx b/packages/cyberstorm/src/components/Header/HeaderUserNav.tsx
index 2b948871a..e2885fc81 100644
--- a/packages/cyberstorm/src/components/Header/HeaderUserNav.tsx
+++ b/packages/cyberstorm/src/components/Header/HeaderUserNav.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faUpload } from "@fortawesome/pro-solid-svg-icons";
+import { faUpload } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
diff --git a/packages/cyberstorm/src/components/Header/UserDropDown.tsx b/packages/cyberstorm/src/components/Header/UserDropDown.tsx
index 573a45363..196cf6ac2 100644
--- a/packages/cyberstorm/src/components/Header/UserDropDown.tsx
+++ b/packages/cyberstorm/src/components/Header/UserDropDown.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faSignOut, faUsers } from "@fortawesome/pro-solid-svg-icons";
+import { faSignOut, faUsers } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as RadixDropDown from "@radix-ui/react-dropdown-menu";
 
diff --git a/packages/cyberstorm/src/components/ImageWithFallback/ImageWithFallback.tsx b/packages/cyberstorm/src/components/ImageWithFallback/ImageWithFallback.tsx
index e3656cb41..02b9fa157 100644
--- a/packages/cyberstorm/src/components/ImageWithFallback/ImageWithFallback.tsx
+++ b/packages/cyberstorm/src/components/ImageWithFallback/ImageWithFallback.tsx
@@ -1,4 +1,4 @@
-import { faBan, faGamepadModern } from "@fortawesome/pro-solid-svg-icons";
+import { faBan, faGamepad } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import styles from "./ImageWithFallback.module.css";
@@ -57,6 +57,6 @@ ImageWithFallback.displayName = "ImageWithFallback";
 
 const getIcon = (type: Props["type"] = "community") =>
   ({
-    community: faGamepadModern,
+    community: faGamepad,
     package: faBan,
   }[type]);
diff --git a/packages/cyberstorm/src/components/Layout/CommunityProfileLayout/CommunityProfileLayout.tsx b/packages/cyberstorm/src/components/Layout/CommunityProfileLayout/CommunityProfileLayout.tsx
index a7bb9bc74..80d138ab0 100644
--- a/packages/cyberstorm/src/components/Layout/CommunityProfileLayout/CommunityProfileLayout.tsx
+++ b/packages/cyberstorm/src/components/Layout/CommunityProfileLayout/CommunityProfileLayout.tsx
@@ -1,7 +1,10 @@
 "use client";
 import { faDiscord } from "@fortawesome/free-brands-svg-icons";
-import { faBoxOpen, faDownload } from "@fortawesome/pro-regular-svg-icons";
-import { faArrowUpRight } from "@fortawesome/pro-solid-svg-icons";
+import {
+  faArrowUpRightFromSquare,
+  faBoxOpen,
+  faDownload,
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
@@ -78,7 +81,7 @@ export function CommunityProfileLayout(props: Props) {
                   </Button.ButtonIcon>
                   <Button.ButtonLabel>Join our community</Button.ButtonLabel>
                   <Button.ButtonIcon>
-                    <FontAwesomeIcon icon={faArrowUpRight} />
+                    <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
                   </Button.ButtonIcon>
                 </Button.Root>
               </a>
diff --git a/packages/cyberstorm/src/components/Layout/Developers/ManifestValidator/ManifestValidatorLayout.tsx b/packages/cyberstorm/src/components/Layout/Developers/ManifestValidator/ManifestValidatorLayout.tsx
index da3eda560..6ee20e457 100644
--- a/packages/cyberstorm/src/components/Layout/Developers/ManifestValidator/ManifestValidatorLayout.tsx
+++ b/packages/cyberstorm/src/components/Layout/Developers/ManifestValidator/ManifestValidatorLayout.tsx
@@ -9,7 +9,7 @@ import { useState, useEffect } from "react";
 import { CodeInput } from "../../../CodeInput/CodeInput";
 import { Alert } from "../../../Alert/Alert";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faWarning } from "@fortawesome/pro-solid-svg-icons";
+import { faWarning } from "@fortawesome/free-solid-svg-icons";
 import { Select } from "../../../Select/Select";
 import { isRecord, isStringArray } from "../../../../utils/type_guards";
 import { usePromise } from "@thunderstore/use-promise";
diff --git a/packages/cyberstorm/src/components/Layout/Developers/PackageFormatDocs/PackageFormatDocsLayout.tsx b/packages/cyberstorm/src/components/Layout/Developers/PackageFormatDocs/PackageFormatDocsLayout.tsx
index 02f860414..2537a62f0 100644
--- a/packages/cyberstorm/src/components/Layout/Developers/PackageFormatDocs/PackageFormatDocsLayout.tsx
+++ b/packages/cyberstorm/src/components/Layout/Developers/PackageFormatDocs/PackageFormatDocsLayout.tsx
@@ -5,7 +5,7 @@ import { BaseLayout } from "../../BaseLayout/BaseLayout";
 import { PageHeader } from "../../BaseLayout/PageHeader/PageHeader";
 import { Table } from "../../../Table/Table";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCheck } from "@fortawesome/pro-solid-svg-icons";
+import { faCheck } from "@fortawesome/free-solid-svg-icons";
 import { CodeBox } from "../../../CodeBox/CodeBox";
 import { Icon } from "../../../Icon/Icon";
 
diff --git a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDependencyList/PackageDependencyList.tsx b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDependencyList/PackageDependencyList.tsx
index 5c820c632..f07a27e0a 100644
--- a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDependencyList/PackageDependencyList.tsx
+++ b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDependencyList/PackageDependencyList.tsx
@@ -1,5 +1,4 @@
-import { faBoxOpen } from "@fortawesome/pro-regular-svg-icons";
-import { faCaretRight } from "@fortawesome/pro-solid-svg-icons";
+import { faCaretRight, faBoxOpen } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { PackageDependency } from "@thunderstore/dapper/types";
 
diff --git a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDetailLayout.tsx b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDetailLayout.tsx
index c45c83836..939736df7 100644
--- a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDetailLayout.tsx
+++ b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageDetailLayout.tsx
@@ -1,5 +1,4 @@
 "use client";
-import { faUsers } from "@fortawesome/pro-regular-svg-icons";
 import {
   faDonate,
   faDownload,
@@ -8,10 +7,11 @@ import {
   faFlag,
   faCodeBranch,
   faFileLines,
-  faFilePlus,
-  faArrowUpRight,
+  faFileCirclePlus,
+  faArrowUpRightFromSquare,
   faBoxes,
-} from "@fortawesome/pro-solid-svg-icons";
+  faUsers,
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
@@ -89,7 +89,7 @@ export function PackageDetailLayout(props: Props) {
         <Button.Root plain colorScheme="transparentPrimary" paddingSize="small">
           <Button.ButtonLabel>{packageData.website_url}</Button.ButtonLabel>
           <Button.ButtonIcon>
-            <FontAwesomeIcon icon={faArrowUpRight} />
+            <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
           </Button.ButtonIcon>
         </Button.Root>
       </a>
@@ -154,7 +154,7 @@ export function PackageDetailLayout(props: Props) {
           <Tabs.Tab
             name="changelog"
             label="Changelog"
-            icon={faFilePlus}
+            icon={faFileCirclePlus}
             disabled={!packageData.has_changelog}
           >
             <Suspense fallback={<p>TODO</p>}>
diff --git a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageManagementForm/PackageManagementForm.tsx b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageManagementForm/PackageManagementForm.tsx
index 0143f3ad2..e5ce3572b 100644
--- a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageManagementForm/PackageManagementForm.tsx
+++ b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageManagementForm/PackageManagementForm.tsx
@@ -3,7 +3,7 @@ import { Tag } from "../../../Tag/Tag";
 import { TextInput } from "../../../TextInput/TextInput";
 import { Alert } from "../../../Alert/Alert";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleExclamation } from "@fortawesome/pro-solid-svg-icons";
+import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons";
 import { Button } from "../../../../index";
 
 export interface PackageManagementFormProps {
diff --git a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTagList/PackageTagList.tsx b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTagList/PackageTagList.tsx
index e6f3e91de..e125b9d2b 100644
--- a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTagList/PackageTagList.tsx
+++ b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTagList/PackageTagList.tsx
@@ -2,14 +2,13 @@ import styles from "./PackageTagList.module.css";
 import { PackageListingDetails } from "@thunderstore/dapper/types";
 import { WrapperCard } from "../../../WrapperCard/WrapperCard";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faTag } from "@fortawesome/pro-regular-svg-icons";
+import { faTag } from "@fortawesome/free-solid-svg-icons";
 import { Tag } from "../../../Tag/Tag";
 import {
   faThumbtack,
   faWarning,
-  faLips,
-  faSparkles,
-} from "@fortawesome/pro-solid-svg-icons";
+  faBomb,
+} from "@fortawesome/free-solid-svg-icons";
 import { ReactNode } from "react";
 
 export interface PackageTagListProps {
@@ -77,7 +76,7 @@ function getPackageFlags(packageData: PackageListingDetails) {
         label="NSFW"
         colorScheme="pink"
         size="mediumPlus"
-        leftIcon={<FontAwesomeIcon icon={faLips} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
@@ -88,7 +87,7 @@ function getPackageFlags(packageData: PackageListingDetails) {
         label="New"
         colorScheme="green"
         size="mediumPlus"
-        leftIcon={<FontAwesomeIcon icon={faSparkles} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
diff --git a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTeamMemberList/PackageTeamMemberList.tsx b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTeamMemberList/PackageTeamMemberList.tsx
index 9def2f201..ce748fb5c 100644
--- a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTeamMemberList/PackageTeamMemberList.tsx
+++ b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageTeamMemberList/PackageTeamMemberList.tsx
@@ -2,8 +2,11 @@ import styles from "./PackageTeamMemberList.module.css";
 import { TeamMember } from "@thunderstore/dapper/types";
 import { WrapperCard } from "../../../WrapperCard/WrapperCard";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faUsers } from "@fortawesome/pro-regular-svg-icons";
-import { faCaretRight, faCrown } from "@fortawesome/pro-solid-svg-icons";
+import {
+  faCaretRight,
+  faCrown,
+  faUsers,
+} from "@fortawesome/free-solid-svg-icons";
 import { CyberstormLink } from "../../../Links/Links";
 import { Icon } from "../../../Icon/Icon";
 import { Avatar } from "../../../Avatar/Avatar";
diff --git a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageVersions/PackageVersions.tsx b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageVersions/PackageVersions.tsx
index 0675e1207..1c333b6f5 100644
--- a/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageVersions/PackageVersions.tsx
+++ b/packages/cyberstorm/src/components/Layout/PackageDetailLayout/PackageVersions/PackageVersions.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons";
-import { faBoltLightning } from "@fortawesome/pro-solid-svg-icons";
+import { faBoltLightning } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
diff --git a/packages/cyberstorm/src/components/Layout/Settings/SettingsLayout.tsx b/packages/cyberstorm/src/components/Layout/Settings/SettingsLayout.tsx
index 2d2822fb1..88567dfa6 100644
--- a/packages/cyberstorm/src/components/Layout/Settings/SettingsLayout.tsx
+++ b/packages/cyberstorm/src/components/Layout/Settings/SettingsLayout.tsx
@@ -8,7 +8,7 @@ import { Connections } from "./Connections/Connections";
 import { Account } from "./Account/Account";
 import { BaseLayout } from "../BaseLayout/BaseLayout";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleNodes, faCog } from "@fortawesome/pro-regular-svg-icons";
+import { faCircleNodes, faCog } from "@fortawesome/free-solid-svg-icons";
 import { PageHeader } from "../BaseLayout/PageHeader/PageHeader";
 import { useDapper } from "@thunderstore/dapper";
 import { CurrentUser } from "@thunderstore/dapper/types";
diff --git a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamLeaveAndDisband/TeamLeaveAndDisband.tsx b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamLeaveAndDisband/TeamLeaveAndDisband.tsx
index 7c08d486d..0b92f8da6 100644
--- a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamLeaveAndDisband/TeamLeaveAndDisband.tsx
+++ b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamLeaveAndDisband/TeamLeaveAndDisband.tsx
@@ -4,10 +4,7 @@ import * as Button from "../../../../Button/";
 import { SettingItem } from "../../../../SettingItem/SettingItem";
 import { Alert, Dialog } from "../../../../..";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
-  faOctagonExclamation,
-  faTrashCan,
-} from "@fortawesome/pro-solid-svg-icons";
+import { faBomb, faTrashCan } from "@fortawesome/free-solid-svg-icons";
 import { DisbandTeamForm } from "@thunderstore/cyberstorm-forms";
 import { LeaveTeamForm } from "@thunderstore/cyberstorm-forms";
 import { useDapper } from "@thunderstore/dapper";
@@ -35,7 +32,7 @@ export function TeamLeaveAndDisband(props: Props) {
         content={
           <div className={styles.content}>
             <Alert
-              icon={<FontAwesomeIcon icon={faOctagonExclamation} />}
+              icon={<FontAwesomeIcon icon={faBomb} />}
               content={
                 "You cannot currently leave this team as you are it's last owner."
               }
@@ -76,7 +73,7 @@ export function TeamLeaveAndDisband(props: Props) {
         content={
           <div className={styles.content}>
             <Alert
-              icon={<FontAwesomeIcon icon={faOctagonExclamation} />}
+              icon={<FontAwesomeIcon icon={faBomb} />}
               content={
                 "You cannot currently disband this team as it has packages."
               }
diff --git a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMemberList.tsx b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMemberList.tsx
index 9464f0bc3..34dcbb97b 100644
--- a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMemberList.tsx
+++ b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMemberList.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { faTrashCan } from "@fortawesome/pro-solid-svg-icons";
+import { faTrashCan } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { TeamMember } from "@thunderstore/dapper/types";
 
diff --git a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMembers.tsx b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMembers.tsx
index e2bdfbe72..3378bbca6 100644
--- a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMembers.tsx
+++ b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamMembers/TeamMembers.tsx
@@ -5,7 +5,7 @@ import { TeamMemberList } from "./TeamMemberList";
 import { SettingItem } from "../../../../SettingItem/SettingItem";
 import * as Button from "../../../../Button/";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { Dialog } from "../../../../..";
 import { AddTeamMemberForm } from "@thunderstore/cyberstorm-forms";
 
diff --git a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamServiceAccounts/TeamServiceAccounts.tsx b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamServiceAccounts/TeamServiceAccounts.tsx
index 5b1902ab9..873d9d05a 100644
--- a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamServiceAccounts/TeamServiceAccounts.tsx
+++ b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamServiceAccounts/TeamServiceAccounts.tsx
@@ -3,7 +3,7 @@ import { SettingItem } from "../../../../SettingItem/SettingItem";
 import * as Button from "../../../../Button/";
 import { ServiceAccountList } from "./ServiceAccountList/ServiceAccountList";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { useDapper } from "@thunderstore/dapper";
 import { usePromise } from "@thunderstore/use-promise";
 import { Dialog } from "../../../../../index";
diff --git a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamSettingsLayout.tsx b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamSettingsLayout.tsx
index 3ab99d824..41e41d270 100644
--- a/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamSettingsLayout.tsx
+++ b/packages/cyberstorm/src/components/Layout/Teams/TeamSettings/TeamSettingsLayout.tsx
@@ -15,7 +15,7 @@ import {
   faUsers,
   faUserCog,
   faCog,
-} from "@fortawesome/pro-regular-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { TeamLeaveAndDisband } from "./TeamLeaveAndDisband/TeamLeaveAndDisband";
 
 interface Props {
diff --git a/packages/cyberstorm/src/components/Layout/Teams/TeamsLayout.tsx b/packages/cyberstorm/src/components/Layout/Teams/TeamsLayout.tsx
index 0c765aa1e..6d7a667a3 100644
--- a/packages/cyberstorm/src/components/Layout/Teams/TeamsLayout.tsx
+++ b/packages/cyberstorm/src/components/Layout/Teams/TeamsLayout.tsx
@@ -6,7 +6,7 @@ import { BaseLayout } from "../BaseLayout/BaseLayout";
 import { SettingItem } from "../../SettingItem/SettingItem";
 import * as Button from "../../Button/";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleCheck, faPlus } from "@fortawesome/pro-solid-svg-icons";
+import { faCircleCheck, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { TeamList } from "./TeamList/TeamList";
 import { Dialog } from "../../../index";
 import { PageHeader } from "../BaseLayout/PageHeader/PageHeader";
diff --git a/packages/cyberstorm/src/components/Link/Link.tsx b/packages/cyberstorm/src/components/Link/Link.tsx
index f9faa3241..d351caf24 100644
--- a/packages/cyberstorm/src/components/Link/Link.tsx
+++ b/packages/cyberstorm/src/components/Link/Link.tsx
@@ -1,6 +1,6 @@
 import styles from "./Link.module.css";
 import { ReactElement } from "react";
-import { faArrowUpRight } from "@fortawesome/pro-solid-svg-icons";
+import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Icon } from "../Icon/Icon";
 import { classnames } from "../../utils/utils";
@@ -33,7 +33,7 @@ export function Link(props: LinkProps) {
         ) : null}
         {label}
         <Icon wrapperClasses={styles.rightIcon}>
-          <FontAwesomeIcon icon={faArrowUpRight} />
+          <FontAwesomeIcon icon={faArrowUpRightFromSquare} />
         </Icon>
       </a>
     );
diff --git a/packages/cyberstorm/src/components/MultiSelectSearch/MultiSelectSearch.tsx b/packages/cyberstorm/src/components/MultiSelectSearch/MultiSelectSearch.tsx
index d54468ed9..5ecd6274b 100644
--- a/packages/cyberstorm/src/components/MultiSelectSearch/MultiSelectSearch.tsx
+++ b/packages/cyberstorm/src/components/MultiSelectSearch/MultiSelectSearch.tsx
@@ -8,7 +8,7 @@ import {
   faCaretDown,
   faCircleXmark,
   faXmark,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { isNode } from "../../utils/type_guards";
 
 export type MultiSelectSearchOption = {
diff --git a/packages/cyberstorm/src/components/PackageCard/PackageCard.tsx b/packages/cyberstorm/src/components/PackageCard/PackageCard.tsx
index 2abae3140..5b4a684fc 100644
--- a/packages/cyberstorm/src/components/PackageCard/PackageCard.tsx
+++ b/packages/cyberstorm/src/components/PackageCard/PackageCard.tsx
@@ -13,7 +13,7 @@ import { Tag } from "../Tag/Tag";
 import { classnames, formatInteger } from "../../utils/utils";
 import { PackageListing } from "@thunderstore/dapper/types";
 import { CyberstormLink } from "../Links/Links";
-import { faLips, faSparkles } from "@fortawesome/pro-solid-svg-icons";
+import { faBomb } from "@fortawesome/free-solid-svg-icons";
 
 interface Props {
   package: PackageListing;
@@ -122,7 +122,7 @@ function getPackageFlags(packageData: PackageListing) {
         key="flag_nsfw"
         label="NSFW"
         colorScheme="pink"
-        leftIcon={<FontAwesomeIcon icon={faLips} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
@@ -132,7 +132,7 @@ function getPackageFlags(packageData: PackageListing) {
         key="flag_nsfw"
         label="New"
         colorScheme="green"
-        leftIcon={<FontAwesomeIcon icon={faSparkles} />}
+        leftIcon={<FontAwesomeIcon icon={faBomb} />}
       />
     );
   }
diff --git a/packages/cyberstorm/src/components/PackageList/PackageOrder.tsx b/packages/cyberstorm/src/components/PackageList/PackageOrder.tsx
index 5d714994f..d0ef38dbb 100644
--- a/packages/cyberstorm/src/components/PackageList/PackageOrder.tsx
+++ b/packages/cyberstorm/src/components/PackageList/PackageOrder.tsx
@@ -3,7 +3,7 @@ import {
   faDownload,
   faThumbsUp,
 } from "@fortawesome/free-solid-svg-icons";
-import { faSparkles } from "@fortawesome/pro-solid-svg-icons";
+import { faBomb } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Dispatch, SetStateAction } from "react";
 
@@ -42,7 +42,7 @@ const selectOptions = [
   {
     value: PackageOrderOptions.Created,
     label: "Newest",
-    leftIcon: <FontAwesomeIcon icon={faSparkles} />,
+    leftIcon: <FontAwesomeIcon icon={faBomb} />,
   },
   {
     value: PackageOrderOptions.Downloaded,
diff --git a/packages/cyberstorm/src/components/Select/Select.tsx b/packages/cyberstorm/src/components/Select/Select.tsx
index 2607d655a..dbf877e25 100644
--- a/packages/cyberstorm/src/components/Select/Select.tsx
+++ b/packages/cyberstorm/src/components/Select/Select.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import styles from "./Select.module.css";
 import * as Button from "../Button/";
 import * as MenuItem from "../MenuItem/";
-import { faCaretDown } from "@fortawesome/pro-solid-svg-icons";
+import { faCaretDown } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { Root, Content, Item, Portal, Trigger } from "@radix-ui/react-select";
diff --git a/packages/cyberstorm/src/components/SelectSearch/SelectSearch.tsx b/packages/cyberstorm/src/components/SelectSearch/SelectSearch.tsx
index 59f8531c6..957ea2de9 100644
--- a/packages/cyberstorm/src/components/SelectSearch/SelectSearch.tsx
+++ b/packages/cyberstorm/src/components/SelectSearch/SelectSearch.tsx
@@ -8,7 +8,7 @@ import {
   faCaretDown,
   faCircleXmark,
   faXmark,
-} from "@fortawesome/pro-solid-svg-icons";
+} from "@fortawesome/free-solid-svg-icons";
 import { isNode } from "../../utils/type_guards";
 
 type Props = {
diff --git a/packages/cyberstorm/src/components/Table/Table.tsx b/packages/cyberstorm/src/components/Table/Table.tsx
index f58f3d00c..2017fe064 100644
--- a/packages/cyberstorm/src/components/Table/Table.tsx
+++ b/packages/cyberstorm/src/components/Table/Table.tsx
@@ -1,7 +1,11 @@
 "use client";
 import { CSSProperties, ReactNode, useState } from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faSort, faSortDown, faSortUp } from "@fortawesome/pro-solid-svg-icons";
+import {
+  faSort,
+  faSortDown,
+  faSortUp,
+} from "@fortawesome/free-solid-svg-icons";
 import styles from "./Table.module.css";
 import * as Button from "../Button";
 
diff --git a/packages/cyberstorm/src/components/TextInput/TextInput.tsx b/packages/cyberstorm/src/components/TextInput/TextInput.tsx
index 4b75e4d79..1a4fe607f 100644
--- a/packages/cyberstorm/src/components/TextInput/TextInput.tsx
+++ b/packages/cyberstorm/src/components/TextInput/TextInput.tsx
@@ -4,7 +4,7 @@ import styles from "./TextInput.module.css";
 import { Icon } from "../Icon/Icon";
 import { classnames } from "../../utils/utils";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/pro-solid-svg-icons";
+import { faCircleXmark } from "@fortawesome/free-solid-svg-icons";
 
 export interface TextInputProps
   extends React.ComponentPropsWithoutRef<"input"> {
diff --git a/packages/cyberstorm/src/components/Toast/Toast.tsx b/packages/cyberstorm/src/components/Toast/Toast.tsx
index 7e95f2202..c7df6f965 100644
--- a/packages/cyberstorm/src/components/Toast/Toast.tsx
+++ b/packages/cyberstorm/src/components/Toast/Toast.tsx
@@ -7,10 +7,10 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import {
   faCircleCheck,
   faCircleExclamation,
-  faOctagonExclamation,
+  faBomb,
   faTriangleExclamation,
-  faXmarkLarge,
-} from "@fortawesome/pro-solid-svg-icons";
+  faXmark,
+} from "@fortawesome/free-solid-svg-icons";
 import * as RadixToast from "@radix-ui/react-toast";
 
 export type ToastProps = {
@@ -46,7 +46,7 @@ export function Toast(props: Props) {
             aria-label="Close"
           >
             <Icon iconClasses={styles.closeIcon} inline>
-              <FontAwesomeIcon icon={faXmarkLarge} />
+              <FontAwesomeIcon icon={faXmark} />
             </Icon>
           </RadixToast.Close>
         </div>
@@ -67,7 +67,7 @@ const getStyle = (scheme: Props["variant"] = "info") => {
 const getIcon = (scheme: Props["variant"] = "info") => {
   return {
     info: <FontAwesomeIcon icon={faCircleExclamation} />,
-    danger: <FontAwesomeIcon icon={faOctagonExclamation} />,
+    danger: <FontAwesomeIcon icon={faBomb} />,
     warning: <FontAwesomeIcon icon={faTriangleExclamation} />,
     success: <FontAwesomeIcon icon={faCircleCheck} />,
   }[scheme];
diff --git a/yarn.lock b/yarn.lock
index 6ab4e1d83..8d85523fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3375,34 +3375,6 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.2.0"
 
-"@fortawesome/pro-light-svg-icons@6.2.0":
-  version "6.2.0"
-  resolved "https://npm.fontawesome.com/@fortawesome/pro-light-svg-icons/-/6.2.0/pro-light-svg-icons-6.2.0.tgz#1c9d8d244103d09e0ecd0925c17a7eebf417d372"
-  integrity sha512-eeVnICxaKXuRVDhunjEEIACkqYA9JlD7vOWq8uJGxCY2SYd5iXqBKPql/Nu+ztOWrUBPFlV5C8O8TOrgkzTN5w==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.0"
-
-"@fortawesome/pro-regular-svg-icons@6.2.0":
-  version "6.2.0"
-  resolved "https://npm.fontawesome.com/@fortawesome/pro-regular-svg-icons/-/6.2.0/pro-regular-svg-icons-6.2.0.tgz#4a7b48fa35a1b08c5d48fcc0b8f956a7b66a96a4"
-  integrity sha512-1DKWVpAgEBfUCzcgnldnkxuVGKqH57dbrNwEfdb/AsNPDUf1dAZXNjZTCvPHNOMpztcPjYzWsQNi4oZoj8EAQA==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.0"
-
-"@fortawesome/pro-solid-svg-icons@6.2.0":
-  version "6.2.0"
-  resolved "https://npm.fontawesome.com/@fortawesome/pro-solid-svg-icons/-/6.2.0/pro-solid-svg-icons-6.2.0.tgz#ba7e1d85b75576306c456a9193e2799b64dd704c"
-  integrity sha512-zYlZE6FPsIT2o70U88oMai8C4x/CZvvz5AJ2MVJjac1PtGYyKVdt83TuLq6cEAx7ku3O/JiHWPrYRNtV6c1Zyg==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.0"
-
-"@fortawesome/pro-thin-svg-icons@6.2.0":
-  version "6.2.0"
-  resolved "https://npm.fontawesome.com/@fortawesome/pro-thin-svg-icons/-/6.2.0/pro-thin-svg-icons-6.2.0.tgz#8dee11f8f8b72772fbcb7ce619e4d8db1dd7810e"
-  integrity sha512-d0HX+xUsaLgTeSeX40Mivygz9A/JInakX1wUaHFJOL4dszBmAe50yQDHjrvVIgYfcpsIVQTZmhavXSReRMgEjw==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.0"
-
 "@fortawesome/react-fontawesome@^0.2.0":
   version "0.2.0"
   resolved "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz"