diff --git a/src/common/ShlinkVersions.tsx b/src/common/ShlinkVersions.tsx
index 38a3a4aa..d19f9291 100644
--- a/src/common/ShlinkVersions.tsx
+++ b/src/common/ShlinkVersions.tsx
@@ -12,7 +12,7 @@ export interface ShlinkVersionsProps {
 }
 
 const VersionLink = ({ project, version }: { project: 'shlink' | 'shlink-web-client'; version: string }) => (
-  <ExternalLink href={`https://github.com/shlinkio/${project}/releases/${version}`} className="text-muted">
+  <ExternalLink href={`https://github.com/shlinkio/${project}/releases/${version}`} className="tw:text-gray-500">
     <b>{version}</b>
   </ExternalLink>
 );
@@ -21,7 +21,7 @@ export const ShlinkVersions = ({ selectedServer, clientVersion = SHLINK_WEB_CLIE
   const normalizedClientVersion = normalizeVersion(clientVersion);
 
   return (
-    <small className="text-muted">
+    <small className="tw:text-gray-500">
       {isReachableServer(selectedServer) && (
         <>Server: <VersionLink project="shlink" version={selectedServer.printableVersion} /> - </>
       )}
diff --git a/src/common/ShlinkVersionsContainer.tsx b/src/common/ShlinkVersionsContainer.tsx
index 18e1a680..03f60878 100644
--- a/src/common/ShlinkVersionsContainer.tsx
+++ b/src/common/ShlinkVersionsContainer.tsx
@@ -9,7 +9,7 @@ export type ShlinkVersionsContainerProps = {
 
 export const ShlinkVersionsContainer = ({ selectedServer }: ShlinkVersionsContainerProps) => (
   <div
-    className={clsx('text-center', { 'tw:md:ml-(--aside-menu-width)': isReachableServer(selectedServer) })}
+    className={clsx('tw:text-center', { 'tw:md:ml-(--aside-menu-width)': isReachableServer(selectedServer) })}
   >
     <ShlinkVersions selectedServer={selectedServer} />
   </div>
diff --git a/src/servers/DeleteServerButton.tsx b/src/servers/DeleteServerButton.tsx
index 78cb7004..e362d6fb 100644
--- a/src/servers/DeleteServerButton.tsx
+++ b/src/servers/DeleteServerButton.tsx
@@ -1,7 +1,4 @@
-import { faMinusCircle as deleteIcon } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useToggle } from '@shlinkio/shlink-frontend-kit';
-import { clsx } from 'clsx';
 import type { FC, PropsWithChildren } from 'react';
 import { useCallback } from 'react';
 import { useNavigate } from 'react-router';
@@ -12,17 +9,13 @@ import type { DeleteServerModalProps } from './DeleteServerModal';
 
 export type DeleteServerButtonProps = PropsWithChildren<{
   server: ServerWithId;
-  className?: string;
-  textClassName?: string;
 }>;
 
 type DeleteServerButtonDeps = {
   DeleteServerModal: FC<DeleteServerModalProps>;
 };
 
-const DeleteServerButton: FCWithDeps<DeleteServerButtonProps, DeleteServerButtonDeps> = (
-  { server, className, children, textClassName },
-) => {
+const DeleteServerButton: FCWithDeps<DeleteServerButtonProps, DeleteServerButtonDeps> = ({ server, children }) => {
   const { DeleteServerModal } = useDependencies(DeleteServerButton);
   const [isModalOpen, , showModal, hideModal] = useToggle();
   const navigate = useNavigate();
@@ -35,11 +28,9 @@ const DeleteServerButton: FCWithDeps<DeleteServerButtonProps, DeleteServerButton
 
   return (
     <>
-      <button type="button" className={clsx(className, 'p-0 bg-transparent border-0')} onClick={showModal}>
-        {!children && <FontAwesomeIcon fixedWidth icon={deleteIcon} />}
-        <span className={textClassName}>{children ?? 'Remove this server'}</span>
+      <button type="button" className="tw:text-danger tw:hover:underline" onClick={showModal}>
+        {children}
       </button>
-
       <DeleteServerModal server={server} open={isModalOpen} onClose={onClose} />
     </>
   );
diff --git a/src/servers/helpers/ServerError.tsx b/src/servers/helpers/ServerError.tsx
index c95b39a3..a1bdd87b 100644
--- a/src/servers/helpers/ServerError.tsx
+++ b/src/servers/helpers/ServerError.tsx
@@ -45,7 +45,7 @@ const ServerError: FCWithDeps<ServerErrorProps, ServerErrorDeps> = ({ servers, s
         {isServerWithId(selectedServer) && (
           <p className="tw:text-xl">
             Alternatively, if you think you may have misconfigured this server, you
-            can <DeleteServerButton server={selectedServer} className="tw:text-danger tw:hover:underline">remove
+            can <DeleteServerButton server={selectedServer}>remove
               it</DeleteServerButton> or&nbsp;
             <Link to={`/server/${selectedServer.id}/edit?reconnect=true`}>edit it</Link>.
           </p>
diff --git a/test/servers/DeleteServerButton.test.tsx b/test/servers/DeleteServerButton.test.tsx
index 9c7eee7b..fce035cb 100644
--- a/test/servers/DeleteServerButton.test.tsx
+++ b/test/servers/DeleteServerButton.test.tsx
@@ -13,11 +13,11 @@ describe('<DeleteServerButton />', () => {
   const DeleteServerButton = DeleteServerButtonFactory(fromPartial({
     DeleteServerModal: (props: DeleteServerModalProps) => <DeleteServerModal {...props} deleteServer={vi.fn()} />,
   }));
-  const setUp = (children?: ReactNode) => {
+  const setUp = (children: ReactNode = 'Remove this server') => {
     const history = createMemoryHistory({ initialEntries: ['/foo'] });
     const result = renderWithEvents(
       <Router location={history.location} navigator={history}>
-        <DeleteServerButton server={fromPartial({})} textClassName="button">{children}</DeleteServerButton>
+        <DeleteServerButton server={fromPartial({})}>{children}</DeleteServerButton>
       </Router>,
     );
 
@@ -30,7 +30,6 @@ describe('<DeleteServerButton />', () => {
     ['Foo bar'],
     ['baz'],
     ['something'],
-    [undefined],
   ])('renders expected content', (children) => {
     const { container } = setUp(children);
     expect(container.firstChild).toBeTruthy();
diff --git a/test/servers/__snapshots__/DeleteServerButton.test.tsx.snap b/test/servers/__snapshots__/DeleteServerButton.test.tsx.snap
index 7d21e6cd..c012b222 100644
--- a/test/servers/__snapshots__/DeleteServerButton.test.tsx.snap
+++ b/test/servers/__snapshots__/DeleteServerButton.test.tsx.snap
@@ -2,67 +2,27 @@
 
 exports[`<DeleteServerButton /> > renders expected content 1`] = `
 <button
-  class="p-0 bg-transparent border-0"
+  class="tw:text-danger tw:hover:underline"
   type="button"
 >
-  <span
-    class="button"
-  >
-    Foo bar
-  </span>
+  Foo bar
 </button>
 `;
 
 exports[`<DeleteServerButton /> > renders expected content 2`] = `
 <button
-  class="p-0 bg-transparent border-0"
+  class="tw:text-danger tw:hover:underline"
   type="button"
 >
-  <span
-    class="button"
-  >
-    baz
-  </span>
+  baz
 </button>
 `;
 
 exports[`<DeleteServerButton /> > renders expected content 3`] = `
 <button
-  class="p-0 bg-transparent border-0"
+  class="tw:text-danger tw:hover:underline"
   type="button"
 >
-  <span
-    class="button"
-  >
-    something
-  </span>
-</button>
-`;
-
-exports[`<DeleteServerButton /> > renders expected content 4`] = `
-<button
-  class="p-0 bg-transparent border-0"
-  type="button"
->
-  <svg
-    aria-hidden="true"
-    class="svg-inline--fa fa-circle-minus fa-fw "
-    data-icon="circle-minus"
-    data-prefix="fas"
-    focusable="false"
-    role="img"
-    viewBox="0 0 512 512"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM184 232l144 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-144 0c-13.3 0-24-10.7-24-24s10.7-24 24-24z"
-      fill="currentColor"
-    />
-  </svg>
-  <span
-    class="button"
-  >
-    Remove this server
-  </span>
+  something
 </button>
 `;