diff --git a/scm-ui/ui-buttons/.storybook/index.css b/scm-ui/ui-buttons/.storybook/index.css
deleted file mode 100644
index 903dbfaa56..0000000000
--- a/scm-ui/ui-buttons/.storybook/index.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
diff --git a/scm-ui/ui-buttons/.storybook/main.js b/scm-ui/ui-buttons/.storybook/main.js
index dd8037ff73..f5e456bcaa 100644
--- a/scm-ui/ui-buttons/.storybook/main.js
+++ b/scm-ui/ui-buttons/.storybook/main.js
@@ -76,24 +76,6 @@ module.exports = {
       use: [MiniCssExtractPlugin.loader, "css-loader", "sass-loader"],
     });
 
-    config.module.rules.push({
-      test: /\.css$/,
-      use: [
-        {
-          loader: "postcss-loader",
-          options: {
-            postcssOptions: {
-              plugins: {
-                tailwindcss: { config: require("./tailwind.config") },
-                autoprefixer: {},
-              },
-            },
-          },
-        },
-      ],
-      include: path.resolve(__dirname, "../"),
-    });
-
     // the html-webpack-plugin adds the generated css and js files to the iframe,
     // which overrides our manually loaded css files.
     // So we use a custom plugin which uses a hook of html-webpack-plugin
diff --git a/scm-ui/ui-buttons/.storybook/preview.js b/scm-ui/ui-buttons/.storybook/preview.js
index fb70b7769b..cf888b6ecb 100644
--- a/scm-ui/ui-buttons/.storybook/preview.js
+++ b/scm-ui/ui-buttons/.storybook/preview.js
@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-import "./index.css";
-
 import i18next from "i18next";
 import { initReactI18next } from "react-i18next";
 import { withI18next } from "storybook-addon-i18next";
diff --git a/scm-ui/ui-buttons/.storybook/tailwind.config.js b/scm-ui/ui-buttons/.storybook/tailwind.config.js
deleted file mode 100644
index 165f3fef58..0000000000
--- a/scm-ui/ui-buttons/.storybook/tailwind.config.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-const path = require("path");
-
-module.exports = {
-  presets: [
-    // eslint-disable-next-line global-require,import/no-extraneous-dependencies
-    require("@scm-manager/ui-scripts/src/tailwind.config"),
-  ],
-  content: [path.join(__dirname, "../{src,docs}/**/*.{tsx,mdx}")],
-};
diff --git a/scm-ui/ui-buttons/README.md b/scm-ui/ui-buttons/README.md
new file mode 100644
index 0000000000..8be9d65a53
--- /dev/null
+++ b/scm-ui/ui-buttons/README.md
@@ -0,0 +1,3 @@
+## Bulma
+
+See Bulma element: https://bulma.io/documentation/elements/button
diff --git a/scm-ui/ui-buttons/docs/introduction.stories.mdx b/scm-ui/ui-buttons/docs/introduction.stories.mdx
index bae9510291..9100cec680 100644
--- a/scm-ui/ui-buttons/docs/introduction.stories.mdx
+++ b/scm-ui/ui-buttons/docs/introduction.stories.mdx
@@ -35,22 +35,22 @@ There are four variants available to each of the three button types, varying in
   <tbody>
   <tr>
     <td>Very High</td>
-    <td><Button variant="signal" className="w-full">Signal</Button></td>
+    <td><Button variant="signal">Signal</Button></td>
     <td>Destructive actions</td>
   </tr>
   <tr>
     <td>High</td>
-    <td><Button variant="primary" className="w-full">Primary</Button></td>
+    <td><Button variant="primary">Primary</Button></td>
     <td>Form submit</td>
   </tr>
   <tr>
     <td>Normal</td>
-    <td><Button variant="secondary" className="w-full">Secondary</Button></td>
+    <td><Button variant="secondary">Secondary</Button></td>
     <td>Cancel action in dialog</td>
   </tr>
   <tr>
     <td>Low</td>
-    <td><Button variant="tertiary" className="w-full">Tertiary</Button></td>
+    <td><Button variant="tertiary">Tertiary</Button></td>
     <td>Circumstantially relevant action on page with many actionable elements</td>
   </tr>
   </tbody>
diff --git a/scm-ui/ui-buttons/docs/usage.stories.mdx b/scm-ui/ui-buttons/docs/usage.stories.mdx
index 79057e1b02..f4cfacfc40 100644
--- a/scm-ui/ui-buttons/docs/usage.stories.mdx
+++ b/scm-ui/ui-buttons/docs/usage.stories.mdx
@@ -11,10 +11,10 @@ Aborting is always the secondary action, confirmation always the primary.
 Focus is always on the cancelling action.
 
 <Story name="Confirmation Dialog">
-  <div className="max-w-2xl rounded border p-4">
-    <h4 className="mb-2 font-bold">Delete User</h4>
+  <div>
+    <h4>Delete User</h4>
     <p>Do you really want to delete this user ?</p>
-    <div className="flex justify-end gap-2">
+    <div>
       <Button variant="secondary">Cancel</Button>
       <Button variant="primary">Delete</Button>
     </div>
diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json
index 40ec98fc1c..8d1d5eac33 100644
--- a/scm-ui/ui-buttons/package.json
+++ b/scm-ui/ui-buttons/package.json
@@ -17,7 +17,7 @@
     "build-storybook": "build-storybook",
     "image-snapshots": "jest \"image-snapshot.test.ts\"",
     "a11y-check": "jest \"a11y.test.ts\"",
-    "depcheck": "depcheck --ignores=@scm-manager/prettier-config,@scm-manager/tsconfig,@babel/core,sass-loader,autoprefixer,babel-loader,postcss-loader,tailwindcss,storybook-addon-*,@storybook/*,webpack"
+    "depcheck": "depcheck --ignores=@scm-manager/prettier-config,@scm-manager/tsconfig,@babel/core,sass-loader,autoprefixer,babel-loader,postcss-loader,storybook-addon-*,@storybook/*,webpack"
   },
   "peerDependencies": {
     "react": "^17.0.1",
@@ -26,8 +26,6 @@
     "classnames": "^2.2.6"
   },
   "devDependencies": {
-    "@scm-manager/ui-scripts": "2.38.2-SNAPSHOT",
-    "@scm-manager/ui-styles": "2.38.2-SNAPSHOT",
     "@scm-manager/ui-api": "2.38.2-SNAPSHOT",
     "@scm-manager/eslint-config": "^2.16.0",
     "@babel/core": "^7.17.8",
@@ -53,7 +51,6 @@
     "babel-loader": "^8.2.4",
     "postcss": "^8.4.12",
     "postcss-loader": "^6.2.1",
-    "tailwindcss": "^3.0.23",
     "webpack": "5",
     "tsup": "^6.1.2",
     "mini-css-extract-plugin": "^1.6.2",
@@ -82,4 +79,4 @@
   "publishConfig": {
     "access": "restricted"
   }
-}
\ No newline at end of file
+}
diff --git a/scm-ui/ui-buttons/postcss.config.js b/scm-ui/ui-buttons/postcss.config.js
deleted file mode 100644
index 14a7a4674d..0000000000
--- a/scm-ui/ui-buttons/postcss.config.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};
diff --git a/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-dark-states-1-snap.png b/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-dark-states-1-snap.png
deleted file mode 100644
index f9ebfc3806..0000000000
Binary files a/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-dark-states-1-snap.png and /dev/null differ
diff --git a/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-high-contrast-states-1-snap.png b/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-high-contrast-states-1-snap.png
deleted file mode 100644
index f2291e4d0a..0000000000
Binary files a/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-high-contrast-states-1-snap.png and /dev/null differ
diff --git a/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-light-states-1-snap.png b/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-light-states-1-snap.png
deleted file mode 100644
index 4b14c63bb5..0000000000
Binary files a/scm-ui/ui-buttons/src/__image_snapshots__/image-snapshot-test-ts-image-snapshots-tests-light-states-1-snap.png and /dev/null differ
diff --git a/scm-ui/ui-buttons/src/button.test.stories.mdx b/scm-ui/ui-buttons/src/button.test.stories.mdx
index 83a22a4f4a..015b24e6c4 100644
--- a/scm-ui/ui-buttons/src/button.test.stories.mdx
+++ b/scm-ui/ui-buttons/src/button.test.stories.mdx
@@ -13,7 +13,7 @@ import { Button, ButtonVariantList } from "./button";
     default: 'light',
   },
 }}>
-  <table className="border-separate border-spacing-4">
+  <table>
     <tr>
       <th>STATE</th>
       {ButtonVariantList.map(variant => <th>{variant.toUpperCase()}</th>)}
@@ -36,7 +36,7 @@ import { Button, ButtonVariantList } from "./button";
     default: 'dark',
   },
 }}>
-  <table className="border-separate border-spacing-4">
+  <table>
     <tr>
       <th>STATE</th>
       {ButtonVariantList.map(variant => <th>{variant.toUpperCase()}</th>)}
@@ -59,7 +59,7 @@ import { Button, ButtonVariantList } from "./button";
     default: 'highcontrast',
   },
 }}>
-  <table className="border-separate border-spacing-4">
+  <table>
     <tr>
       <th>STATE</th>
       {ButtonVariantList.map(variant => <th>{variant.toUpperCase()}</th>)}
diff --git a/scm-ui/ui-buttons/src/button.tsx b/scm-ui/ui-buttons/src/button.tsx
index 8796a4113f..cc0c79d1b4 100644
--- a/scm-ui/ui-buttons/src/button.tsx
+++ b/scm-ui/ui-buttons/src/button.tsx
@@ -37,32 +37,12 @@ export const ButtonVariantList = Object.values(ButtonVariants);
 
 type ButtonVariant = typeof ButtonVariants[keyof typeof ButtonVariants];
 
-const BASE_BUTTON_CLASSES = classNames(
-  "inline-block whitespace-nowrap rounded border py-2 px-6 text-center font-semibold focus:z-10 focus:outline focus:outline-offset-2 focus:outline-purple-500 disabled:cursor-not-allowed"
-);
-const DEFAULT_BUTTON_CLASSES = classNames(
-  "border-gray-200 hover:border-gray-400 active:shadow-inner disabled:hover:border-gray-200 disabled:active:shadow-none"
-);
-const PRIMARY_BUTTON_CLASSES = classNames(
-  "border-transparent bg-primary text-primary-contrast hover:bg-primary-hover active:bg-primary-active disabled:bg-primary-disabled disabled:text-primary-disabled-contrast "
-);
-const SECONDARY_BUTTON_CLASSES = classNames(
-  "border-primary text-primary hover:border-primary-hover hover:text-primary-hover active:border-primary-active active:text-primary-active disabled:border-primary-disabled disabled:text-primary-disabled"
-);
-const TERTIARY_BUTTON_CLASSES = classNames(
-  "border-transparent text-primary hover:text-primary-hover active:text-primary-active disabled:text-primary-disabled"
-);
-const SIGNAL_BUTTON_CLASSES = classNames(
-  "border-transparent bg-signal text-signal-contrast hover:bg-signal-hover hover:text-signal-hover-contrast active:bg-signal-active active:text-signal-active-contrast disabled:bg-signal-disabled disabled:text-signal-disabled-contrast"
-);
-
 const createButtonClasses = (variant?: ButtonVariant) =>
-  classNames(BASE_BUTTON_CLASSES, {
-    [DEFAULT_BUTTON_CLASSES]: !variant,
-    [PRIMARY_BUTTON_CLASSES]: variant === "primary",
-    [SECONDARY_BUTTON_CLASSES]: variant === "secondary",
-    [TERTIARY_BUTTON_CLASSES]: variant === "tertiary",
-    [SIGNAL_BUTTON_CLASSES]: variant === "signal",
+  classNames("button", {
+    "is-primary": variant === "primary",
+    "is-primary is-outlined": variant === "secondary",
+    "is-primary is-inverted": variant === "tertiary",
+    "is-warning": variant === "signal",
   });
 
 type BaseButtonProps = {
diff --git a/scm-ui/ui-buttons/src/index.css b/scm-ui/ui-buttons/src/index.css
deleted file mode 100644
index 7332595077..0000000000
--- a/scm-ui/ui-buttons/src/index.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-@tailwind components;
-@tailwind utilities;
diff --git a/scm-ui/ui-buttons/src/index.ts b/scm-ui/ui-buttons/src/index.ts
index be546f0875..af2328da83 100644
--- a/scm-ui/ui-buttons/src/index.ts
+++ b/scm-ui/ui-buttons/src/index.ts
@@ -22,6 +22,4 @@
  * SOFTWARE.
  */
 
-import "./index.css";
-
 export { Button, LinkButton, ExternalLinkButton, ButtonVariants } from "./button";
diff --git a/scm-ui/ui-buttons/tailwind.config.js b/scm-ui/ui-buttons/tailwind.config.js
deleted file mode 100644
index 5801157821..0000000000
--- a/scm-ui/ui-buttons/tailwind.config.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-const path = require("path");
-
-module.exports = {
-  presets: [
-    // eslint-disable-next-line global-require,import/no-extraneous-dependencies
-    require("@scm-manager/ui-styles/src/tailwind.config.preset"),
-  ],
-  content: [path.join(__dirname, "src/**/*.tsx")],
-  important: true,
-};
diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json
index f262950507..00cbda6e0d 100644
--- a/scm-ui/ui-scripts/package.json
+++ b/scm-ui/ui-scripts/package.json
@@ -25,13 +25,11 @@
     "webpack": "^5.60.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.4.0",
-    "tailwindcss": "^3.0.23",
     "postcss": "^8.4.12",
     "postcss-loader": "^6.2.1",
     "autoprefixer": "^10.4.4"
   },
   "devDependencies": {
-    "@scm-manager/ui-styles": "2.38.2-SNAPSHOT",
     "@scm-manager/babel-preset": "^2.13.1",
     "@scm-manager/eslint-config": "^2.16.0",
     "@scm-manager/prettier-config": "^2.10.1",
@@ -46,4 +44,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
\ No newline at end of file
+}
diff --git a/scm-ui/ui-scripts/src/tailwind.config.js b/scm-ui/ui-scripts/src/tailwind.config.js
deleted file mode 100644
index 9cff584986..0000000000
--- a/scm-ui/ui-scripts/src/tailwind.config.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-const path = require("path");
-
-const root = path.resolve(process.cwd(), "scm-ui");
-
-const sizes = [0, 1, 2, 3, 4, 5, 6, "auto"];
-const helpers = ["m", "p"];
-const variants = ["", "x", "y", "t", "r", "l", "b"];
-const bulmaHelpers = helpers
-  .map((helper) => sizes.map((size) => variants.map((variant) => `${helper}${variant}-${size}`)))
-  .flat(3);
-
-module.exports = {
-  // eslint-disable-next-line global-require
-  presets: [require("@scm-manager/ui-styles/src/tailwind.config.preset")],
-  content: [path.join(root, "ui-webapp", "src", "**", "*.tsx")],
-  safelist: bulmaHelpers,
-};
diff --git a/scm-ui/ui-scripts/src/tailwind.css b/scm-ui/ui-scripts/src/tailwind.css
deleted file mode 100644
index 903dbfaa56..0000000000
--- a/scm-ui/ui-scripts/src/tailwind.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
diff --git a/scm-ui/ui-scripts/src/webpack.config.js b/scm-ui/ui-scripts/src/webpack.config.js
index 31eb3cd79a..2a11f16a55 100644
--- a/scm-ui/ui-scripts/src/webpack.config.js
+++ b/scm-ui/ui-scripts/src/webpack.config.js
@@ -33,13 +33,7 @@ const isDevelopment = process.env.NODE_ENV === "development";
 const root = path.resolve(process.cwd(), "..");
 
 const babelPlugins = [];
-const webpackPlugins = [
-  new MiniCssExtractPlugin({
-    filename: "webapp.tailwind.css",
-    chunkFilename: "webapp.tailwind.css",
-    ignoreOrder: false,
-  }),
-];
+const webpackPlugins = [];
 
 if (process.env.ANALYZE_BUNDLES === "true") {
   // it is ok to use require here, because we want to load the package conditionally
@@ -87,8 +81,7 @@ module.exports = [
         path.resolve(__dirname, "webpack-public-path.js"),
         // enable async/await
         "regenerator-runtime/runtime",
-        "./ui-webapp/src/index.tsx",
-        "./ui-scripts/src/tailwind.css",
+        "./ui-webapp/src/index.tsx"
       ],
     },
     devtool: "eval-cheap-module-source-map",
@@ -108,40 +101,8 @@ module.exports = [
             },
           ],
         },
-        {
-          test: /tailwind\.css$/i,
-          exclude: /node_modules/,
-          use: [
-            {
-              loader: MiniCssExtractPlugin.loader,
-            },
-            {
-              loader: "css-loader",
-              options: {
-                importLoaders: 1,
-              },
-            },
-            {
-              loader: "postcss-loader",
-              options: {
-                postcssOptions: {
-                  plugins: [
-                    [
-                      "tailwindcss",
-                      {
-                        config: path.join(root, "ui-scripts", "src", "tailwind.config.js"),
-                      },
-                    ],
-                    ["autoprefixer", {}],
-                  ],
-                },
-              },
-            },
-          ],
-        },
         {
           test: /\.(css|scss|sass)$/i,
-          exclude: /tailwind\.css$/i,
           use: [
             // Creates `style` nodes from JS strings
             "style-loader",
diff --git a/scm-ui/ui-styles/src/dark.scss b/scm-ui/ui-styles/src/dark.scss
index c279d33765..1fae461050 100644
--- a/scm-ui/ui-styles/src/dark.scss
+++ b/scm-ui/ui-styles/src/dark.scss
@@ -229,23 +229,6 @@ $danger-25: scale-color($danger, $lightness: -75%);
   --diff-code-delete-edit-background-color: #{desaturate(#000, 20%)};
   --diff-code-selected-background-color: #{desaturate(#fffce0, 20%)};
   --diff-omit-gutter-line-color: #cb2a1d;
-
-  // Tailwind
-  --scm-primary-contrast-color: #{lighten($text-strong, 2.5%)};
-  --scm-primary-hover-color: #{darken($primary, 5%)};
-  --scm-primary-hover-contrast-color: #{lighten($text-strong, 2.5%)};
-  --scm-primary-active-color: #{darken($primary, 10%)};
-  --scm-primary-active-contrast-color: #{lighten($text-strong, 2.5%)};
-  --scm-primary-disabled-color: #{rgba($primary, 0.5)};
-  --scm-primary-disabled-contrast-color: #{rgba(lighten($text-strong, 2.5%), 0.5)};
-
-  --scm-warning-contrast-color: #88550D;
-  --scm-warning-hover-contrast-color: #{rgba(0,0,0,0.7)};
-  --scm-warning-hover-color: #{darken($warning, 10%)};
-  --scm-warning-active-color: #{darken($warning, 20%)};
-  --scm-warning-active-contrast-color: #{rgba(0,0,0,0.7)};
-  --scm-warning-disabled-color: #{rgba($warning, 0.5)};
-  --scm-warning-disabled-contrast-color: #{rgba(0,0,0,0.7)};
 }
 
 .menu-list {
diff --git a/scm-ui/ui-styles/src/highcontrast.scss b/scm-ui/ui-styles/src/highcontrast.scss
index 49b7bddf4d..530706d4d0 100644
--- a/scm-ui/ui-styles/src/highcontrast.scss
+++ b/scm-ui/ui-styles/src/highcontrast.scss
@@ -127,23 +127,6 @@ $tooltip-color: $scheme-main;
   --diff-code-delete-edit-background-color: #000;
   --diff-code-selected-background-color: #fffce0;
   --diff-omit-gutter-line-color: #cb2a1d;
-
-  // Tailwind
-  --scm-primary-contrast-color: #{$black-ter};
-  --scm-primary-hover-color: #{darken($primary, 5%)};
-  --scm-primary-hover-contrast-color: #{$black-ter};
-  --scm-primary-active-color: #{darken($primary, 10%)};
-  --scm-primary-active-contrast-color: #{$black-ter};
-  --scm-primary-disabled-color: #006970;
-  --scm-primary-disabled-contrast-color: #{$black-ter};
-
-  --scm-warning-contrast-color: #{rgba(0,0,0,0.7)};
-  --scm-warning-hover-contrast-color: #{rgba(0,0,0,0.7)};
-  --scm-warning-hover-color: #{darken($warning, 5%)};
-  --scm-warning-active-color: #{darken($warning, 10%)};
-  --scm-warning-active-contrast-color: #{rgba(0,0,0,0.7)};
-  --scm-warning-disabled-color: #{darken($warning, 50%)};
-  --scm-warning-disabled-contrast-color: #{rgba(0,0,0,0.7)};
 }
 
 .button {
diff --git a/scm-ui/ui-styles/src/light.scss b/scm-ui/ui-styles/src/light.scss
index fc70db4854..fe662578bb 100644
--- a/scm-ui/ui-styles/src/light.scss
+++ b/scm-ui/ui-styles/src/light.scss
@@ -78,23 +78,6 @@ $popover-background-color: $grey-light;
   --sh-selected-color: #{$warning-25};
   --sh-highlight-background: #f5f5f5;
   --sh-highlight-accent: #99d8f3;
-
-  // Tailwind
-  --scm-primary-contrast-color: #{$white};
-  --scm-primary-hover-color: #{darken($primary, 10%)};
-  --scm-primary-hover-contrast-color: #{$white};
-  --scm-primary-active-color: #{darken($primary, 20%)};
-  --scm-primary-active-contrast-color: #{$white};
-  --scm-primary-disabled-color: #bff3f7;
-  --scm-primary-disabled-contrast-color: #{$white};
-
-  --scm-warning-contrast-color: #88550D;
-  --scm-warning-hover-contrast-color: #{rgba(0,0,0,0.7)};
-  --scm-warning-hover-color: #{darken($warning, 10%)};
-  --scm-warning-active-color: #{darken($warning, 20%)};
-  --scm-warning-active-contrast-color: #{rgba(0,0,0,0.7)};
-  --scm-warning-disabled-color: #fff6d5;
-  --scm-warning-disabled-contrast-color: #e1d4c2;
 }
 
 .button {
diff --git a/scm-ui/ui-styles/src/tailwind.config.preset.js b/scm-ui/ui-styles/src/tailwind.config.preset.js
deleted file mode 100644
index 190534c685..0000000000
--- a/scm-ui/ui-styles/src/tailwind.config.preset.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-module.exports = {
-  theme: {
-    extend: {
-      colors: {
-        primary: {
-          DEFAULT: "var(--scm-primary-color)",
-          contrast: "var(--scm-primary-contrast-color)",
-          hover: "var(--scm-primary-hover-color)",
-          "hover-contrast": "var(--scm-primary-hover-contrast-color)",
-          active: "var(--scm-primary-active-color)",
-          "active-contrast": "var(--scm-primary-active-contrast-color)",
-          disabled: "var(--scm-primary-disabled-color)",
-          "disabled-contrast": "var(--scm-primary-disabled-contrast-color)",
-        },
-        signal: {
-          DEFAULT: "var(--scm-warning-color)",
-          contrast: "var(--scm-warning-contrast-color)",
-          hover: "var(--scm-warning-hover-color)",
-          "hover-contrast": "var(--scm-warning-hover-contrast-color)",
-          active: "var(--scm-warning-active-color)",
-          "active-contrast": "var(--scm-warning-active-contrast-color)",
-          disabled: "var(--scm-warning-disabled-color)",
-          "disabled-contrast": "var(--scm-warning-disabled-contrast-color)",
-        },
-      },
-    },
-  },
-  important: true,
-  corePlugins: {
-    preflight: false,
-  }
-};
diff --git a/scm-ui/ui-styles/src/utils/_post.scss b/scm-ui/ui-styles/src/utils/_post.scss
index 6be6dd4ac3..098d2eeeec 100644
--- a/scm-ui/ui-styles/src/utils/_post.scss
+++ b/scm-ui/ui-styles/src/utils/_post.scss
@@ -21,21 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-@import "bulma/sass/utilities/_all";
-@import "bulma/sass/base/_all";
-@import "bulma/sass/elements/_all";
-@import "bulma/sass/form/_all";
-@import "bulma/sass/components/_all";
-@import "bulma/sass/grid/_all";
-@import "bulma/sass/helpers/color";
-@import "bulma/sass/helpers/flexbox";
-@import "bulma/sass/helpers/float";
-@import "bulma/sass/helpers/other";
-@import "bulma/sass/helpers/overflow";
-@import "bulma/sass/helpers/position";
-@import "bulma/sass/helpers/typography";
-@import "bulma/sass/helpers/visibility";
-@import "bulma/sass/layout/_all";
+@import "bulma/bulma";
 @import "../variables/_derived.scss";
 @import "bulma-popover/css/bulma-popover";
 @import "../components/_main.scss";
diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json
index 90b4169155..7eee4478b0 100644
--- a/scm-ui/ui-webapp/package.json
+++ b/scm-ui/ui-webapp/package.json
@@ -10,7 +10,6 @@
     "@scm-manager/ui-modules": "2.38.2-SNAPSHOT",
     "@scm-manager/ui-syntaxhighlighting": "2.38.2-SNAPSHOT",
     "@scm-manager/ui-text": "2.38.2-SNAPSHOT",
-    "@scm-manager/ui-buttons": "2.38.2-SNAPSHOT",
     "@scm-manager/ui-legacy": "2.38.2-SNAPSHOT",
     "classnames": "^2.2.5",
     "history": "^4.10.1",
@@ -50,8 +49,7 @@
     "@types/styled-components": "^5.1.25",
     "@types/systemjs": "^0.20.6",
     "fetch-mock": "^7.5.1",
-    "react-test-renderer": "^17.0.1",
-    "tailwindcss": "^3.0.23"
+    "react-test-renderer": "^17.0.1"
   },
   "babel": {
     "presets": [
@@ -68,4 +66,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
\ No newline at end of file
+}
diff --git a/scm-ui/ui-webapp/public/index.mustache b/scm-ui/ui-webapp/public/index.mustache
index f38b6d3fab..6733576363 100644
--- a/scm-ui/ui-webapp/public/index.mustache
+++ b/scm-ui/ui-webapp/public/index.mustache
@@ -44,7 +44,6 @@
       }
       document.head.appendChild(linkElement);
     </script>
-    <link rel="stylesheet" href="{{ contextPath }}/styles.bundle.css">
   </head>
   <body>
     <noscript>
diff --git a/scm-ui/ui-webapp/src/index.tsx b/scm-ui/ui-webapp/src/index.tsx
index 10ec839968..95cef5f44e 100644
--- a/scm-ui/ui-webapp/src/index.tsx
+++ b/scm-ui/ui-webapp/src/index.tsx
@@ -37,9 +37,6 @@ import ChangesetShortLink from "./repos/components/changesets/ChangesetShortLink
 import "./tokenExpired";
 import { ApiProvider } from "@scm-manager/ui-api";
 
-// eslint-disable-next-line no-restricted-imports
-import "@scm-manager/ui-buttons/build/index.css";
-
 binder.bind<extensionPoints.ChangesetDescriptionTokens>("changeset.description.tokens", ChangesetShortLink);
 
 const root = document.getElementById("root");
diff --git a/scm-webapp/src/main/java/sonia/scm/PushStateDispatcherProvider.java b/scm-webapp/src/main/java/sonia/scm/PushStateDispatcherProvider.java
index e22de75cec..54d9c8af10 100644
--- a/scm-webapp/src/main/java/sonia/scm/PushStateDispatcherProvider.java
+++ b/scm-webapp/src/main/java/sonia/scm/PushStateDispatcherProvider.java
@@ -40,7 +40,7 @@ import javax.inject.Provider;
 public class PushStateDispatcherProvider implements Provider<PushStateDispatcher> {
 
   @VisibleForTesting
-  public static final String PROPERTY_TARGET = "sonia.scm.ui.proxy";
+  static final String PROPERTY_TARGET = "sonia.scm.ui.proxy";
 
   private Provider<TemplatingPushStateDispatcher> templatingPushStateDispatcherProvider;
 
diff --git a/scm-webapp/src/main/java/sonia/scm/web/tailwind/StylesServlet.java b/scm-webapp/src/main/java/sonia/scm/web/tailwind/StylesServlet.java
deleted file mode 100644
index 2208243b72..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/web/tailwind/StylesServlet.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package sonia.scm.web.tailwind;
-
-import com.github.sdorra.webresources.CacheControl;
-import com.github.sdorra.webresources.WebResourceSender;
-import com.google.common.io.ByteStreams;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sonia.scm.filter.WebElement;
-import sonia.scm.plugin.PluginLoader;
-import sonia.scm.plugin.UberWebResourceLoader;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import static sonia.scm.PushStateDispatcherProvider.PROPERTY_TARGET;
-
-@Singleton
-@WebElement(value = "/styles.bundle.css")
-public class StylesServlet extends HttpServlet {
-  private static final Logger LOG = LoggerFactory.getLogger(StylesServlet.class);
-  private final UberWebResourceLoader webResourceLoader;
-  private final String target = System.getProperty(PROPERTY_TARGET);
-
-  private final WebResourceSender sender = WebResourceSender.create()
-    .withGZIP()
-    .withGZIPMinLength(512)
-    .withBufferSize(16384)
-    .withCacheControl(CacheControl.create().noCache());
-
-  @Inject
-  public StylesServlet(PluginLoader pluginLoader) {
-    this.webResourceLoader = pluginLoader.getUberWebResourceLoader();
-  }
-
-  @Override
-  protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-    try {
-      URL url = webResourceLoader.getResource("/assets/webapp.tailwind.css");
-      if (url != null) {
-        // TODO: Merge css
-        sender.resource(url).get(request, response);
-      } else {
-        getLocally(createProxyUrl("/assets/webapp.tailwind.css"), request, response);
-      }
-    } catch (IOException ex) {
-      LOG.error("Error on getting the tailwind stylesheet", ex);
-      response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-    }
-  }
-
-  private void getLocally(URL url, HttpServletRequest request, HttpServletResponse response) throws IOException {
-    HttpURLConnection connection = openConnection(url);
-    connection.setRequestMethod(request.getMethod());
-
-    int responseCode = connection.getResponseCode();
-    response.setStatus(responseCode);
-    try (InputStream input = getConnectionInput(connection); OutputStream output = response.getOutputStream()) {
-      ByteStreams.copy(input, output);
-    }
-  }
-
-  private InputStream getConnectionInput(HttpURLConnection connection) throws IOException {
-    if (connection.getErrorStream() != null) {
-      return connection.getErrorStream();
-    }
-    return connection.getInputStream();
-  }
-
-  private URL createProxyUrl(String uri) throws MalformedURLException {
-    return new URL(target + uri);
-  }
-
-  private static HttpURLConnection openConnection(URL url) throws IOException {
-    return (HttpURLConnection) url.openConnection();
-  }
-
-}
diff --git a/yarn.lock b/yarn.lock
index 42099f4853..5168f3980c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17973,7 +17973,7 @@ table@^6.0.9:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-tailwindcss@^3.0.23, tailwindcss@^3.1.3:
+tailwindcss@^3.1.3:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.6.tgz#bcb719357776c39e6376a8d84e9834b2b19a49f1"
   integrity sha512-7skAOY56erZAFQssT1xkpk+kWt2NrO45kORlxFPXUt3CiGsVPhH1smuH5XoDH6sGPXLyBv+zgCKA2HWBsgCytg==