diff --git a/src/components/cards/providers/AppStore.tsx b/src/components/cards/providers/AppStore.tsx
index 6fbd6b7..3da1ab6 100644
--- a/src/components/cards/providers/AppStore.tsx
+++ b/src/components/cards/providers/AppStore.tsx
@@ -1,14 +1,15 @@
 import useFetch from 'fetch-suspense';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { FaAppStore, FaInfoCircle } from 'react-icons/fa';
+import { FaInfoCircle } from 'react-icons/fa';
+import { SiAppstore } from 'react-icons/si';
 import { Card, Result } from '../core';
 
 const Search: React.FC<{ query: string }> = ({ query }) => {
   const { t } = useTranslation();
   const term = encodeURIComponent(query);
   const response = useFetch(
-    `/availability/appstore/${term}?country=${t('countryCode')}`
+    `/api/services/appstore/${term}?country=${t('countryCode')}`
   ) as {
     result: Array<{ name: string; viewURL: string; price: number; id: string }>;
   };
@@ -22,7 +23,7 @@ const Search: React.FC<{ query: string }> = ({ query }) => {
             title={app.name.split(/[－–—\-:]/)[0]}
             message={`Price: ${app.price}`}
             link={app.viewURL}
-            icon={<FaAppStore />}
+            icon={<SiAppstore />}
             key={app.id}
           />
         ))
diff --git a/src/components/cards/providers/Cratesio.tsx b/src/components/cards/providers/Cratesio.tsx
index d602e01..e8ecc79 100644
--- a/src/components/cards/providers/Cratesio.tsx
+++ b/src/components/cards/providers/Cratesio.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { DiRust } from 'react-icons/di';
+import { SiRust } from 'react-icons/si';
 import { Card, DedicatedAvailability, Repeater } from '../core';
 
 const CratesioCard: React.FC<{ query: string }> = ({ query }) => {
@@ -19,7 +19,7 @@ const CratesioCard: React.FC<{ query: string }> = ({ query }) => {
             service="existence"
             link={`https://crates.io/crates/${name}`}
             message="Go to crates.io"
-            icon={<DiRust />}
+            icon={<SiRust />}
           />
         )}
       </Repeater>
diff --git a/src/components/cards/providers/Firebase.tsx b/src/components/cards/providers/Firebase.tsx
index 1618c1f..9013642 100644
--- a/src/components/cards/providers/Firebase.tsx
+++ b/src/components/cards/providers/Firebase.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { DiFirebase } from 'react-icons/di';
-
-import { Card, Repeater, DedicatedAvailability } from '../core';
+import { SiFirebase } from 'react-icons/si';
+import { Card, DedicatedAvailability, Repeater } from '../core';
 
 const FirebaseCard: React.FC<{ query: string }> = ({ query }) => {
   const { t } = useTranslation();
@@ -24,7 +23,7 @@ const FirebaseCard: React.FC<{ query: string }> = ({ query }) => {
             service="existence"
             message="Go to Firebase"
             link={`https://${name}.firebaseio.com/`}
-            icon={<DiFirebase />}
+            icon={<SiFirebase />}
           />
         )}
       </Repeater>
diff --git a/src/components/cards/providers/GitHubSearch.tsx b/src/components/cards/providers/GitHubSearch.tsx
index 6edbfb5..8897b9d 100644
--- a/src/components/cards/providers/GitHubSearch.tsx
+++ b/src/components/cards/providers/GitHubSearch.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import useFetch from 'fetch-suspense';
 import { useTranslation } from 'react-i18next';
-import { FaGithub, FaInfoCircle } from 'react-icons/fa';
+import { FaGithubAlt, FaInfoCircle } from 'react-icons/fa';
 
 import { Card, Result } from '../core';
 
@@ -32,7 +32,7 @@ const Search: React.FC<{ query: string }> = ({ query }) => {
               repo.stargazers_count
             })`}
             link={repo.html_url}
-            icon={<FaGithub />}
+            icon={<FaGithubAlt />}
             key={repo.id}
           />
         ))
diff --git a/src/components/cards/providers/Linux.tsx b/src/components/cards/providers/Linux.tsx
index 236ff09..b46feba 100644
--- a/src/components/cards/providers/Linux.tsx
+++ b/src/components/cards/providers/Linux.tsx
@@ -1,9 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { DiUbuntu } from 'react-icons/di';
-import { DiDebian } from 'react-icons/di';
-
-import { Card, Repeater, DedicatedAvailability } from '../core';
+import { SiDebian, SiUbuntu } from 'react-icons/si';
+import { Card, DedicatedAvailability, Repeater } from '../core';
 
 const LinuxCard: React.FC<{ query: string }> = ({ query }) => {
   const { t } = useTranslation();
@@ -21,14 +19,14 @@ const LinuxCard: React.FC<{ query: string }> = ({ query }) => {
               service="launchpad"
               message="Go to Launchpad"
               link={`https://launchpad.net/ubuntu/+source/${name}`}
-              icon={<DiUbuntu />}
+              icon={<SiUbuntu />}
             />
             <DedicatedAvailability
               name={name}
               service="debian"
               message="Go to debian.org"
               link={`https://packages.debian.org/buster/${name}`}
-              icon={<DiDebian />}
+              icon={<SiDebian />}
             />
           </>
         )}
diff --git a/src/components/cards/providers/Npm.tsx b/src/components/cards/providers/Npm.tsx
index b4352ac..264ebb7 100644
--- a/src/components/cards/providers/Npm.tsx
+++ b/src/components/cards/providers/Npm.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { FaNpm } from 'react-icons/fa';
-
-import { Card, Repeater, DedicatedAvailability } from '../core';
+import { RiNpmjsFill, RiNpmjsLine } from 'react-icons/ri';
+import { Card, DedicatedAvailability, Repeater } from '../core';
 
 const NpmCard: React.FC<{ query: string }> = ({ query }) => {
   const { t } = useTranslation();
@@ -23,7 +22,7 @@ const NpmCard: React.FC<{ query: string }> = ({ query }) => {
               link={`https://www.npmjs.com/package/${name}`}
               messageIfTaken={`See ${name}`}
               linkIfTaken={`https://www.npmjs.com/package/${name}`}
-              icon={<FaNpm />}
+              icon={<RiNpmjsFill />}
             />
             <DedicatedAvailability
               name={name}
@@ -34,7 +33,7 @@ const NpmCard: React.FC<{ query: string }> = ({ query }) => {
               linkIfTaken={`https://www.npmjs.com/org/${name}`}
               prefix="@"
               suffix=" (Organization)"
-              icon={<FaNpm />}
+              icon={<RiNpmjsLine />}
             />
           </>
         )}
diff --git a/src/components/cards/providers/RubyGems.tsx b/src/components/cards/providers/RubyGems.tsx
index a291eb6..e470b06 100644
--- a/src/components/cards/providers/RubyGems.tsx
+++ b/src/components/cards/providers/RubyGems.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { FaGem } from 'react-icons/fa';
-
-import { Card, Repeater, DedicatedAvailability } from '../core';
+import { SiRubygems } from 'react-icons/si';
+import { Card, DedicatedAvailability, Repeater } from '../core';
 
 const RubyGemsCard: React.FC<{ query: string }> = ({ query }) => {
   const { t } = useTranslation();
@@ -20,7 +19,7 @@ const RubyGemsCard: React.FC<{ query: string }> = ({ query }) => {
             service="existence"
             message="Go to RubyGems"
             link={`https://rubygems.org/gems/${name}`}
-            icon={<FaGem />}
+            icon={<SiRubygems />}
           />
         )}
       </Repeater>