Merge branch 'main' of https://github.com/SigNoz/signoz into chore/button-migration

frontend/package.json

@@ -49,7 +49,7 @@
     "@signozhq/design-tokens": "2.1.4",
     "@signozhq/icons": "0.4.0",
     "@signozhq/resizable": "0.0.2",
-    "@signozhq/ui": "0.0.19",
+    "@signozhq/ui": "0.0.20",
     "@tanstack/react-table": "8.21.3",
     "@tanstack/react-virtual": "3.13.22",
     "@uiw/codemirror-theme-copilot": "4.23.11",
@@ -241,4 +241,4 @@
     "tmp": "0.2.4",
     "vite": "npm:rolldown-vite@7.3.1"
   }
-}
+}

frontend/pnpm-lock.yaml

@@ -77,8 +77,8 @@ importers:
         specifier: 0.0.2
         version: 0.0.2(@types/react@18.0.26)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@signozhq/ui':
-        specifier: 0.0.19
-        version: 0.0.19(@emotion/is-prop-valid@1.2.0)(@signozhq/icons@0.4.0)(@types/react-dom@18.0.10)(@types/react@18.0.26)(react-dom@18.2.0(react@18.2.0))(react-router-dom@5.3.4(react@18.2.0))(react-router@6.30.3(react@18.2.0))(react@18.2.0)
+        specifier: 0.0.20
+        version: 0.0.20(@emotion/is-prop-valid@1.2.0)(@signozhq/icons@0.4.0)(@types/react-dom@18.0.10)(@types/react@18.0.26)(react-dom@18.2.0(react@18.2.0))(react-router-dom@5.3.4(react@18.2.0))(react-router@6.30.3(react@18.2.0))(react@18.2.0)
       '@tanstack/react-table':
         specifier: 8.21.3
         version: 8.21.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -3269,8 +3269,8 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
-  '@signozhq/ui@0.0.19':
-    resolution: {integrity: sha512-2q6aRxN/PR4PlR2xJZAREEuvLPiDFggfFKzCW2Z5vHVVbrgnvZHWD1jPUuwszfEg0ceH3UvkwqceO7wN4uRJAA==}
+  '@signozhq/ui@0.0.20':
+    resolution: {integrity: sha512-rVC8OMfM1AsjsrWJWNzU8KlSw3hbWP5OF/jxuX3zQ5Fljo9PhtLksUF3jISfwLqbmWOBCopByr9UlKH46iAfYA==}
     peerDependencies:
       '@signozhq/icons': 0.3.0
       react: ^18.2.0
@@ -3851,27 +3851,6 @@ packages:
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
-  '@webassemblyjs/ast@1.14.1':
-    resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
-
-  '@webassemblyjs/floating-point-hex-parser@1.13.2':
-    resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==}
-
-  '@webassemblyjs/helper-api-error@1.13.2':
-    resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==}
-
-  '@webassemblyjs/helper-buffer@1.14.1':
-    resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==}
-
-  '@webassemblyjs/helper-numbers@1.13.2':
-    resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==}
-
-  '@webassemblyjs/helper-wasm-bytecode@1.13.2':
-    resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==}
-
-  '@webassemblyjs/helper-wasm-section@1.14.1':
-    resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==}
-
   '@xmldom/xmldom@0.8.13':
     resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
     engines: {node: '>=10.0.0'}
@@ -12034,7 +12013,7 @@ snapshots:
       - react-dom
       - tailwindcss
 
-  '@signozhq/ui@0.0.19(@emotion/is-prop-valid@1.2.0)(@signozhq/icons@0.4.0)(@types/react-dom@18.0.10)(@types/react@18.0.26)(react-dom@18.2.0(react@18.2.0))(react-router-dom@5.3.4(react@18.2.0))(react-router@6.30.3(react@18.2.0))(react@18.2.0)':
+  '@signozhq/ui@0.0.20(@emotion/is-prop-valid@1.2.0)(@signozhq/icons@0.4.0)(@types/react-dom@18.0.10)(@types/react@18.0.26)(react-dom@18.2.0(react@18.2.0))(react-router-dom@5.3.4(react@18.2.0))(react-router@6.30.3(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@chenglou/pretext': 0.0.5
       '@radix-ui/react-checkbox': 1.3.3(@types/react-dom@18.0.10)(@types/react@18.0.26)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)

frontend/src/AppRoutes/__tests__/Private.test.tsx

@@ -166,7 +166,6 @@ function createMockAppContext(
 		userPreferences: [],
 		hostsData: null,
 		isLoggedIn: true,
-		isPreflightLoading: false,
 		org: [{ createdAt: 0, id: 'org-id', displayName: 'Test Org' }],
 		isFetchingUser: false,
 		isFetchingActiveLicense: false,

frontend/src/AppRoutes/index.tsx

@@ -59,7 +59,6 @@ function App(): JSX.Element {
 		isLoggedIn: isLoggedInState,
 		featureFlags,
 		org,
-		isPreflightLoading,
 	} = useAppContext();
 	const [routes, setRoutes] = useState<AppRoutes[]>(defaultRoutes);
 	const isAIAssistantEnabled = useIsAIAssistantEnabled();
@@ -387,10 +386,6 @@ function App(): JSX.Element {
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [isCloudUser, isEnterpriseSelfHostedUser]);
 
-	if (isPreflightLoading) {
-		return <Spinner tip="Loading..." />;
-	}
-
 	// if the user is in logged in state
 	if (isLoggedInState) {
 		// if the setup calls are loading then return a spinner

frontend/src/api/__tests__/interceptorRejected.no-auth.test.ts

@@ -1,72 +0,0 @@
-import axios from 'axios';
-import { getIsNoAuthMode } from 'utils/noAuthMode';
-
-import { interceptorRejected } from '../index';
-
-jest.mock('utils/noAuthMode', () => ({
-	getIsNoAuthMode: jest.fn(),
-}));
-
-jest.mock('api/v2/sessions/rotate/post', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
-jest.mock('AppRoutes/utils', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
-jest.mock('../utils', () => ({
-	Logout: jest.fn(),
-}));
-
-// oxlint-disable-next-line typescript/no-require-imports typescript/no-var-requires
-const post = require('api/v2/sessions/rotate/post').default;
-// oxlint-disable-next-line typescript/no-require-imports typescript/no-var-requires
-const { Logout } = require('../utils');
-
-describe('interceptorRejected — no-auth mode', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		jest.spyOn(axios, 'isAxiosError').mockReturnValue(true);
-	});
-
-	it('does NOT call rotate or Logout when no-auth mode is enabled on 401', async () => {
-		(getIsNoAuthMode as jest.Mock).mockReturnValue(true);
-
-		const error = {
-			isAxiosError: true,
-			response: {
-				status: 401,
-				config: { url: '/dashboards', method: 'get' },
-			},
-			config: { url: '/dashboards', headers: {} },
-		};
-
-		await interceptorRejected(error as any).catch(() => {});
-
-		expect(post).not.toHaveBeenCalled();
-		expect(Logout).not.toHaveBeenCalled();
-	});
-
-	it('DOES attempt rotate when no-auth mode is disabled on 401', async () => {
-		(getIsNoAuthMode as jest.Mock).mockReturnValue(false);
-		(post as jest.Mock).mockResolvedValue({
-			data: { accessToken: 'a', refreshToken: 'b' },
-		});
-
-		const error = {
-			isAxiosError: true,
-			response: {
-				status: 401,
-				config: { url: '/dashboards', method: 'get' },
-			},
-			config: { url: '/dashboards', headers: {} },
-		};
-
-		await interceptorRejected(error as any).catch(() => {});
-
-		expect(post).toHaveBeenCalled();
-	});
-});

frontend/src/api/index.ts

@@ -13,7 +13,6 @@ import { Events } from 'constants/events';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { getBasePath } from 'utils/basePath';
 import { eventEmitter } from 'utils/getEventEmitter';
-import { getIsNoAuthMode } from 'utils/noAuthMode';
 
 import apiV1, { apiAlertManager, apiV2, apiV3, apiV4, apiV5 } from './apiV1';
 import { Logout } from './utils';
@@ -109,10 +108,7 @@ export const interceptorRejected = async (
 		if (axios.isAxiosError(value) && value.response) {
 			const { response } = value;
 
-			const isNoAuthMode = getIsNoAuthMode();
-
 			if (
-				!isNoAuthMode &&
 				response.status === 401 &&
 				// if the session rotate call or the create session errors out with 401 or the delete sessions call returns 401 then we do not retry!
 				response.config.url !== '/sessions/rotate' &&
@@ -144,20 +140,16 @@ export const interceptorRejected = async (
 						return await Promise.resolve(reResponse);
 					} catch (error) {
 						if ((error as AxiosError)?.response?.status === 401) {
-							void Logout();
+							Logout();
 						}
 					}
 				} catch (error) {
-					void Logout();
+					Logout();
 				}
 			}
 
-			if (
-				!isNoAuthMode &&
-				response.status === 401 &&
-				response.config.url === '/sessions/rotate'
-			) {
-				void Logout();
+			if (response.status === 401 && response.config.url === '/sessions/rotate') {
+				Logout();
 			}
 		}
 		return await Promise.reject(value);

frontend/src/assets/Logos/apache-druid.svg

@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path fill="currentColor" d="M8.932 20.806c-.369 0-.738.007-1.109 0-.35-.007-.587-.206-.623-.5a.587.587 0 0 1 .53-.636c.79-.062 1.582-.063 2.372-.003a.548.548 0 0 1 .522.602c-.024.326-.253.526-.616.54zM1.792 8.345c-.392 0-.782.008-1.173.002-.327-.006-.577-.22-.614-.512-.037-.293.146-.544.499-.615.192-.032.388-.045.583-.039a81.515 81.515 0 0 1 1.597 0c.163 0 .325.019.483.056.288.073.445.318.411.617-.034.298-.214.477-.515.487-.424.014-.848.004-1.272.004zm7.588 8.417H4.292a2.464 2.464 0 0 1-.326-.007c-.294-.04-.48-.209-.508-.506-.029-.298.11-.501.391-.606.179-.065.365-.051.549-.051 3.347 0 6.695.005 10.042-.006 1.174-.004 2.187-.439 2.993-1.3.69-.738 1.053-1.63 1.16-2.635.085-.788-.027-1.513-.516-2.156-.544-.718-1.28-1.078-2.163-1.082-3.163-.013-6.328-.005-9.487-.01-.336 0-.673-.027-1.007-.058-.29-.027-.45-.201-.469-.492-.021-.317.141-.545.429-.6a1.55 1.55 0 0 1 .29-.015h10.177c1.71.004 3.187 1.038 3.726 2.654.383 1.147.246 2.304-.182 3.416-.824 2.135-2.762 3.448-5.055 3.454-1.652.005-3.304 0-4.956 0zm2.906-13.568c1.533 0 3.066-.008 4.598 0 2.935.018 5.629 1.892 6.653 4.626.442 1.181.538 2.403.412 3.657-.185 1.842-.735 3.552-1.776 5.084-1.608 2.365-3.873 3.68-6.679 4.118-.95.148-1.905.13-2.86.13-.397 0-.61-.181-.633-.51-.025-.351.196-.621.587-.645.434-.026.87-.004 1.305-.016 2.641-.072 4.928-.982 6.74-2.935 1.269-1.37 1.912-3.039 2.13-4.878.151-1.275.135-2.544-.37-3.752-.773-1.85-2.159-2.983-4.068-3.509-.74-.204-1.5-.243-2.26-.247-2.837-.017-5.675-.007-8.511-.007-.12 0-.24.004-.359-.006a.57.57 0 0 1-.517-.536.557.557 0 0 1 .456-.557c.13-.018.261-.024.392-.019h4.762Z"/>
-</svg>

frontend/src/assets/Logos/aspnet.svg

@@ -1,7 +0,0 @@
-<svg width="456" height="456" viewBox="0 0 456 456" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="456" height="456" rx="50" fill="#512BD4"/>
-<path d="M81.2738 291.333C78.0496 291.333 75.309 290.259 73.052 288.11C70.795 285.906 69.6665 283.289 69.6665 280.259C69.6665 277.173 70.795 274.529 73.052 272.325C75.309 270.121 78.0496 269.019 81.2738 269.019C84.5518 269.019 87.3193 270.121 89.5763 272.325C91.887 274.529 93.0424 277.173 93.0424 280.259C93.0424 283.289 91.887 285.906 89.5763 288.11C87.3193 290.259 84.5518 291.333 81.2738 291.333Z" fill="white"/>
-<path d="M210.167 289.515H189.209L133.994 202.406C132.597 200.202 131.441 197.915 130.528 195.546H130.044C130.474 198.081 130.689 203.508 130.689 211.827V289.515H112.149V171H134.477L187.839 256.043C190.096 259.57 191.547 261.994 192.192 263.316H192.514C191.977 260.176 191.708 254.859 191.708 247.365V171H210.167V289.515Z" fill="white"/>
-<path d="M300.449 289.515H235.561V171H297.87V187.695H254.746V221.249H294.485V237.861H254.746V272.903H300.449V289.515Z" fill="white"/>
-<path d="M392.667 187.695H359.457V289.515H340.272V187.695H307.143V171H392.667V187.695Z" fill="white"/>
-</svg>

frontend/src/assets/Logos/azure-cdn-frontdoor.svg

@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
-  <defs>
-    <linearGradient id="a" x1="9" y1="17" x2="9" y2="1" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#0078d4"/>
-      <stop offset="1" stop-color="#5ea0ef"/>
-    </linearGradient>
-  </defs>
-  <circle cx="9" cy="9" r="8" fill="url(#a)"/>
-  <ellipse cx="9" cy="9" rx="3.2" ry="8" fill="none" stroke="#fff" stroke-width=".7"/>
-  <line x1="1" y1="9" x2="17" y2="9" stroke="#fff" stroke-width=".7"/>
-  <line x1="2" y1="5.5" x2="16" y2="5.5" stroke="#fff" stroke-width=".5"/>
-  <line x1="2" y1="12.5" x2="16" y2="12.5" stroke="#fff" stroke-width=".5"/>
-  <circle cx="9" cy="9" r="8" fill="none" stroke="#fff" stroke-width=".7"/>
-  <path d="M13.5 10.5l1.5-1.5-1.5-1.5M4.5 10.5L3 9l1.5-1.5" stroke="#50e6ff" stroke-width="1" fill="none" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

frontend/src/assets/Logos/cert-manager.svg

@@ -1,15 +0,0 @@
-<svg width="142" height="142" viewBox="0 0 142 142" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <g clipPath="url(#clip0_0_812)" transform="matrix(1.002103,0,0,1.0377318,6.9399999e-7,-2.5317276e-4)">
-    <path d="m 141.702,68.418 c 0,7.4632 -4.567,14.1123 -6.748,20.8385 -2.263,6.9789 -2.552,15.0285 -6.776,20.8385 -4.267,5.868 -11.856,8.611 -17.719,12.881 -5.805,4.228 -10.7345,10.628 -17.7061,12.895 -6.7286,2.186 -14.4463,-0.021 -21.9018,-0.021 -7.4555,0 -15.1731,2.207 -21.8998,0.021 C 41.9778,133.604 37.048,127.204 31.2428,122.976 25.3799,118.706 17.7913,115.963 13.5247,110.095 9.30055,104.287 9.01135,96.2374 6.74791,89.2565 4.56351,82.5225 0,75.8735 0,68.418 0,60.9624 4.56737,54.3057 6.74791,47.5795 9.01135,40.6005 9.30055,32.5507 13.5247,26.741 17.7913,20.8753 25.3799,18.1297 31.2428,13.8617 37.048,9.63414 41.9778,3.23209 48.9513,0.966872 55.678,-1.21924 63.3956,0.986167 70.8511,0.986167 c 7.4555,0 15.1732,-2.205407 21.8999,-0.019295 6.9735,2.265218 11.903,8.667268 17.708,12.894828 5.863,4.268 13.452,7.0136 17.719,12.8793 4.224,5.8097 4.513,13.8595 6.776,20.8385 2.181,6.7262 6.748,13.3771 6.748,20.8385 z" fill="#326ce5"/>
-    <path d="m 70.8473,8.18683 c -33.2383,0 -60.1837,26.96657 -60.1837,60.23097 0,33.2642 26.9454,60.2312 60.1837,60.2312 33.2387,0 60.1837,-26.959 60.1837,-60.2312 0,-33.2721 -26.945,-60.23097 -60.1837,-60.23097 z M 70.8319,123.408 C 40.4778,123.408 15.9058,98.8053 15.9,68.4274 15.9,38.0167 40.5357,13.3791 70.9109,13.437 c 30.3751,0.0579 54.9111,24.6589 54.8841,55.0329 -0.027,30.374 -24.609,54.9481 -54.9631,54.9381 z" fill="#ffffff"/>
-    <path d="m 13.5883,60.53 c 8.1804,0 8.1804,3.859 16.3589,3.859 8.1784,0 8.1804,-3.859 16.3607,-3.859 8.1804,0 8.1785,3.859 16.3589,3.859 8.1804,0 8.1785,-3.859 16.3589,-3.859 8.1804,0 8.1803,3.859 16.3588,3.859 8.1785,0 8.1805,-3.859 16.3605,-3.859 8.181,0 8.181,3.859 16.361,3.859" stroke="#ffffff" strokeMiterlimit="10"/>
-    <path d="m 13.5883,68.248 c 8.1804,0 8.1804,3.859 16.3589,3.859 8.1784,0 8.1804,-3.859 16.3607,-3.859 8.1804,0 8.1785,3.859 16.3589,3.859 8.1804,0 8.1785,-3.859 16.3589,-3.859 8.1804,0 8.1803,3.859 16.3588,3.859 8.1785,0 8.1805,-3.859 16.3605,-3.859 8.181,0 8.181,3.859 16.361,3.859" stroke="#ffffff" strokeMiterlimit="10"/>
-    <path d="m 13.5883,77.5095 c 8.1804,0 8.1804,3.859 16.3589,3.859 8.1784,0 8.1804,-3.859 16.3607,-3.859 8.1804,0 8.1785,3.859 16.3589,3.859 8.1804,0 8.1785,-3.859 16.3589,-3.859 8.1804,0 8.1803,3.859 16.3588,3.859 8.1785,0 8.1805,-3.859 16.3605,-3.859 8.181,0 8.181,3.859 16.361,3.859" stroke="#ffffff" strokeMiterlimit="10"/>
-    <path d="m 70.8473,8.18683 c -33.2383,0 -60.1837,26.96657 -60.1837,60.23097 0,33.2642 26.9454,60.2312 60.1837,60.2312 33.2387,0 60.1837,-26.959 60.1837,-60.2312 0,-33.2721 -26.945,-60.23097 -60.1837,-60.23097 z M 70.8319,123.408 C 40.4778,123.408 15.9058,98.8053 15.9,68.4274 15.9,38.0167 40.5357,13.3791 70.9109,13.437 c 30.3751,0.0579 54.9111,24.6589 54.8841,55.0329 -0.027,30.374 -24.609,54.9481 -54.9631,54.9381 z" fill="#ffffff"/>
-  </g>
-  <defs>
-    <clipPath id="clip0_0_812">
-      <rect width="141.702" height="136.837" fill="#ffffff"/>
-    </clipPath>
-  </defs>
-</svg>

frontend/src/assets/Logos/graphql.svg

@@ -1,55 +0,0 @@
-<svg viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
-<g>
-	<g>
-		<g>
-			<rect x="122" y="-0.4" transform="matrix(-0.866 -0.5 0.5 -0.866 163.3196 363.3136)" fill="#E535AB" width="16.6" height="320.3"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="39.8" y="272.2" fill="#E535AB" width="320.3" height="16.6"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="37.9" y="312.2" transform="matrix(-0.866 -0.5 0.5 -0.866 83.0693 663.3409)" fill="#E535AB" width="185" height="16.6"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="177.1" y="71.1" transform="matrix(-0.866 -0.5 0.5 -0.866 463.3409 283.0693)" fill="#E535AB" width="185" height="16.6"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="122.1" y="-13" transform="matrix(-0.5 -0.866 0.866 -0.5 126.7903 232.1221)" fill="#E535AB" width="16.6" height="185"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="109.6" y="151.6" transform="matrix(-0.5 -0.866 0.866 -0.5 266.0828 473.3766)" fill="#E535AB" width="320.3" height="16.6"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="52.5" y="107.5" fill="#E535AB" width="16.6" height="185"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="330.9" y="107.5" fill="#E535AB" width="16.6" height="185"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="262.4" y="240.1" transform="matrix(-0.5 -0.866 0.866 -0.5 126.7953 714.2875)" fill="#E535AB" width="14.5" height="160.9"/>
-		</g>
-	</g>
-	<path fill="#E535AB" d="M369.5,297.9c-9.6,16.7-31,22.4-47.7,12.8c-16.7-9.6-22.4-31-12.8-47.7c9.6-16.7,31-22.4,47.7-12.8 C373.5,259.9,379.2,281.2,369.5,297.9"/>
-	<path fill="#E535AB" d="M90.9,137c-9.6,16.7-31,22.4-47.7,12.8c-16.7-9.6-22.4-31-12.8-47.7c9.6-16.7,31-22.4,47.7-12.8 C94.8,99,100.5,120.3,90.9,137"/>
-	<path fill="#E535AB" d="M30.5,297.9c-9.6-16.7-3.9-38,12.8-47.7c16.7-9.6,38-3.9,47.7,12.8c9.6,16.7,3.9,38-12.8,47.7 C61.4,320.3,40.1,314.6,30.5,297.9"/>
-	<path fill="#E535AB" d="M309.1,137c-9.6-16.7-3.9-38,12.8-47.7c16.7-9.6,38-3.9,47.7,12.8c9.6,16.7,3.9,38-12.8,47.7 C340.1,159.4,318.7,153.7,309.1,137"/>
-	<path fill="#E535AB" d="M200,395.8c-19.3,0-34.9-15.6-34.9-34.9c0-19.3,15.6-34.9,34.9-34.9c19.3,0,34.9,15.6,34.9,34.9 C234.9,380.1,219.3,395.8,200,395.8"/>
-	<path fill="#E535AB" d="M200,74c-19.3,0-34.9-15.6-34.9-34.9c0-19.3,15.6-34.9,34.9-34.9c19.3,0,34.9,15.6,34.9,34.9 C234.9,58.4,219.3,74,200,74"/>
-</g>
-</svg>

frontend/src/assets/Logos/istio.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.62745 102.5">
-  <path fill="#516baa" d="m31.05548,54.44523v24.1773c.00065.04512-.03164.084-.07611.09164l-23.27949,3.99047c-.05091.0076-.09834-.02751-.10594-.07841-.00256-.01712-.0003-.03461.00653-.05051L30.87996,30.58635c.02242-.04633.07815-.06572.12449-.04331.0316.01529.05193.04704.05259.08214l-.00156,23.82005Zm3.92367-13.93321v38.21148c.00046.04691.03573.08617.08232.09164l34.87031,3.89415c.0512.00527.09698-.03196.10226-.08316.00167-.01616-.00092-.03247-.00751-.04732L35.15623,4.70041c-.02237-.04636-.07809-.0658-.12444-.04343-.03117.01504-.05144.04612-.05264.08071v35.77433Zm34.68546,45.76213l-38.57341,11.57218c-.02155.00797-.04524.00797-.06679,0l-23.309-11.57217c-.04636-.0203-.06749-.07435-.04719-.12071.01513-.03455.04988-.0563.08757-.05481h61.88241c.0508.00825.08531.05613.07706.10693-.00482.0297-.02369.05525-.05066.06859Z"/>
-</svg>

frontend/src/assets/Logos/railway.svg

@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path fill="currentColor" d="M.113 10.27A13.026 13.026 0 000 11.48h18.23c-.064-.125-.15-.237-.235-.347-3.117-4.027-4.793-3.677-7.19-3.78-.8-.034-1.34-.048-4.524-.048-1.704 0-3.555.005-5.358.01-.234.63-.459 1.24-.567 1.737h9.342v1.216H.113v.002zm18.26 2.426H.009c.02.326.05.645.094.961h16.955c.754 0 1.179-.429 1.315-.96zm-17.318 4.28s2.81 6.902 10.93 7.024c4.855 0 9.027-2.883 10.92-7.024H1.056zM11.988 0C7.5 0 3.593 2.466 1.531 6.108l4.75-.005v-.002c3.71 0 3.849.016 4.573.047l.448.016c1.563.052 3.485.22 4.996 1.364.82.621 2.007 1.99 2.712 2.965.654.902.842 1.94.396 2.934-.408.914-1.289 1.458-2.353 1.458H.391s.099.42.249.886h22.748A12.026 12.026 0 0024 12.005C24 5.377 18.621 0 11.988 0z"/>
-</svg>

frontend/src/assets/Logos/scala.svg

@@ -1,13 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 590 270">
-<path d="M30.36,109.14v.48h0A3.73,3.73,0,0,1,30.36,109.14Z" fill="currentColor" fill-rule="evenodd"/>
-<path d="M138.66,28.78C107.2,37.87,57.29,43,30.4,43h0V94.35a.8.8,0,0,0,.19.48c18.35,0,75-6,109.18-15.4a129,129,0,0,0,17.49-5.81c4.18-1.88,6.88-3.86,6.88-5.92V15.91C164.1,20.79,151.39,25.11,138.66,28.78Z" fill="#de3423" fill-rule="evenodd"/>
-<path d="M138.66,95.37c-18.83,5.43-44.24,9.47-67.39,11.83-15.54,1.59-30.06,2.42-40.87,2.42h0v51.31a.8.8,0,0,0,.19.48c18.35,0,75-6,109.18-15.39a130.38,130.38,0,0,0,17.49-5.81c4.18-1.89,6.88-3.86,6.88-5.92V82.5C164.1,87.37,151.39,91.69,138.66,95.37Z" fill="#de3423" fill-rule="evenodd"/>
-<path d="M138.66,162c-18.83,5.43-44.24,9.46-67.39,11.83-15.56,1.59-30.1,2.42-40.91,2.42V228c18.16,0,75.1-5.95,109.37-15.39,12.63-3.48,24.37-7.44,24.37-11.74V149.08C164.1,154,151.39,158.28,138.66,162Z" fill="#de3423" fill-rule="evenodd"/>
-<path d="M30.55,94.83C32.4,97.38,48,102.19,71.27,107.2c23.27,4.46,47.47,22.07,66.29,16.64,12.73-3.68,26.54-36.47,26.54-41.34V82c0-3.4-2.55-6.13-6.88-8.4-17.75-9.07-21.11-12.41-27.69-10.6C95.37,72.43,35.06,67.61,30.55,94.83Z" fill="currentColor" fill-rule="evenodd"/>
-<path d="M30.55,161.41C32.4,164,48,168.77,71.27,173.79c26,4.74,48.61,20.19,67.44,14.75,12.73-3.68,25.39-34.58,25.39-39.46v-.48c0-3.39-2.55-6.13-6.88-8.39-13.54-7.2-31.43-15.13-38-13.32C85,136.3,39.26,138.37,30.55,161.41Z" fill="currentColor" fill-rule="evenodd"/>
-<path d="M200.7,142.39c6,11.79,15.6,17.6,29.05,17.6,14.44,0,19.59-7.64,19.59-15.11,0-5.15-1.83-8.63-6.64-11.79-4.82-3.32-8.3-4.81-16.93-8-10.63-4-16.77-7-23.41-12.29-6.64-5.48-9.79-13-9.79-22.74a28.28,28.28,0,0,1,10.29-22.58c7-5.81,15.44-8.63,25.56-8.63,15.77,0,27.72,6.31,35.69,18.76L249.34,87.78c-4.48-6.81-11.29-10.3-20.59-10.3-9.13,0-15.77,5.15-15.77,12.29,0,4.81,2,7.14,4.82,10,1.82,1.33,6.47,3.32,8.63,4.48l6,2.32,6.8,2.66c11,4.48,18.76,9.3,23.57,14.44s7.31,12.12,7.31,20.75c0,20.42-14.11,34.2-40.51,34.2-21.41,0-37.18-10-44.48-26.4Z" fill="currentColor"/>
-<path d="M354.25,104.71,342,117.49a28.14,28.14,0,0,0-21.24-9.13,25,25,0,0,0-18.43,7.47,27.76,27.76,0,0,0,0,37.52,25,25,0,0,0,18.43,7.47A28.14,28.14,0,0,0,342,151.69l12.29,12.78c-9,9.63-20.09,14.44-33.53,14.44-12.79,0-23.58-4.15-32.37-12.62s-13.12-19.09-13.12-31.7,4.32-23.08,13.12-31.54,19.58-12.78,32.37-12.78C334.16,90.27,345.28,95.08,354.25,104.71Z" fill="currentColor"/>
-<path d="M393.88,125.62C408,124.3,413,122.47,413,116c0-5.15-4.64-9.13-13.94-9.13q-13.44,0-22.41,10.95l-12.28-10.46c8.13-11.45,19.58-17.09,34.36-17.09,20.75,0,33.7,10,33.7,27.05v37c0,5.81,2.15,6.48,7,6.48h.5v15.43c-2,1.17-5.15,1.83-9.3,1.83-4.48,0-8-1.33-10.62-4a14.06,14.06,0,0,1-3-5.48c-5.81,6.8-15.27,10.29-28.39,10.29-18.42,0-30.87-10.13-30.87-25.4C357.7,136.41,369.15,127.78,393.88,125.62ZM391.56,162c13.28,0,21.41-6,21.41-16.6v-9.3a9.75,9.75,0,0,1-4.14,2.49c-3.82,1.33-6.31,1.66-14.28,2.49-11.62,1.33-17.43,5-17.43,10.79C377.12,158.33,382.43,162,391.56,162Z" fill="currentColor"/>
-<path d="M444.84,60.88h19.92V149.2c0,8.13,2.66,11.62,10,11.62a21.15,21.15,0,0,0,6-.67v17.76a35.56,35.56,0,0,1-9.47,1c-17.59,0-26.39-9-26.39-27.06Z" fill="currentColor"/>
-<path d="M521.71,125.62c14.11-1.32,19.09-3.15,19.09-9.62,0-5.15-4.64-9.13-13.94-9.13q-13.44,0-22.41,10.95l-12.28-10.46c8.13-11.45,19.58-17.09,34.36-17.09,20.75,0,33.7,10,33.7,27.05v37c0,5.81,2.15,6.48,7,6.48h.5v15.43c-2,1.17-5.15,1.83-9.3,1.83-4.48,0-8-1.33-10.62-4a13.94,13.94,0,0,1-3-5.48c-5.81,6.8-15.27,10.29-28.39,10.29-18.42,0-30.87-10.13-30.87-25.4C485.53,136.41,497,127.78,521.71,125.62ZM519.39,162c13.28,0,21.41-6,21.41-16.6v-9.3a9.73,9.73,0,0,1-4.15,2.49c-3.81,1.33-6.3,1.66-14.27,2.49-11.62,1.33-17.43,5-17.43,10.79C505,158.33,510.26,162,519.39,162Z" fill="currentColor"/>
-</svg>

frontend/src/assets/Logos/slog.svg

@@ -1,37 +0,0 @@
-<svg viewBox="0 0 254.5 225" xmlns="http://www.w3.org/2000/svg">
-<g>
-	<g>
-		<g>
-			<g>
-				<path fill="#00ACD7" d="M40.2,101.1c-0.4,0-0.5-0.2-0.3-0.5l2.1-2.7c0.2-0.3,0.7-0.5,1.1-0.5l35.7,0c0.4,0,0.5,0.3,0.3,0.6 l-1.7,2.6c-0.2,0.3-0.7,0.6-1,0.6L40.2,101.1z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<g>
-				<path fill="#00ACD7" d="M25.1,110.3c-0.4,0-0.5-0.2-0.3-0.5l2.1-2.7c0.2-0.3,0.7-0.5,1.1-0.5l45.6,0c0.4,0,0.6,0.3,0.5,0.6 l-0.8,2.4c-0.1,0.4-0.5,0.6-0.9,0.6L25.1,110.3z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<g>
-				<path fill="#00ACD7" d="M49.3,119.5c-0.4,0-0.5-0.3-0.3-0.6l1.4-2.5c0.2-0.3,0.6-0.6,1-0.6l20,0c0.4,0,0.6,0.3,0.6,0.7l-0.2,2.4 c0,0.4-0.4,0.7-0.7,0.7L49.3,119.5z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g id="CXHf1q_3_">
-			<g>
-				<g>
-					<path fill="#00ACD7" d="M153.1,99.3c-6.3,1.6-10.6,2.8-16.8,4.4c-1.5,0.4-1.6,0.5-2.9-1c-1.5-1.7-2.6-2.8-4.7-3.8 c-6.3-3.1-12.4-2.2-18.1,1.5c-6.8,4.4-10.3,10.9-10.2,19c0.1,8,5.6,14.6,13.5,15.7c6.8,0.9,12.5-1.5,17-6.6 c0.9-1.1,1.7-2.3,2.7-3.7c-3.6,0-8.1,0-19.3,0c-2.1,0-2.6-1.3-1.9-3c1.3-3.1,3.7-8.3,5.1-10.9c0.3-0.6,1-1.6,2.5-1.6 c5.1,0,23.9,0,36.4,0c-0.2,2.7-0.2,5.4-0.6,8.1c-1.1,7.2-3.8,13.8-8.2,19.6c-7.2,9.5-16.6,15.4-28.5,17 c-9.8,1.3-18.9-0.6-26.9-6.6c-7.4-5.6-11.6-13-12.7-22.2c-1.3-10.9,1.9-20.7,8.5-29.3c7.1-9.3,16.5-15.2,28-17.3 c9.4-1.7,18.4-0.6,26.5,4.9c5.3,3.5,9.1,8.3,11.6,14.1C154.7,98.5,154.3,99,153.1,99.3z"/>
-				</g>
-				<g>
-					<path fill="#00ACD7" d="M186.2,154.6c-9.1-0.2-17.4-2.8-24.4-8.8c-5.9-5.1-9.6-11.6-10.8-19.3c-1.8-11.3,1.3-21.3,8.1-30.2 c7.3-9.6,16.1-14.6,28-16.7c10.2-1.8,19.8-0.8,28.5,5.1c7.9,5.4,12.8,12.7,14.1,22.3c1.7,13.5-2.2,24.5-11.5,33.9 c-6.6,6.7-14.7,10.9-24,12.8C191.5,154.2,188.8,154.3,186.2,154.6z M210,114.2c-0.1-1.3-0.1-2.3-0.3-3.3 c-1.8-9.9-10.9-15.5-20.4-13.3c-9.3,2.1-15.3,8-17.5,17.4c-1.8,7.8,2,15.7,9.2,18.9c5.5,2.4,11,2.1,16.3-0.6 C205.2,129.2,209.5,122.8,210,114.2z"/>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.tsx

@@ -5,7 +5,6 @@ import { useSelector } from 'react-redux';
 import { Loader, Search } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
 import {
-	Button,
 	Flex,
 	Input,
 	InputRef,
@@ -17,6 +16,7 @@ import {
 	Tooltip,
 } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import type { FilterDropdownProps } from 'antd/lib/table/interface';
 import logEvent from 'api/common/logEvent';
 import {
@@ -105,9 +105,8 @@ const getColumnSearchProps = (
 			/>
 			<Space>
 				<Button
-					type="primary"
-					size="small"
 					onClick={(): void => handleSearch(selectedKeys as string[], confirm)}
+					size="sm"
 				>
 					<Flex align="center" gap={4}>
 						<Search size="md" />
@@ -116,17 +115,19 @@ const getColumnSearchProps = (
 				</Button>
 				<Button
 					onClick={(): void => clearFilters && handleReset(clearFilters, confirm)}
-					size="small"
 					style={{ width: 90 }}
+					size="sm"
+					variant="outlined"
+					color="secondary"
 				>
 					Reset
 				</Button>
 				<Button
-					type="link"
-					size="small"
 					onClick={(): void => {
 						close();
 					}}
+					size="sm"
+					variant="link"
 				>
 					close
 				</Button>

frontend/src/components/ChangelogModal/ChangelogModal.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useMutation } from 'react-query';
 import { Check, ChevronsDown, ScrollText, X } from '@signozhq/icons';
-import { Button, Flex, Modal } from 'antd';
+import { Flex, Modal } from 'antd';
 import updateUserPreference from 'api/v1/user/preferences/name/update';
 import cx from 'classnames';
 import { USER_PREFERENCES } from 'constants/userPreferences';
@@ -14,6 +14,7 @@ import { UserPreference } from 'types/api/preferences/preference';
 import ChangelogRenderer from './components/ChangelogRenderer';
 
 import './ChangelogModal.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 interface Props {
 	changelog: ChangelogSchema;
@@ -115,13 +116,13 @@ function ChangelogModal({ changelog, onClose }: Props): JSX.Element {
 				>
 					{!isCloudUser && (
 						<div className="changelog-modal-footer-ctas">
-							<Button type="default" onClick={onClose}>
+							<Button onClick={onClose} variant="outlined" color="secondary">
 								<Flex align="center" gap="4px">
 									<X size="md" />
 									Skip for now
 								</Flex>
 							</Button>
-							<Button type="primary" onClick={onClickUpdateWorkspace}>
+							<Button onClick={onClickUpdateWorkspace}>
 								<Flex align="center" gap="4px">
 									<Check size="md" />
 									Update my workspace

frontend/src/components/ChatSupportGateway/ChatSupportGateway.tsx

@@ -1,8 +1,9 @@
 import { useState } from 'react';
 import { useMutation } from 'react-query';
 import { useLocation } from 'react-router-dom';
-import { Button, Modal } from 'antd';
+import { Modal } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import logEvent from 'api/common/logEvent';
 import updateCreditCardApi from 'api/v1/checkout/create';
 import { useNotifications } from 'hooks/useNotifications';
@@ -72,6 +73,8 @@ export default function ChatSupportGateway(): JSX.Element {
 
 						setIsAddCreditCardModalOpen(true);
 					}}
+					variant="outlined"
+					color="secondary"
 				>
 					<MessageSquareText size={24} />
 				</Button>
@@ -90,19 +93,19 @@ export default function ChatSupportGateway(): JSX.Element {
 						key="cancel"
 						onClick={(): void => setIsAddCreditCardModalOpen(false)}
 						className="cancel-btn"
-						icon={<X size={16} />}
+						variant="outlined"
+						color="secondary"
+						prefix={<X size={16} />}
 					>
 						Cancel
 					</Button>,
 					<Button
 						key="submit"
-						type="primary"
-						icon={<CreditCard size={16} />}
-						size="middle"
 						loading={isLoadingBilling}
 						disabled={isLoadingBilling}
 						onClick={handleAddCreditCard}
 						className="add-credit-card-btn"
+						prefix={<CreditCard size={16} />}
 					>
 						Add Credit Card
 					</Button>,

frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx

@@ -137,7 +137,6 @@ function CreateServiceAccountModal(): JSX.Element {
 				<AuthZTooltip checks={[SACreatePermission]}>
 					<Button
 						type="submit"
-						// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
 						form="create-sa-form"
 						variant="solid"
 						color="primary"

frontend/src/components/CustomTimePicker/CalendarContainer.tsx

@@ -1,5 +1,5 @@
 import { Calendar } from '@signozhq/ui/calendar';
-import { Button } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import dayjs from 'dayjs';
 import { Calendar as CalendarIcon, Check, X } from '@signozhq/icons';
@@ -78,18 +78,20 @@ function CalendarContainer({
 
 				<div className="calendar-actions">
 					<Button
-						type="primary"
-						className="periscope-btn secondary cancel-btn"
+						className="cancel-btn"
 						onClick={onCancel}
-						icon={<X size={12} />}
+						prefix={<X size={12} />}
+						variant="outlined"
+						color="secondary"
 					>
 						Cancel
 					</Button>
 					<Button
-						type="primary"
-						className="periscope-btn primary apply-btn"
+						className="apply-btn"
 						onClick={onApply}
-						icon={<Check size={12} />}
+						prefix={<Check size={12} />}
+						variant="solid"
+						color="primary"
 					>
 						Apply
 					</Button>

frontend/src/components/CustomTimePicker/CustomTimePicker.styles.scss

@@ -108,7 +108,7 @@
 }
 
 .info-text:hover {
-	&.ant-btn-text {
+	& {
 		background-color: unset !important;
 	}
 }

frontend/src/components/CustomTimePicker/CustomTimePickerPopoverContent.tsx

@@ -8,7 +8,6 @@ import {
 } from 'react';
 import { useLocation } from 'react-router-dom';
 import { Color } from '@signozhq/design-tokens';
-import { Button } from 'antd';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
@@ -32,6 +31,7 @@ import TimezonePicker from './TimezonePicker';
 import { Timezone } from './timezoneUtils';
 
 import './CustomTimePicker.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 const TO_MILLISECONDS_FACTOR = 1000_000;
 
@@ -177,13 +177,14 @@ function CustomTimePickerPopoverContent({
 			<div className="relative-date-time-section">
 				{options.map((option) => (
 					<Button
-						type="text"
 						className="time-btns"
 						key={option.label + option.value}
 						onClick={(): void => {
 							handleExitLiveLogs();
 							onSelectHandler(option.label, option.value);
 						}}
+						variant="ghost"
+						color="secondary"
 					>
 						{option.label}
 					</Button>
@@ -249,15 +250,15 @@ function CustomTimePickerPopoverContent({
 					{isLogsExplorerPage && isLogsListView && (
 						<Button
 							className={cx('data-time-live', isLiveLogsEnabled ? 'active' : '')}
-							type="text"
 							onClick={handleGoLive}
+							variant="ghost"
+							color="secondary"
 						>
 							Live
 						</Button>
 					)}
 					{options.map((option) => (
 						<Button
-							type="text"
 							key={option.label + option.value}
 							onClick={(e: React.MouseEvent<HTMLButtonElement>): void => {
 								e.stopPropagation();
@@ -271,6 +272,8 @@ function CustomTimePickerPopoverContent({
 									? option.value === 'custom' && !isLiveLogsEnabled && 'active'
 									: selectedTime === option.value && !isLiveLogsEnabled && 'active',
 							)}
+							variant="ghost"
+							color="secondary"
 						>
 							<span className="time-label">{option.label}</span>
 
@@ -370,11 +373,12 @@ function CustomTimePickerPopoverContent({
 
 					<div className="timezone-container__right">
 						<Button
-							type="text"
-							size="small"
-							className="periscope-btn text timezone-change-button"
+							className="timezone-change-button"
 							onClick={handleTimezoneHintClick}
-							icon={<PenLine size={10} />}
+							size="sm"
+							variant="ghost"
+							prefix={<PenLine size={10} />}
+							color="none"
 						>
 							Change Timezone
 						</Button>

frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx

@@ -106,7 +106,7 @@ describe.each([
 		renderWithStore(dataSource);
 		const button = screen.getByTestId(testId);
 		expect(button).toBeInTheDocument();
-		expect(button).toHaveClass('periscope-btn', 'ghost');
+		expect(button).not.toBeDisabled();
 	});
 
 	it('shows popover with export options when download button is clicked', () => {

frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useMemo, useState } from 'react';
-import { Button, Popover, Radio, Tooltip } from 'antd';
+import { Popover, Radio, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import { TelemetryFieldKey } from 'api/v5/v5';
 import { useExportRawData } from 'hooks/useDownloadOptionsMenu/useDownloadOptionsMenu';
 import { Download, LoaderCircle } from '@signozhq/icons';
@@ -104,12 +105,11 @@ export default function DownloadOptionsMenu({
 				)}
 
 				<Button
-					type="primary"
-					icon={<Download size={16} />}
 					onClick={handleExport}
 					className="export-button"
 					disabled={isDownloading}
 					loading={isDownloading}
+					prefix={<Download size={16} />}
 				>
 					Export
 				</Button>
@@ -137,16 +137,18 @@ export default function DownloadOptionsMenu({
 		>
 			<Tooltip title="Download" placement="top">
 				<Button
-					className="periscope-btn ghost"
-					icon={
+					data-testid={`periscope-btn-download-${dataSource}`}
+					disabled={isDownloading}
+					variant="outlined"
+					color="secondary"
+					size="icon"
+					prefix={
 						isDownloading ? (
 							<LoaderCircle size={14} className="animate-spin" />
 						) : (
 							<Download size={14} />
 						)
 					}
-					data-testid={`periscope-btn-download-${dataSource}`}
-					disabled={isDownloading}
 				/>
 			</Tooltip>
 		</Popover>

frontend/src/components/DropDown/DropDown.tsx

@@ -1,8 +1,9 @@
 import { useState } from 'react';
 import { Ellipsis } from '@signozhq/icons';
-import { Button, Dropdown, MenuProps } from 'antd';
+import { Dropdown, MenuProps } from 'antd';
 
 import './DropDown.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function DropDown({
 	element,
@@ -31,12 +32,12 @@ function DropDown({
 			open={isDdOpen}
 		>
 			<Button
-				type="link"
 				className={`dropdown-button`}
 				onClick={(e): void => {
 					e.preventDefault();
 					setDdOpen(true);
 				}}
+				variant="link"
 			>
 				<Ellipsis className="dropdown-icon" size={16} />
 			</Button>

frontend/src/components/ErrorModal/ErrorModal.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Modal, Tag } from 'antd';
+import { Modal, Tag } from 'antd';
 import { CircleAlert, X } from '@signozhq/icons';
 import KeyValueLabel from 'periscope/components/KeyValueLabel';
 import { useAppContext } from 'providers/App/App';
@@ -9,6 +9,7 @@ import APIError from 'types/api/error';
 import ErrorContent from './components/ErrorContent';
 
 import './ErrorModal.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 type Props = {
 	error: APIError;
@@ -73,10 +74,11 @@ function ErrorModal({
 							<div className="error-modal__version-placeholder" />
 						)}
 						<Button
-							type="default"
 							className="close-button"
 							onClick={handleClose}
 							data-testid="close-button"
+							variant="outlined"
+							color="secondary"
 						>
 							<X size={16} color={Color.BG_VANILLA_400} />
 						</Button>

frontend/src/components/ExplorerCard/ExplorerCard.tsx

@@ -1,16 +1,8 @@
 import { useState } from 'react';
 import { useCopyToClipboard } from 'react-use';
-import {
-	Button,
-	Col,
-	Dropdown,
-	MenuProps,
-	Popover,
-	Row,
-	Select,
-	Space,
-} from 'antd';
+import { Col, Dropdown, MenuProps, Popover, Row, Select, Space } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import axios from 'axios';
 import TextToolTip from 'components/TextToolTip';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
@@ -159,7 +151,6 @@ function ExplorerCard({
 		],
 	};
 
-	const saveButtonType = isQueryUpdated ? 'default' : 'primary';
 	const saveButtonIcon = isQueryUpdated ? null : <Save size="md" />;
 
 	const showSaveView = false;
@@ -210,7 +201,7 @@ function ExplorerCard({
 									</Space>
 								)}
 								{isQueryUpdated && (
-									<Button type="primary" icon={<Save />} onClick={onUpdateQueryHandler}>
+									<Button onClick={onUpdateQueryHandler} prefix={<Save />}>
 										Save changes
 									</Button>
 								)}
@@ -230,9 +221,10 @@ function ExplorerCard({
 									onOpenChange={handleOpenChange}
 								>
 									<Button
-										type={saveButtonType}
-										icon={saveButtonIcon}
 										data-testid="traces-save-view-action"
+										variant="outlined"
+										color="secondary"
+										prefix={saveButtonIcon ?? undefined}
 									>
 										{isQueryUpdated
 											? SaveButtonText.SAVE_AS_NEW_VIEW

frontend/src/components/FieldsSelector/AddedFields.tsx

@@ -54,7 +54,7 @@ function SortableField({
 				<span className={styles.fieldKey}>{field.name}</span>
 			</div>
 			<Button
-				className={cx(styles.removeBtn, 'periscope-btn')}
+				className={styles.removeBtn}
 				variant="outlined"
 				color="destructive"
 				size="sm"

frontend/src/components/FieldsSelector/OtherFields.tsx

@@ -89,7 +89,7 @@ function OtherFields({
 									<span className={styles.fieldKey}>{attr.name}</span>
 									{!isAtLimit && (
 										<Button
-											className={cx(styles.addBtn, 'periscope-btn')}
+											className={styles.addBtn}
 											variant="outlined"
 											color="secondary"
 											size="sm"

frontend/src/components/HeaderRightSection/FeedbackModal.tsx

@@ -1,8 +1,9 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { toast } from '@signozhq/ui/sonner';
-import { Button, Input, Radio, RadioChangeEvent } from 'antd';
+import { Input, Radio, RadioChangeEvent } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import logEvent from 'api/common/logEvent';
 import { handleContactSupport } from 'container/Integrations/utils';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
@@ -125,11 +126,11 @@ function FeedbackModal({ onClose }: { onClose: () => void }): JSX.Element {
 
 			<div className="feedback-modal-content-footer">
 				<Button
-					className="periscope-btn primary"
-					type="primary"
 					onClick={handleSubmit}
 					loading={isLoading}
 					disabled={feedback.length === 0}
+					variant="solid"
+					color="primary"
 				>
 					Submit
 				</Button>

frontend/src/components/HeaderRightSection/HeaderRightSection.tsx

@@ -141,6 +141,7 @@ function HeaderRightSection({
 				>
 					<Button
 						variant="ghost"
+						color="secondary"
 						size="icon"
 						className="share-feedback-btn"
 						aria-label="Feedback"
@@ -164,14 +165,15 @@ function HeaderRightSection({
 				>
 					<Button
 						variant="ghost"
+						color="secondary"
 						size="icon"
 						aria-label="Announcements"
-						prefix={<Inbox size={14} />}
 						onClick={(): void => {
 							logEvent('Announcements: Clicked', {
 								page: location.pathname,
 							});
 						}}
+						prefix={<Inbox size={14} />}
 					/>
 				</Popover>
 			)}
@@ -190,6 +192,7 @@ function HeaderRightSection({
 				>
 					<Button
 						variant="ghost"
+						color="secondary"
 						size="icon"
 						aria-label="Share"
 						prefix={<Globe size={14} />}

frontend/src/components/HeaderRightSection/ShareURLModal.tsx

@@ -4,8 +4,9 @@ import { useSelector } from 'react-redux';
 import { matchPath, useLocation } from 'react-router-dom';
 import { useCopyToClipboard } from 'react-use';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Switch } from 'antd';
+import { Switch } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import logEvent from 'api/common/logEvent';
 import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
@@ -155,9 +156,10 @@ function ShareURLModal(): JSX.Element {
 					</div>
 
 					<Button
-						className="periscope-btn secondary"
 						onClick={handleCopyURL}
-						icon={isURLCopied ? <Check size={14} /> : <Link2 size={14} />}
+						variant="outlined"
+						color="secondary"
+						prefix={isURLCopied ? <Check size={14} /> : <Link2 size={14} />}
 					>
 						Copy page link
 					</Button>

frontend/src/components/HostMetricsDetail/WaitlistFragment/WaitlistFragment.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Color } from '@signozhq/design-tokens';
-import { Button } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import logEvent from 'api/common/logEvent';
 import { useNotifications } from 'hooks/useNotifications';
 import { CircleCheckBig, HandPlatter } from '@signozhq/icons';
@@ -57,17 +57,18 @@ export default function WaitlistFragment({
 			</Typography.Text>
 
 			<Button
-				className="periscope-btn join-waitlist-btn"
-				type="default"
+				className="join-waitlist-btn"
 				loading={isSubmitting}
-				icon={
+				onClick={handleJoinWaitlist}
+				variant="outlined"
+				color="secondary"
+				prefix={
 					isSuccess ? (
 						<CircleCheckBig size={16} color={Color.BG_FOREST_500} />
 					) : (
 						<HandPlatter size={16} />
 					)
 				}
-				onClick={handleJoinWaitlist}
 			>
 				Get early access
 			</Button>

frontend/src/components/InputWithLabel/InputWithLabel.tsx

@@ -1,6 +1,7 @@
 import { useState } from 'react';
-import { Button, Input } from 'antd';
+import { Input } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import cx from 'classnames';
 import { X } from '@signozhq/icons';
 
@@ -55,9 +56,12 @@ function InputWithLabel({
 			{labelAfter && <Typography.Text className="label">{label}</Typography.Text>}
 			{onClose && (
 				<Button
-					className="periscope-btn ghost close-btn"
-					icon={closeIcon || <X size={16} />}
+					className="close-btn"
 					onClick={onClose}
+					variant="outlined"
+					color="secondary"
+					size="icon"
+					prefix={(closeIcon as JSX.Element) || <X size={16} />}
 				/>
 			)}
 		</div>

frontend/src/components/LaunchChatSupport/LaunchChatSupport.styles.scss

@@ -2,7 +2,7 @@
 	color: var(--bg-amber-500);
 	border-color: var(--bg-amber-500);
 
-	> .ant-btn:hover {
+	> button:hover {
 		color: var(--bg-amber-400) !important;
 		border-color: var(--bg-amber-300) !important;
 	}

frontend/src/components/LaunchChatSupport/LaunchChatSupport.tsx

@@ -1,8 +1,9 @@
 import { useMemo, useState } from 'react';
 import { useMutation } from 'react-query';
 import { useLocation } from 'react-router-dom';
-import { Button, Modal, Tooltip } from 'antd';
+import { Modal, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import logEvent from 'api/common/logEvent';
 import updateCreditCardApi from 'api/v1/checkout/create';
 import cx from 'classnames';
@@ -168,9 +169,11 @@ function LaunchChatSupport({
 				overlayClassName="tooltip-overlay"
 			>
 				<Button
-					className={cx('periscope-btn', 'facing-issue-button', className)}
+					className={cx('facing-issue-button', className)}
 					onClick={handleFacingIssuesClick}
-					icon={<CircleHelp size={14} />}
+					variant="outlined"
+					color="secondary"
+					prefix={<CircleHelp size={14} />}
 				>
 					{buttonText || 'Facing issues?'}
 				</Button>
@@ -189,19 +192,19 @@ function LaunchChatSupport({
 						key="cancel"
 						onClick={(): void => setIsAddCreditCardModalOpen(false)}
 						className="cancel-btn"
-						icon={<X size={16} />}
+						variant="outlined"
+						color="secondary"
+						prefix={<X size={16} />}
 					>
 						Cancel
 					</Button>,
 					<Button
 						key="submit"
-						type="primary"
-						icon={<CreditCard size={16} />}
-						size="middle"
 						loading={isLoadingBilling}
 						disabled={isLoadingBilling}
 						onClick={handleAddCreditCard}
 						className="add-credit-card-btn"
+						prefix={<CreditCard size={16} />}
 					>
 						Add Credit Card
 					</Button>,

frontend/src/components/LearnMore/LearnMore.tsx

@@ -1,9 +1,9 @@
 import { Color } from '@signozhq/design-tokens';
-import { Button } from 'antd';
 import { ArrowUpRight } from '@signozhq/icons';
 import { openInNewTab } from 'utils/navigation';
 
 import './LearnMore.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 type LearnMoreProps = {
 	text?: string;
@@ -19,7 +19,7 @@ function LearnMore({ text, url, onClick }: LearnMoreProps): JSX.Element {
 		}
 	};
 	return (
-		<Button type="link" className="learn-more" onClick={handleClick}>
+		<Button className="learn-more" onClick={handleClick} variant="link">
 			<div className="learn-more__text">{text}</div>
 			<ArrowUpRight size={16} color={Color.BG_ROBIN_400} />
 		</Button>

frontend/src/components/LogDetail/LogDetails.styles.scss

@@ -17,7 +17,7 @@
 		.log-detail-drawer__title-right {
 			display: flex;
 			align-items: center;
-			.ant-btn {
+			button {
 				display: flex;
 				align-items: center;
 			}

frontend/src/components/Logs/ListLogView/ListLogView.styles.scss

@@ -166,7 +166,7 @@
 		border-left: 1px solid var(--l1-border) !important;
 	}
 
-	.ant-btn-default {
+	button {
 		border: none;
 		box-shadow: none;
 	}

frontend/src/components/Logs/LogLinesActionButtons/LogLinesActionButtons.styles.scss

@@ -9,7 +9,7 @@
 	border: 1px solid var(--l1-border);
 	background: var(--l2-background);
 
-	.ant-btn-default {
+	button {
 		border: none;
 		box-shadow: none;
 		padding: 9px;

frontend/src/components/Logs/LogLinesActionButtons/LogLinesActionButtons.tsx

@@ -1,8 +1,9 @@
 import { memo, MouseEventHandler } from 'react';
 import { Link, TextSelect } from '@signozhq/icons';
-import { Button, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
 
 import './LogLinesActionButtons.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 export interface LogLinesActionButtonsProps {
 	handleShowContext: MouseEventHandler<HTMLElement>;
@@ -19,18 +20,22 @@ function LogLinesActionButtons({
 		<div className={`log-line-action-buttons ${customClassName}`}>
 			<Tooltip title="Show in Context">
 				<Button
-					size="small"
-					icon={<TextSelect size={14} />}
 					className="show-context-btn"
 					onClick={handleShowContext}
+					size="sm"
+					variant="outlined"
+					color="secondary"
+					prefix={<TextSelect size={14} />}
 				/>
 			</Tooltip>
 			<Tooltip title="Copy Link">
 				<Button
-					size="small"
-					icon={<Link size={14} />}
 					onClick={onLogCopy}
 					className="copy-log-btn"
+					size="sm"
+					variant="outlined"
+					color="secondary"
+					prefix={<Link size={14} />}
 				/>
 			</Tooltip>
 		</div>

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { Button, Input, InputNumber, Popover, Tooltip } from 'antd';
+import { Input, InputNumber, Popover, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import type { DefaultOptionType } from 'antd/es/select';
 import cx from 'classnames';
 import { LogViewMode } from 'container/LogsTable';
@@ -223,7 +224,8 @@ function OptionsMenu({
 					<Button
 						onClick={(): void => setIsFontSizeOptionsOpen(false)}
 						className="back-btn"
-						type="text"
+						variant="ghost"
+						color="secondary"
 					>
 						<ChevronLeft size={14} className="icon" />
 						<Typography.Text className="text">Select font size</Typography.Text>
@@ -235,7 +237,8 @@ function OptionsMenu({
 								setFontSizeValue(FontSize.SMALL);
 							}}
 							className="option-btn"
-							type="text"
+							variant="ghost"
+							color="secondary"
 						>
 							<Typography.Text className="text">{FontSize.SMALL}</Typography.Text>
 							{fontSizeValue === FontSize.SMALL && (
@@ -247,7 +250,8 @@ function OptionsMenu({
 								setFontSizeValue(FontSize.MEDIUM);
 							}}
 							className="option-btn"
-							type="text"
+							variant="ghost"
+							color="secondary"
 						>
 							<Typography.Text className="text">{FontSize.MEDIUM}</Typography.Text>
 							{fontSizeValue === FontSize.MEDIUM && (
@@ -259,7 +263,8 @@ function OptionsMenu({
 								setFontSizeValue(FontSize.LARGE);
 							}}
 							className="option-btn"
-							type="text"
+							variant="ghost"
+							color="secondary"
 						>
 							<Typography.Text className="text">{FontSize.LARGE}</Typography.Text>
 							{fontSizeValue === FontSize.LARGE && (
@@ -338,10 +343,11 @@ function OptionsMenu({
 						<div className="title">Font Size</div>
 						<Button
 							className="value"
-							type="text"
 							onClick={(): void => {
 								setIsFontSizeOptionsOpen(true);
 							}}
+							variant="ghost"
+							color="secondary"
 						>
 							<Typography.Text className="font-value">{fontSizeValue}</Typography.Text>
 							<ChevronRight size={14} className="icon" />
@@ -472,9 +478,11 @@ function LogsFormatOptionsMenu({
 		>
 			<Tooltip title="Options">
 				<Button
-					className="periscope-btn ghost"
-					icon={<SlidersVertical size="md" />}
 					data-testid="periscope-btn-format-options"
+					variant="outlined"
+					color="secondary"
+					size="icon"
+					prefix={<SlidersVertical size={14} />}
 				/>
 			</Tooltip>
 		</Popover>

frontend/src/components/MessagingQueueHealthCheck/MessagingQueueHealthCheck.tsx

@@ -1,5 +1,4 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Button } from 'antd';
 import cx from 'classnames';
 import { useOnboardingStatus } from 'hooks/messagingQueue/useOnboardingStatus';
 import { Bolt, FolderTree } from '@signozhq/icons';
@@ -8,6 +7,7 @@ import { MessagingQueueHealthCheckService } from 'pages/MessagingQueues/Messagin
 import AttributeCheckList from './AttributeCheckList';
 
 import './MessagingQueueHealthCheck.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 interface MessagingQueueHealthCheckProps {
 	serviceToInclude: string[];
@@ -94,7 +94,9 @@ function MessagingQueueHealthCheck({
 					'config-btn',
 					missingConfiguration ? 'missing-config-btn' : '',
 				)}
-				icon={<Bolt size={12} />}
+				variant="outlined"
+				color="secondary"
+				prefix={<Bolt size={12} />}
 			>
 				<div className="config-btn-content">
 					{missingConfiguration

frontend/src/components/NewSelect/CustomMultiSelect.tsx

@@ -18,8 +18,9 @@ import {
 	RefreshCw,
 } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Checkbox, Select } from 'antd';
+import { Checkbox, Select } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import cx from 'classnames';
 import TextToolTip from 'components/TextToolTip/TextToolTip';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
@@ -767,11 +768,11 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 								<div className="option-badge">{capitalize(option.type)}</div>
 							)}
 							{option.value && ensureValidOption(option.value) && (
-								<Button type="text" className="only-btn">
+								<Button className="only-btn" variant="ghost" color="secondary">
 									{currentToggleTagValue({ option: option.value })}
 								</Button>
 							)}
-							<Button type="text" className="toggle-btn">
+							<Button className="toggle-btn" variant="ghost" color="secondary">
 								Toggle
 							</Button>
 						</div>

frontend/src/components/NoAuthBanner/NoAuthBanner.module.scss

@@ -1,13 +0,0 @@
-.banner {
-	height: var(--spacing-20);
-
-	a {
-		color: var(--callout-warning-title);
-		text-decoration: underline;
-
-		&:hover {
-			color: var(--callout-warning-title);
-			opacity: 0.8;
-		}
-	}
-}

frontend/src/components/NoAuthBanner/NoAuthBanner.tsx

@@ -1,26 +0,0 @@
-import { PersistedAnnouncementBanner } from '@signozhq/ui/announcement-banner';
-
-import styles from './NoAuthBanner.module.scss';
-
-export function NoAuthBanner(): JSX.Element {
-	return (
-		<PersistedAnnouncementBanner
-			type="warning"
-			storageKey="no-auth-banner-v1"
-			testId="no-auth-banner"
-			className={styles.banner}
-		>
-			Impersonation mode: authentication is disabled. Anyone with access to this
-			instance has admin privileges.{' '}
-			<a
-				href="https://signoz.io/docs/manage/administrator-guide/configuration/impersonation-mode/"
-				target="_blank"
-				rel="noreferrer"
-			>
-				Learn more
-			</a>
-		</PersistedAnnouncementBanner>
-	);
-}
-
-export default NoAuthBanner;

frontend/src/components/NoAuthBanner/__tests__/NoAuthBanner.test.tsx

@@ -1,24 +0,0 @@
-import { render, screen } from 'tests/test-utils';
-
-import { NoAuthBanner } from '../NoAuthBanner';
-
-describe('NoAuthBanner', () => {
-	it('renders the no-auth message', () => {
-		render(<NoAuthBanner />);
-		expect(
-			screen.getByText(/Impersonation mode: authentication is disabled/i),
-		).toBeInTheDocument();
-	});
-
-	it('renders with the warning test id', () => {
-		render(<NoAuthBanner />);
-		expect(screen.getByTestId('no-auth-banner')).toBeInTheDocument();
-	});
-
-	it('renders a docs link that opens in a new tab', () => {
-		render(<NoAuthBanner />);
-		const link = screen.getByRole('link', { name: /learn more/i });
-		expect(link).toHaveAttribute('target', '_blank');
-		expect(link).toHaveAttribute('rel', 'noreferrer');
-	});
-});

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/HavingFilter/HavingFilter.tsx

@@ -13,12 +13,12 @@ import { javascript } from '@codemirror/lang-javascript';
 import { copilot } from '@uiw/codemirror-theme-copilot';
 import { githubLight } from '@uiw/codemirror-theme-github';
 import CodeMirror, { EditorView, keymap } from '@uiw/react-codemirror';
-import { Button } from 'antd';
 import { Having } from 'api/v5/v5';
 import { useQueryBuilderV2Context } from 'components/QueryBuilderV2/QueryBuilderV2Context';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { ChevronUp } from '@signozhq/icons';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
+import { Button } from '@signozhq/ui/button';
 
 const havingOperators = [
 	{
@@ -368,9 +368,12 @@ function HavingFilter({
 					}}
 				/>
 				<Button
-					className="close-btn periscope-btn ghost"
-					icon={<ChevronUp size={16} />}
+					className="close-btn"
 					onClick={onClose}
+					variant="outlined"
+					color="secondary"
+					size="icon"
+					prefix={<ChevronUp size={16} />}
 				/>
 			</div>
 		</div>

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { Button, Radio, RadioChangeEvent, Tooltip } from 'antd';
+import { Radio, RadioChangeEvent, Tooltip } from 'antd';
 import InputWithLabel from 'components/InputWithLabel/InputWithLabel';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { GroupByFilter } from 'container/QueryBuilder/filters/GroupByFilter/GroupByFilter';
@@ -17,6 +17,7 @@ import HavingFilter from './HavingFilter/HavingFilter';
 import { buildDefaultLegendFromGroupBy } from './utils';
 
 import './QueryAddOns.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 interface AddOn {
 	icon: React.ReactNode;
@@ -370,9 +371,12 @@ function QueryAddOns({
 									/>
 								</div>
 								<Button
-									className="close-btn periscope-btn ghost"
-									icon={<ChevronUp size={16} />}
+									className="close-btn"
 									onClick={(): void => handleRemoveView('group_by')}
+									variant="outlined"
+									color="secondary"
+									size="icon"
+									prefix={<ChevronUp size={16} />}
 								/>
 							</div>
 						</div>
@@ -455,9 +459,12 @@ function QueryAddOns({
 								</div>
 								{!isListViewPanel && (
 									<Button
-										className="close-btn periscope-btn ghost"
-										icon={<ChevronUp size={16} />}
+										className="close-btn"
 										onClick={(): void => handleRemoveView('order_by')}
+										variant="outlined"
+										color="secondary"
+										size="icon"
+										prefix={<ChevronUp size={16} />}
 									/>
 								)}
 							</div>
@@ -488,9 +495,12 @@ function QueryAddOns({
 									</div>
 
 									<Button
-										className="close-btn periscope-btn ghost"
-										icon={<ChevronUp size={16} />}
+										className="close-btn"
 										onClick={(): void => handleRemoveView('reduce_to')}
+										variant="outlined"
+										color="secondary"
+										size="icon"
+										prefix={<ChevronUp size={16} />}
 									/>
 								</div>
 							</div>

frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregationSelect.tsx

@@ -23,7 +23,7 @@ import CodeMirror, {
 	ViewPlugin,
 	ViewUpdate,
 } from '@uiw/react-codemirror';
-import { Button, Popover, Tooltip } from 'antd';
+import { Popover, Tooltip } from 'antd';
 import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';
 import { QUERY_BUILDER_KEY_TYPES } from 'constants/antlrQueryConstants';
 import { QueryBuilderKeys } from 'constants/queryBuilder';
@@ -36,6 +36,7 @@ import { TracesAggregatorOperator } from 'types/common/queryBuilder';
 import { useQueryBuilderV2Context } from '../../QueryBuilderV2Context';
 
 import './QueryAggregation.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 const chipDecoration = Decoration.mark({
 	class: 'chip-decorator',
@@ -720,9 +721,10 @@ function QueryAggregationSelect({
 						overlayClassName="query-aggregation-error-popover"
 					>
 						<Button
-							type="text"
-							icon={<TriangleAlert size={14} color={Color.BG_CHERRY_500} />}
-							className="periscope-btn ghost query-aggregation-error-btn"
+							className="query-aggregation-error-btn"
+							variant="ghost"
+							size="icon"
+							prefix={<TriangleAlert size={14} color={Color.BG_CHERRY_500} />}
 						/>
 					</Popover>
 				</div>

frontend/src/components/QueryBuilderV2/QueryV2/QueryFooter/QueryFooter.tsx

@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
-import { Button, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { Button } from '@signozhq/ui/button';
 import WarningPopover from 'components/WarningPopover/WarningPopover';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -56,9 +57,11 @@ function TraceOperatorSection({
 				}
 			>
 				<Button
-					className="add-trace-operator-button periscope-btn"
-					icon={<DraftingCompass size={16} />}
+					className="add-trace-operator-button"
 					onClick={(): void => addTraceOperator?.()}
+					variant="outlined"
+					color="secondary"
+					prefix={<DraftingCompass size={16} />}
 				>
 					<div className="qb-trace-operator-button-container-text">
 						Add Trace Matching
@@ -92,9 +95,12 @@ export default function QueryFooter({
 				<div className="qb-add-new-query">
 					<Tooltip title={<div style={{ textAlign: 'center' }}>Add New Query</div>}>
 						<Button
-							className="add-new-query-button periscope-btn "
-							icon={<Plus size={16} />}
+							className="add-new-query-button"
 							onClick={addNewBuilderQuery}
+							variant="outlined"
+							color="secondary"
+							size="icon"
+							prefix={<Plus size={16} />}
 						/>
 					</Tooltip>
 				</div>
@@ -118,9 +124,11 @@ export default function QueryFooter({
 							}
 						>
 							<Button
-								className="add-formula-button periscope-btn "
-								icon={<Sigma size={16} />}
+								className="add-formula-button"
 								onClick={addNewFormula}
+								variant="outlined"
+								color="secondary"
+								prefix={<Sigma size={16} />}
 							>
 								Add Formula
 							</Button>

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx

@@ -14,7 +14,7 @@ import { Color } from '@signozhq/design-tokens';
 import { copilot } from '@uiw/codemirror-theme-copilot';
 import { githubLight } from '@uiw/codemirror-theme-github';
 import CodeMirror, { EditorView, keymap, Prec } from '@uiw/react-codemirror';
-import { Button, Card, Collapse, Popover, Tag, Tooltip } from 'antd';
+import { Card, Collapse, Popover, Tag, Tooltip } from 'antd';
 import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';
 import { getValueSuggestions } from 'api/querySuggestions/getValueSuggestion';
 import cx from 'classnames';
@@ -49,6 +49,7 @@ import { queryExamples } from './constants';
 import { combineInitialAndUserExpression } from './utils';
 
 import './QuerySearch.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 const { Panel } = Collapse;
 
@@ -1484,15 +1485,17 @@ function QuerySearch({
 						>
 							{validation.isValid ? (
 								<Button
-									type="text"
-									icon={<CircleCheck size="md" />}
-									className="periscope-btn ghost"
+									variant="ghost"
+									color="secondary"
+									size="icon"
+									prefix={<CircleCheck size={14} />}
 								/>
 							) : (
 								<Button
-									type="text"
-									icon={<TriangleAlert size={14} color={Color.BG_CHERRY_500} />}
-									className="periscope-btn ghost"
+									color="destructive"
+									variant="ghost"
+									size="icon"
+									prefix={<TriangleAlert size={14} />}
 								/>
 							)}
 						</Popover>

frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperator.tsx

@@ -1,5 +1,6 @@
 import { useCallback } from 'react';
-import { Button, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -108,7 +109,7 @@ export default function TraceOperator({
 				)}
 			</div>
 			<Tooltip title="Remove Trace Operator" placement="topLeft">
-				<Button className="periscope-btn ghost" onClick={removeTraceOperator}>
+				<Button onClick={removeTraceOperator} variant="outlined" color="secondary">
 					<Trash2 size={14} />
 				</Button>
 			</Tooltip>

frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperatorEditor.tsx

@@ -15,7 +15,7 @@ import { Color } from '@signozhq/design-tokens';
 import { copilot } from '@uiw/codemirror-theme-copilot';
 import { githubLight } from '@uiw/codemirror-theme-github';
 import CodeMirror, { EditorView, keymap, Prec } from '@uiw/react-codemirror';
-import { Button, Popover } from 'antd';
+import { Popover } from 'antd';
 import cx from 'classnames';
 import {
 	TRACE_OPERATOR_OPERATORS,
@@ -34,6 +34,7 @@ import { getInvolvedQueriesInTraceOperator } from './utils/utils';
 
 import '../QuerySearch/QuerySearch.styles.scss';
 import { CircleCheck, TriangleAlert } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
 
 // Custom extension to stop events
 const stopEventsExtension = EditorView.domEventHandlers({
@@ -465,15 +466,16 @@ function TraceOperatorEditor({
 						>
 							{validation.isValid ? (
 								<Button
-									type="text"
-									icon={<CircleCheck size="md" />}
-									className="periscope-btn ghost"
+									variant="ghost"
+									color="secondary"
+									size="icon"
+									prefix={<CircleCheck size={14} />}
 								/>
 							) : (
 								<Button
-									type="text"
-									icon={<TriangleAlert size={14} color={Color.BG_CHERRY_500} />}
-									className="periscope-btn ghost"
+									variant="ghost"
+									size="icon"
+									prefix={<TriangleAlert size={14} color={Color.BG_CHERRY_500} />}
 								/>
 							)}
 						</Popover>

frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable sonarjs/no-identical-functions */
 import { Fragment, useMemo, useState } from 'react';
-import { Button, Checkbox, Input, Skeleton } from 'antd';
+import { Checkbox, Input, Skeleton } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 import { removeKeysFromExpression } from 'components/QueryBuilderV2/utils';
@@ -660,14 +661,14 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 													{String(value)}
 												</Typography.Text>
 											)}
-											<Button type="text" className="only-btn">
+											<Button className="only-btn" variant="ghost" color="secondary">
 												{isSomeFilterPresentForCurrentAttribute
 													? currentFilterState[value] && !isMultipleValuesTrueForTheKey
 														? 'All'
 														: 'Only'
 													: 'Only'}
 											</Button>
-											<Button type="text" className="toggle-btn">
+											<Button className="toggle-btn" variant="ghost" color="secondary">
 												Toggle
 											</Button>
 										</div>

frontend/src/components/QuickFilters/FilterRenderers/Checkbox/LogsQuickFilterEmptyState.tsx

@@ -1,7 +1,7 @@
 import { Color } from '@signozhq/design-tokens';
-import { Button } from 'antd';
 import EmptyQuickFilterIcon from 'assets/CustomIcons/EmptyQuickFilterIcon';
 import { ArrowUpRight } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
 
 const QUICK_FILTER_DOC_PATHS: Record<string, string> = {
 	severity_text: 'severity-text',
@@ -39,9 +39,9 @@ function LogsQuickFilterEmptyState({
 				</div>
 			</div>
 			<Button
-				type="link"
 				className="go-to-docs__button"
 				onClick={handleLearnMoreClick}
+				variant="link"
 			>
 				<div className="go-to-docs__button-text">Learn more</div>
 				<ArrowUpRight size={14} color={Color.BG_ROBIN_400} />

frontend/src/components/QuickFilters/FilterRenderers/Duration/Duration.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button, Collapse } from 'antd';
+import { Collapse } from 'antd';
 import {
 	IQuickFiltersConfig,
 	QuickFiltersSource,
@@ -21,6 +21,7 @@ import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
 import { v4 as uuid } from 'uuid';
 
 import './Duration.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 export type FilterType = Record<
 	AllTraceFilterKeys,
@@ -299,9 +300,9 @@ function Duration({
 			/>
 			{activeKeys.includes('durationNano') && (
 				<Button
-					type="link"
 					onClick={onClearHandler}
 					data-testid="collapse-duration-clearBtn"
+					variant="link"
 				>
 					Clear All
 				</Button>

frontend/src/components/QuickFilters/QuickFiltersSettings/AddedFilters.tsx

@@ -14,10 +14,10 @@ import {
 	verticalListSortingStrategy,
 } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { Button } from 'antd';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import { GripVertical } from '@signozhq/icons';
 import { Filter as FilterType } from 'types/api/quickFilters/getCustomFilters';
+import { Button } from '@signozhq/ui/button';
 
 function SortableFilter({
 	filter,
@@ -50,11 +50,13 @@ function SortableFilter({
 			</div>
 			{allowRemove && (
 				<Button
-					className="remove-filter-btn periscope-btn"
-					size="small"
+					className="remove-filter-btn"
 					onClick={(): void => {
 						onRemove(filter as FilterType);
 					}}
+					size="sm"
+					variant="outlined"
+					color="secondary"
 				>
 					Remove
 				</Button>

frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { Button, Skeleton } from 'antd';
+import { Skeleton } from 'antd';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import { SIGNAL_DATA_SOURCE_MAP } from 'components/QuickFilters/QuickFiltersSettings/constants';
 import { SignalType } from 'components/QuickFilters/types';
@@ -12,6 +12,7 @@ import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 import { QueryKeyDataSuggestionsProps } from 'types/api/querySuggestions/types';
 import { Filter as FilterType } from 'types/api/quickFilters/getCustomFilters';
 import { DataSource } from 'types/common/queryBuilder';
+import { Button } from '@signozhq/ui/button';
 
 function OtherFiltersSkeleton(): JSX.Element {
 	return (
@@ -146,9 +147,11 @@ function OtherFilters({
 			<div key={filter.key} className="qf-filter-item other-filters-item">
 				<div className="qf-filter-key">{filter.key}</div>
 				<Button
-					className="add-filter-btn periscope-btn"
-					size="small"
+					className="add-filter-btn"
 					onClick={(): void => handleAddFilter(filter as FilterType)}
+					size="sm"
+					variant="outlined"
+					color="secondary"
 				>
 					Add
 				</Button>

frontend/src/components/QuickFilters/QuickFiltersSettings/QuickFiltersSettings.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { Button, Input } from 'antd';
+import { Input } from 'antd';
 import { Check, TableColumnsSplit, X } from '@signozhq/icons';
 import { Filter as FilterType } from 'types/api/quickFilters/getCustomFilters';
 
@@ -9,6 +9,7 @@ import useQuickFilterSettings from './hooks/useQuickFilterSettings';
 import OtherFilters from './OtherFilters';
 
 import './QuickFiltersSettings.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function QuickFiltersSettings({
 	signal,
@@ -86,17 +87,17 @@ function QuickFiltersSettings({
 			{hasUnsavedChanges && (
 				<div className="qf-footer">
 					<Button
-						type="default"
 						onClick={handleDiscardChanges}
-						icon={<X size={16} />}
+						variant="outlined"
+						color="secondary"
+						prefix={<X size={16} />}
 					>
 						Discard
 					</Button>
 					<Button
-						type="primary"
 						onClick={handleSaveChanges}
-						icon={<Check size={16} />}
 						loading={isUpdatingCustomFilters}
+						prefix={<Check size={16} />}
 					>
 						Save changes
 					</Button>

frontend/src/components/RefreshPaymentStatus/RefreshPaymentStatus.tsx

@@ -1,16 +1,14 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Button, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
 import refreshPaymentStatus from 'api/v3/licenses/put';
-import cx from 'classnames';
 import { RefreshCcw } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
+import { Button } from '@signozhq/ui/button';
 
 function RefreshPaymentStatus({
-	btnShape,
 	type,
 }: {
-	btnShape?: 'default' | 'round' | 'circle';
 	type?: 'button' | 'text' | 'tooltip';
 }): JSX.Element {
 	const { t } = useTranslation(['failedPayment']);
@@ -35,12 +33,11 @@ function RefreshPaymentStatus({
 		<span className="refresh-payment-status-btn-wrapper">
 			<Tooltip title={type === 'tooltip' ? t('refreshPaymentStatus') : ''}>
 				<Button
-					type={type === 'text' ? 'text' : 'default'}
-					shape={btnShape}
-					className={cx('periscope-btn', { text: type === 'text' })}
 					onClick={handleRefreshPaymentStatus}
-					icon={<RefreshCcw size={14} />}
 					loading={isLoading}
+					variant="outlined"
+					color="secondary"
+					prefix={<RefreshCcw size={14} />}
 				>
 					{type !== 'tooltip' ? t('refreshPaymentStatus') : ''}
 				</Button>
@@ -49,7 +46,6 @@ function RefreshPaymentStatus({
 	);
 }
 RefreshPaymentStatus.defaultProps = {
-	btnShape: 'default',
 	type: 'button',
 };
 

frontend/src/components/ResizeTable/DynamicColumnTable.tsx

@@ -4,7 +4,7 @@ import type {
 	TableColumnsType as ColumnsType,
 	TableColumnType as ColumnType,
 } from 'antd';
-import { Button, Dropdown, Flex, MenuProps, Switch } from 'antd';
+import { Dropdown, Flex, MenuProps, Switch } from 'antd';
 import logEvent from 'api/common/logEvent';
 import LaunchChatSupport from 'components/LaunchChatSupport/LaunchChatSupport';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
@@ -21,6 +21,7 @@ import {
 } from './utils';
 
 import './DynamicColumnTable.syles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function DynamicColumnTable({
 	tablesource,
@@ -133,9 +134,11 @@ function DynamicColumnTable({
 					>
 						<Button
 							className="dynamicColumnTable-button filter-btn"
-							size="middle"
-							icon={<SlidersHorizontal size={14} />}
 							data-testid="additional-filters-button"
+							variant="outlined"
+							color="secondary"
+							size="icon"
+							prefix={<SlidersHorizontal size={14} />}
 						/>
 					</Dropdown>
 				)}

frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx

@@ -127,7 +127,6 @@ function KeyFormPhase({
 					>
 						<Button
 							type="submit"
-							// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
 							form={FORM_ID}
 							variant="solid"
 							color="primary"

frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx

@@ -190,7 +190,6 @@ function EditKeyForm({
 					>
 						<Button
 							type="submit"
-							// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
 							form={FORM_ID}
 							variant="solid"
 							color="primary"

frontend/src/components/ServiceAccountDrawer/KeysTab.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
 import { KeyRound, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import { Skeleton, Table, Tooltip } from 'antd';
+import { Skeleton, Table } from 'antd';
 import type { ColumnsType } from 'antd/es/table/interface';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
 import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
@@ -110,34 +110,28 @@ function buildColumns({
 				onClick: (e): void => e.stopPropagation(),
 				style: { cursor: 'default' },
 			}),
-			render: (_, record): JSX.Element => {
-				const tooltipTitle = isDisabled ? 'Service account disabled' : 'Revoke Key';
-				return (
-					<AuthZTooltip
-						checks={[
-							buildAPIKeyDeletePermission(record.id),
-							buildSADetachPermission(accountId),
-						]}
-						enabled={!isDisabled && !!accountId}
+			render: (_, record): JSX.Element => (
+				<AuthZTooltip
+					checks={[
+						buildAPIKeyDeletePermission(record.id),
+						buildSADetachPermission(accountId),
+					]}
+					enabled={!isDisabled && !!accountId}
+				>
+					<Button
+						variant="ghost"
+						size="sm"
+						color="destructive"
+						disabled={isDisabled}
+						onClick={(): void => {
+							onRevokeClick(record.id);
+						}}
+						className="keys-tab__revoke-btn"
 					>
-						<Tooltip title={tooltipTitle}>
-							<Button
-								variant="ghost"
-								size="sm"
-								color="destructive"
-								disabled={isDisabled}
-								onClick={(e): void => {
-									e.stopPropagation();
-									onRevokeClick(record.id);
-								}}
-								className="keys-tab__revoke-btn"
-							>
-								<X size={12} />
-							</Button>
-						</Tooltip>
-					</AuthZTooltip>
-				);
-			},
+						<X size={12} />
+					</Button>
+				</AuthZTooltip>
+			),
 		},
 	];
 }

frontend/src/components/SignozModal/SignozModal.style.scss

@@ -74,7 +74,7 @@
 	}
 
 	.ant-modal-footer {
-		.ant-btn {
+		button {
 			display: flex;
 			align-items: center;
 			gap: 4px;

frontend/src/components/Tags/Tags.tsx

@@ -1,9 +1,10 @@
 import React, { Dispatch, SetStateAction, useState } from 'react';
 import { Check, Plus, X } from '@signozhq/icons';
-import { Button, Flex, Tag } from 'antd';
+import { Flex, Tag } from 'antd';
 import Input from 'components/Input';
 
 import './Tags.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function Tags({ tags, setTags }: AddTagsProps): JSX.Element {
 	const [inputValue, setInputValue] = useState<string>('');
@@ -71,19 +72,19 @@ function Tags({ tags, setTags }: AddTagsProps): JSX.Element {
 
 					<div className="confirm-cancel-actions">
 						<Button
-							type="primary"
-							className="periscope-btn"
-							size="small"
-							icon={<Check size={14} />}
 							onClick={handleInputConfirm}
+							size="sm"
+							prefix={<Check size={14} />}
+							variant="outlined"
+							color="secondary"
 						/>
 
 						<Button
-							type="primary"
-							className="periscope-btn"
-							size="small"
-							icon={<X size={14} />}
 							onClick={hideInput}
+							size="sm"
+							prefix={<X size={14} />}
+							variant="outlined"
+							color="secondary"
 						/>
 					</div>
 				</div>
@@ -91,15 +92,14 @@ function Tags({ tags, setTags }: AddTagsProps): JSX.Element {
 
 			{!inputVisible && (
 				<Button
-					type="primary"
-					size="small"
 					style={{
 						fontSize: '11px',
 					}}
 					onClick={showInput}
+					size="sm"
+					prefix={<Plus size={14} />}
 				>
 					<Flex justify="center" align="center" gap={4}>
-						<Plus size="md" />
 						New Tag
 					</Flex>
 				</Button>

frontend/src/components/TimePreferenceDropDown/index.tsx

@@ -1,6 +1,7 @@
 import { Dispatch, SetStateAction, useCallback, useMemo } from 'react';
 import { ChevronDown, Globe } from '@signozhq/icons';
-import { Button, Dropdown } from 'antd';
+import { Dropdown } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import TimeItems, {
 	timePreferance,
@@ -40,7 +41,7 @@ function TimePreference({
 			className="time-selection-target"
 			trigger={['click']}
 		>
-			<Button>
+			<Button variant="outlined" color="secondary">
 				<div className="button-selected-text">
 					<Globe size={14} />
 					<Typography.Text className="selected-value">

frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx

@@ -161,6 +161,7 @@ export default function AIAssistantModal(): JSX.Element | null {
 							<TooltipSimple title={showHistory ? 'Back to chat' : 'Conversations'}>
 								<Button
 									variant="ghost"
+									color="secondary"
 									size="icon"
 									onClick={(): void => setShowHistory((v) => !v)}
 									aria-label="Toggle conversations"
@@ -173,6 +174,7 @@ export default function AIAssistantModal(): JSX.Element | null {
 							<TooltipSimple title="New conversation">
 								<Button
 									variant="ghost"
+									color="secondary"
 									size="icon"
 									onClick={handleNew}
 									aria-label="New conversation"
@@ -184,6 +186,7 @@ export default function AIAssistantModal(): JSX.Element | null {
 							<TooltipSimple title="Open full screen">
 								<Button
 									variant="ghost"
+									color="secondary"
 									size="icon"
 									onClick={handleExpand}
 									disabled={!activeConversationId}
@@ -196,6 +199,7 @@ export default function AIAssistantModal(): JSX.Element | null {
 							<TooltipSimple title="Minimize to side panel">
 								<Button
 									variant="ghost"
+									color="secondary"
 									size="icon"
 									onClick={handleMinimize}
 									aria-label="Minimize to side panel"
@@ -207,6 +211,7 @@ export default function AIAssistantModal(): JSX.Element | null {
 							<TooltipSimple title="Close">
 								<Button
 									variant="ghost"
+									color="secondary"
 									size="icon"
 									onClick={closeModal}
 									aria-label="Close"

frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx

@@ -738,6 +738,7 @@ export default function ChatInput({
 							<span className={styles.attachmentName}>{f.name}</span>
 							<Button
 								variant="ghost"
+								color="secondary"
 								size="icon"
 								className={styles.attachmentRemove}
 								onClick={(): void => removeFile(f.uid)}
@@ -1007,6 +1008,7 @@ export default function ChatInput({
 							<TooltipSimple title="Voice input">
 								<Button
 									variant="ghost"
+									color="secondary"
 									size="icon"
 									onClick={(): void => startVoiceInput('button')}
 									disabled={disabled}

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsCard.tsx

@@ -1,7 +1,6 @@
 import { useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { Color } from '@signozhq/design-tokens';
-import { Button } from 'antd';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import history from 'lib/history';
 import { ArrowRight } from '@signozhq/icons';
@@ -11,6 +10,7 @@ import { TopContributorsCardProps } from './types';
 import ViewAllDrawer from './ViewAllDrawer';
 
 import './TopContributorsCard.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function TopContributorsCard({
 	topContributorsData,
@@ -52,7 +52,12 @@ function TopContributorsCard({
 				<div className="top-contributors-card__header">
 					<div className="title">top contributors</div>
 					{topContributorsData.length > 3 && (
-						<Button type="text" className="view-all" onClick={toggleViewAllDrawer}>
+						<Button
+							className="view-all"
+							onClick={toggleViewAllDrawer}
+							variant="ghost"
+							color="secondary"
+						>
 							<div className="label">View all</div>
 							<div className="icon">
 								<ArrowRight

frontend/src/container/AllAlertChannels/AlertChannels.tsx

@@ -1,7 +1,6 @@
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { generatePath } from 'react-router-dom';
-import { Button } from 'antd';
 import type { ColumnsType } from 'antd/lib/table';
 import { ResizeTable } from 'components/ResizeTable';
 import ROUTES from 'constants/routes';
@@ -12,6 +11,7 @@ import { useAppContext } from 'providers/App/App';
 import { Channels } from 'types/api/channels/getAll';
 
 import Delete from './Delete';
+import { Button } from '@signozhq/ui/button';
 
 function AlertChannels({ allChannels }: AlertChannelsProps): JSX.Element {
 	const { t } = useTranslation(['channels']);
@@ -51,7 +51,7 @@ function AlertChannels({ allChannels }: AlertChannelsProps): JSX.Element {
 			width: 80,
 			render: (id: string): JSX.Element => (
 				<>
-					<Button onClick={(): void => onClickEditHandler(id)} type="link">
+					<Button onClick={(): void => onClickEditHandler(id)} variant="link">
 						{t('column_channel_edit')}
 					</Button>
 					<Delete id={id} notifications={notifications} />

frontend/src/container/AllAlertChannels/Delete.tsx

@@ -1,10 +1,10 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQueryClient } from 'react-query';
-import { Button } from 'antd';
 import type { NotificationInstance } from 'antd/es/notification/interface';
 import deleteChannel from 'api/channels/delete';
 import APIError from 'types/api/error';
+import { Button } from '@signozhq/ui/button';
 
 function Delete({ notifications, id }: DeleteProps): JSX.Element {
 	const { t } = useTranslation(['channels']);
@@ -38,8 +38,8 @@ function Delete({ notifications, id }: DeleteProps): JSX.Element {
 		<Button
 			loading={loading}
 			disabled={loading}
-			type="link"
 			onClick={onClickHandler}
+			variant="link"
 		>
 			Delete
 		</Button>

frontend/src/container/AllError/index.tsx

@@ -1,3 +1,4 @@
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import { useCallback, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -5,7 +6,7 @@ import { useQueries } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { Link, useLocation } from 'react-router-dom';
-import { Button, Card, Input, Space, TableProps, Tooltip, Flex } from 'antd';
+import { Card, Input, Space, TableProps, Tooltip, Flex } from 'antd';
 import { Search } from '@signozhq/icons';
 import type { ColumnType, TablePaginationConfig } from 'antd/es/table';
 import type { FilterValue, SorterResult } from 'antd/es/table/interface';
@@ -266,9 +267,8 @@ function AllErrors(): JSX.Element {
 						onPressEnter={handleSearch(confirm, String(selectedKeys[0]), filterKey)}
 					/>
 					<Button
-						type="primary"
 						onClick={handleSearch(confirm, String(selectedKeys[0]), filterKey)}
-						size="small"
+						size="sm"
 					>
 						<Flex align="center" justify="center" gap={4}>
 							<Search size="md" />

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.styles.scss

@@ -706,7 +706,7 @@
 	.views-tabs {
 		color: var(--l2-foreground);
 
-		.ant-btn {
+		button {
 			box-shadow: none;
 			position: relative;
 		}

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.tsx

@@ -2,7 +2,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { Spacing } from '@signozhq/design-tokens';
-import { Button, Divider, Drawer, Radio } from 'antd';
+import { Divider, Drawer, Radio } from 'antd';
+import { Button, ButtonGroup } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import type { RadioChangeEvent } from 'antd/lib';
 import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
@@ -176,7 +177,7 @@ function DomainDetails({
 							modalInitialStartTime={modalTimeRange.startTime * 1000}
 							modalInitialEndTime={modalTimeRange.endTime * 1000}
 						/>
-						<Button.Group className="domain-details-drawer-header-ctas">
+						<ButtonGroup className="domain-details-drawer-header-ctas">
 							<Button
 								className="domain-navigate-cta"
 								onClick={(): void => {
@@ -185,9 +186,12 @@ function DomainDetails({
 									setEndPointsGroupBy([]);
 									setSelectedView(VIEW_TYPES.ALL_ENDPOINTS);
 								}}
-								icon={<ArrowUp size={16} />}
 								disabled={selectedDomainIndex === 0}
 								title="Previous domain"
+								variant="outlined"
+								color="secondary"
+								size="icon"
+								prefix={<ArrowUp size={16} />}
 							/>
 							<Button
 								className="domain-navigate-cta"
@@ -197,11 +201,14 @@ function DomainDetails({
 									setEndPointsGroupBy([]);
 									setSelectedView(VIEW_TYPES.ALL_ENDPOINTS);
 								}}
-								icon={<ArrowDown size={16} />}
 								disabled={selectedDomainIndex === domainListLength - 1}
 								title="Next domain"
+								variant="outlined"
+								color="secondary"
+								size="icon"
+								prefix={<ArrowDown size={16} />}
 							/>
-						</Button.Group>
+						</ButtonGroup>
 					</div>
 				</div>
 			}

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/ErrorState.tsx

@@ -1,4 +1,4 @@
-import { Button } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import { RotateCw } from '@signozhq/icons';
 
@@ -22,7 +22,9 @@ function ErrorState({ refetch }: { refetch: () => void }): JSX.Element {
 				<Button
 					className="refresh-cta"
 					onClick={(): void => refetch()}
-					icon={<RotateCw size={16} />}
+					variant="outlined"
+					color="secondary"
+					prefix={<RotateCw size={16} />}
 				>
 					Refresh this panel
 				</Button>

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/StatusCodeBarCharts.tsx

@@ -1,7 +1,8 @@
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Card, Skeleton } from 'antd';
+import { Card, Skeleton } from 'antd';
+import { Button, ButtonGroup } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 import { useNavigateToExplorer } from 'components/CeleryTask/useNavigateToExplorer';
@@ -247,23 +248,25 @@ function StatusCodeBarCharts({
 			<Card bordered className="endpoint-details-card">
 				<div className="header">
 					<Typography.Text>Call response status</Typography.Text>
-					<Button.Group className="views-tabs">
+					<ButtonGroup>
 						<Button
-							value={0}
 							className={currentWidgetInfoIndex === 0 ? 'selected_view tab' : 'tab'}
 							disabled={false}
 							onClick={(): void => setCurrentWidgetInfoIndex(0)}
+							variant="outlined"
+							color="secondary"
 						>
 							Number of calls
 						</Button>
 						<Button
-							value={1}
 							className={currentWidgetInfoIndex === 1 ? 'selected_view tab' : 'tab'}
 							onClick={(): void => setCurrentWidgetInfoIndex(1)}
+							variant="outlined"
+							color="secondary"
 						>
 							Latency
 						</Button>
-					</Button.Group>
+					</ButtonGroup>
 				</div>
 				<div className="graph-container" ref={graphRef}>
 					{renderCardContent(endPointStatusCodeBarChartsDataQuery)}

frontend/src/container/BillingContainer/BillingContainer.tsx

@@ -1,3 +1,4 @@
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -6,7 +7,6 @@ import { CircleCheck, CloudDownload } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
 import {
 	Alert,
-	Button,
 	Card,
 	Col,
 	Flex,
@@ -445,12 +445,11 @@ export default function BillingContainer(): JSX.Element {
 					</Flex>
 					<Flex gap={8}>
 						<Button
-							type="default"
-							size="middle"
 							loading={isLoadingBilling || isLoadingManageBilling}
 							disabled={isLoading || isFetchingBillingData}
 							onClick={handleCsvDownload}
-							className="periscope-btn"
+							variant="outlined"
+							color="secondary"
 						>
 							<Flex align="center" justify="center" gap={4}>
 								<CloudDownload size="md" />
@@ -459,8 +458,6 @@ export default function BillingContainer(): JSX.Element {
 						</Button>
 						<Button
 							data-testid="header-billing-button"
-							type="primary"
-							size="middle"
 							loading={isLoadingBilling || isLoadingManageBilling}
 							disabled={isLoading}
 							onClick={handleBilling}
@@ -584,8 +581,6 @@ export default function BillingContainer(): JSX.Element {
 						<Col span={4} style={{ display: 'flex', justifyContent: 'flex-end' }}>
 							<Button
 								data-testid="upgrade-plan-button"
-								type="primary"
-								size="middle"
 								loading={isLoadingBilling || isLoadingManageBilling}
 								onClick={handleBilling}
 							>

frontend/src/container/Controls/index.tsx

@@ -1,11 +1,12 @@
 import { memo, useMemo } from 'react';
 import { ChevronLeft, ChevronRight } from '@signozhq/icons';
-import { Button, Flex, Select } from 'antd';
+import { Flex, Select } from 'antd';
 import { DEFAULT_PER_PAGE_OPTIONS, Pagination } from 'hooks/queryPagination';
 import { popupContainer } from 'utils/selectPopupContainer';
 
 import { defaultSelectStyle } from './config';
 import { Container } from './styles';
+import { Button } from '@signozhq/ui/button';
 
 function Controls({
 	offset = 0,
@@ -37,10 +38,10 @@ function Controls({
 		<Container>
 			<Button
 				loading={isLoading}
-				size="small"
-				type="link"
 				disabled={isPreviousDisabled}
 				onClick={handleNavigatePrevious}
+				size="sm"
+				variant="link"
 			>
 				<Flex align="center" gap="4px">
 					<ChevronLeft size={16} /> Previous
@@ -48,10 +49,10 @@ function Controls({
 			</Button>
 			<Button
 				loading={isLoading}
-				size="small"
-				type="link"
 				disabled={isNextDisabled}
 				onClick={handleNavigateNext}
+				size="sm"
+				variant="link"
 			>
 				<Flex align="center" gap="4px">
 					Next <ChevronRight size={16} />

frontend/src/container/CreateAlertV2/AlertCondition/AlertCondition.tsx

@@ -1,5 +1,5 @@
 import { useQuery } from 'react-query';
-import { Button, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
 import getAllChannels from 'api/channels/getAll';
 import classNames from 'classnames';
 import { ChartLine } from '@signozhq/icons';
@@ -16,6 +16,7 @@ import AnomalyThreshold from './AnomalyThreshold';
 import { ANOMALY_TAB_TOOLTIP, THRESHOLD_TAB_TOOLTIP } from './constants';
 
 import './styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function AlertCondition(): JSX.Element {
 	const { alertType, setAlertType } = useCreateAlertState();
@@ -82,6 +83,8 @@ function AlertCondition(): JSX.Element {
 										handleAlertTypeChange(tab.value as AlertTypes);
 									}
 								}}
+								variant="outlined"
+								color="secondary"
 							>
 								{tab.icon}
 								{tab.label}

frontend/src/container/CreateAlertV2/AlertCondition/AlertThreshold.tsx

@@ -1,5 +1,6 @@
 import { useEffect } from 'react';
-import { Button, Select, Tooltip } from 'antd';
+import { Select, Tooltip } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import classNames from 'classnames';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -294,11 +295,11 @@ function AlertThreshold({
 					/>
 				))}
 				<Button
-					type="dashed"
-					icon={<Plus size={16} />}
 					onClick={addThreshold}
 					className="add-threshold-btn"
 					data-testid="add-threshold-button"
+					variant="dashed"
+					prefix={<Plus size={16} />}
 				>
 					Add Threshold
 				</Button>

frontend/src/container/CreateAlertV2/AlertCondition/ThresholdItem.tsx

@@ -1,5 +1,6 @@
 import { useMemo, useState } from 'react';
-import { Button, Input, Select, Tooltip } from 'antd';
+import { Input, Select, Tooltip } from 'antd';
+import { Button, ButtonGroup } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import { CircleX, Trash } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
@@ -166,16 +167,18 @@ function ThresholdItem({
 							/>
 							<Tooltip title="Remove recovery threshold">
 								<Button
-									type="default"
-									icon={<Trash size={16} />}
 									onClick={removeRecoveryThreshold}
 									className="icon-btn"
 									data-testid="remove-recovery-threshold-button"
+									variant="outlined"
+									color="secondary"
+									size="icon"
+									prefix={<Trash size={16} />}
 								/>
 							</Tooltip>
 						</>
 					)}
-					<Button.Group>
+					<ButtonGroup>
 						{/* TODO: Add recovery threshold back once the functionality is implemented */}
 						{/* {!showRecoveryThreshold && (
 							<Tooltip title="Add recovery threshold">
@@ -190,15 +193,17 @@ function ThresholdItem({
 						{showRemoveButton && (
 							<Tooltip title="Remove threshold">
 								<Button
-									type="default"
-									icon={<CircleX size={16} />}
 									onClick={(): void => removeThreshold(threshold.id)}
 									className="icon-btn"
 									data-testid="remove-threshold-button"
+									variant="outlined"
+									color="secondary"
+									size="icon"
+									prefix={<CircleX size={16} />}
 								/>
 							</Tooltip>
 						)}
-					</Button.Group>
+					</ButtonGroup>
 				</div>
 			</div>
 		</div>

frontend/src/container/CreateAlertV2/AlertCondition/styles.scss

@@ -333,7 +333,7 @@
 }
 
 .condensed-evaluation-settings-container {
-	.ant-btn {
+	button {
 		display: flex;
 		align-items: center;
 		min-width: 240px;

frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx

@@ -1,4 +1,5 @@
-import { Button, Flex, SelectProps, Switch } from 'antd';
+import { Flex, SelectProps, Switch } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import type { BaseOptionType, DefaultOptionType } from 'antd/es/select';
 import { getInvolvedQueriesInTraceOperator } from 'components/QueryBuilderV2/QueryV2/TraceOperator/utils/utils';
@@ -388,10 +389,10 @@ export function NotificationChannelsNotFoundContent({
 						Create one
 						<Button
 							style={{ padding: '0 4px' }}
-							type="link"
 							onClick={(): void => {
 								openInNewTab(ROUTES.CHANNELS_NEW);
 							}}
+							variant="link"
 						>
 							here.
 						</Button>
@@ -400,7 +401,7 @@ export function NotificationChannelsNotFoundContent({
 					<Typography.Text>Please ask your admin to create one.</Typography.Text>
 				)}
 			</Flex>
-			<Button type="text" onClick={refreshChannels}>
+			<Button onClick={refreshChannels} variant="ghost" color="secondary">
 				Refresh
 			</Button>
 		</Flex>
@@ -429,10 +430,10 @@ export function RoutingPolicyBanner({
 					}}
 				/>
 				<Button
-					type="link"
 					className="view-routing-policies-button"
 					data-testid="view-routing-policies-button"
 					onClick={(): void => safeNavigate(ROUTING_POLICIES_ROUTE)}
+					variant="link"
 				>
 					View Routing Policies
 					<ArrowRight size={14} />

frontend/src/container/CreateAlertV2/CreateAlertHeader/styles.scss

@@ -50,7 +50,7 @@
 		color: var(--l2-foreground);
 	}
 
-	.ant-btn {
+	button {
 		display: flex;
 		gap: 4px;
 		align-items: center;

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationCadence/EditCustomSchedule.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { Button } from 'antd';
+import { Button, ButtonGroup } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import { useCreateAlertState } from 'container/CreateAlertV2/context';
 import { INITIAL_ADVANCED_OPTIONS_STATE } from 'container/CreateAlertV2/context/constants';
@@ -80,23 +80,19 @@ function EditCustomSchedule({
 		<div className="edit-custom-schedule">
 			{displayText}
 			<div className="button-row">
-				<Button.Group>
-					<Button type="default" onClick={handleEdit}>
-						<Pencil size={12} />
+				<ButtonGroup variant="outlined" color="secondary">
+					<Button onClick={handleEdit} prefix={<Pencil size={12} />}>
 						<Typography.Text>Edit custom schedule</Typography.Text>
 					</Button>
-					<Button type="default" onClick={handlePreview}>
-						<Calendar1 size={12} />
+					<Button onClick={handlePreview} prefix={<Calendar1 size={12} />}>
 						<Typography.Text>Preview</Typography.Text>
 					</Button>
 					<Button
 						data-testid="discard-button"
-						type="default"
 						onClick={handleDiscard}
-					>
-						<Trash size={12} />
-					</Button>
-				</Button.Group>
+						prefix={<Trash size={12} />}
+					/>
+				</ButtonGroup>
 			</div>
 		</div>
 	);

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationCadence/EvaluationCadenceDetails.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Button, DatePicker, Input, Select } from 'antd';
+import { DatePicker, Input, Select } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import classNames from 'classnames';
 import { useCreateAlertState } from 'container/CreateAlertV2/context';
@@ -311,6 +312,8 @@ function EvaluationCadenceDetails({
 									onClick={(): void => {
 										handleChangeTab(tab.value as 'editor' | 'rrule');
 									}}
+									variant="outlined"
+									color="secondary"
 								>
 									{tab.icon}
 									{tab.label}
@@ -321,14 +324,10 @@ function EvaluationCadenceDetails({
 					{activeTab === 'editor' && EditorView}
 					{activeTab === 'rrule' && RRuleView}
 					<div className="buttons-row">
-						<Button type="default" onClick={handleDiscard}>
+						<Button onClick={handleDiscard} variant="outlined" color="secondary">
 							Discard
 						</Button>
-						<Button
-							type="primary"
-							onClick={handleSaveCustomSchedule}
-							disabled={disableSaveButton}
-						>
+						<Button onClick={handleSaveCustomSchedule} disabled={disableSaveButton}>
 							Save Custom Schedule
 						</Button>
 					</div>

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationCadence/styles.scss

@@ -25,17 +25,6 @@
 				font-size: 13px;
 			}
 		}
-
-		.ant-btn-group {
-			.ant-btn {
-				border: 1px solid var(--l1-border);
-				color: var(--l2-foreground);
-				font-size: 13px;
-				display: flex;
-				align-items: center;
-				gap: 8px;
-			}
-		}
 	}
 }
 

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationSettings.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Button, Popover } from 'antd';
+import { Popover } from 'antd';
 import { ChevronDown, ChevronUp } from '@signozhq/icons';
 
 import { useCreateAlertState } from '../context';
@@ -7,6 +7,7 @@ import EvaluationWindowPopover from './EvaluationWindowPopover';
 import { getEvaluationWindowTypeText, getTimeframeText } from './utils';
 
 import './styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function EvaluationSettings(): JSX.Element {
 	const { evaluationWindow, setEvaluationWindow } = useCreateAlertState();
@@ -29,7 +30,11 @@ function EvaluationSettings(): JSX.Element {
 			trigger="click"
 			showArrow={false}
 		>
-			<Button data-testid="evaluation-settings-button">
+			<Button
+				data-testid="evaluation-settings-button"
+				variant="outlined"
+				color="secondary"
+			>
 				<div className="evaluate-alert-conditions-button-left">
 					{getTimeframeText(evaluationWindow)}
 				</div>

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationWindowPopover/EvaluationWindowPopover.tsx

@@ -1,4 +1,4 @@
-import { Button } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import classNames from 'classnames';
 import { Check } from '@signozhq/icons';
@@ -98,7 +98,7 @@ function EvaluationWindowPopover({
 					<Typography.Text>
 						{getRollingWindowDescription(evaluationWindow.timeframe)}
 					</Typography.Text>
-					<Button type="link">Read the docs</Button>
+					<Button variant="link">Read the docs</Button>
 				</div>
 			);
 		}
@@ -112,7 +112,7 @@ function EvaluationWindowPopover({
 					<Typography.Text>
 						{getCumulativeWindowDescription(evaluationWindow.timeframe)}
 					</Typography.Text>
-					<Button type="link">Read the docs</Button>
+					<Button variant="link">Read the docs</Button>
 				</div>
 			);
 		}

frontend/src/container/CreateAlertV2/EvaluationSettings/styles.scss

@@ -22,7 +22,7 @@
 			border-top: 1px dashed var(--l1-border);
 		}
 
-		.ant-btn {
+		button {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
@@ -156,7 +156,7 @@
 						color: var(--muted-foreground);
 					}
 
-					.ant-btn {
+					button {
 						width: fit-content;
 					}
 				}
@@ -171,7 +171,7 @@
 				padding: 16px;
 			}
 
-			.ant-btn {
+			button {
 				background-color: var(--l3-background);
 				border: 1px solid var(--l1-border);
 				color: var(--l2-foreground);

frontend/src/container/CreateAlertV2/Footer/styles.scss

@@ -17,13 +17,13 @@
 		gap: 12px;
 	}
 
-	.ant-btn {
+	button {
 		display: flex;
 		align-items: center;
 		gap: 8px;
 	}
 
-	.ant-btn-default {
+	button {
 		background-color: var(--l1-background);
 		border: 1px solid var(--l1-border);
 		color: var(--l2-foreground);

frontend/src/container/CreateAlertV2/NotificationSettings/styles.scss

@@ -42,7 +42,7 @@
 			}
 
 			.notification-message-header-actions {
-				.ant-btn {
+				button {
 					display: flex;
 					align-items: center;
 					justify-content: center;

frontend/src/container/CreateAlertV2/QuerySection/QuerySection.tsx

@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useQueryClient } from 'react-query';
-import { Button } from 'antd';
 import classNames from 'classnames';
 import { YAxisSource } from 'components/YAxisUnitSelector/types';
 import { QueryParams } from 'constants/query';
@@ -26,6 +25,7 @@ import ChartPreview from './ChartPreview';
 import { buildAlertDefForChartPreview } from './utils';
 
 import './styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function QuerySection(): JSX.Element {
 	const {
@@ -149,6 +149,8 @@ function QuerySection(): JSX.Element {
 							onClick={(): void => {
 								setAlertType(tab.value as AlertTypes);
 							}}
+							variant="outlined"
+							color="secondary"
 						>
 							{tab.icon}
 							{tab.label}

frontend/src/container/CustomDomainSettings/CustomDomainSettings.tsx

@@ -44,6 +44,7 @@ function DomainUpdateToast({
 			<div className="custom-domain-toast-actions">
 				<Button
 					variant="ghost"
+					color="secondary"
 					size="sm"
 					className="custom-domain-toast-visit-btn"
 					suffix={<ExternalLink size={12} />}
@@ -56,6 +57,7 @@ function DomainUpdateToast({
 				</Button>
 				<Button
 					variant="ghost"
+					color="secondary"
 					size="icon"
 					className="custom-domain-toast-dismiss-btn"
 					onClick={(): void => {

frontend/src/container/DashboardContainer/DashboardDescription/Description.styles.scss

@@ -191,7 +191,7 @@
 			flex-direction: column;
 			align-items: start;
 
-			.ant-btn {
+			button {
 				display: flex;
 				width: 100%;
 				height: unset;

frontend/src/container/DashboardContainer/DashboardDescription/index.tsx

@@ -16,7 +16,8 @@ import {
 	Plus,
 	X,
 } from '@signozhq/icons';
-import { Button, Card, Input, Modal, Popover, Tag, Tooltip } from 'antd';
+import { Card, Input, Modal, Popover, Tag, Tooltip } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import ConfigureIcon from 'assets/Integrations/ConfigureIcon';
@@ -375,11 +376,12 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 											}
 										>
 											<Button
-												type="text"
-												icon={<LockKeyhole size={14} />}
 												disabled={dashboardData?.createdBy === 'integration'}
 												onClick={handleLockDashboardToggle}
 												data-testid="lock-unlock-dashboard"
+												variant="ghost"
+												color="secondary"
+												prefix={<LockKeyhole size={14} />}
 											>
 												{isDashboardLocked ? 'Unlock Dashboard' : 'Lock Dashboard'}
 											</Button>
@@ -388,21 +390,23 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 
 									{!isDashboardLocked && editDashboard && (
 										<Button
-											type="text"
-											icon={<PenLine size={14} />}
 											onClick={(): void => {
 												setIsRenameDashboardOpen(true);
 												setIsDashbordSettingsOpen(false);
 											}}
+											variant="ghost"
+											color="secondary"
+											prefix={<PenLine size={14} />}
 										>
 											Rename
 										</Button>
 									)}
 
 									<Button
-										type="text"
-										icon={<Fullscreen size={14} />}
 										onClick={handle.enter}
+										variant="ghost"
+										color="secondary"
+										prefix={<Fullscreen size={14} />}
 									>
 										Full screen
 									</Button>
@@ -410,20 +414,19 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 								<section className="section-2">
 									{!isDashboardLocked && addPanelPermission && (
 										<Button
-											type="text"
-											icon={<FolderKanban size={14} />}
 											onClick={(): void => {
 												setIsPanelNameModalOpen(true);
 												setIsDashbordSettingsOpen(false);
 											}}
+											variant="ghost"
+											color="secondary"
+											prefix={<FolderKanban size={14} />}
 										>
 											New section
 										</Button>
 									)}
 
 									<Button
-										type="text"
-										icon={<FileJson size={14} />}
 										onClick={(): void => {
 											downloadObjectAsJson(
 												sanitizeDashboardData(selectedData),
@@ -431,18 +434,22 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 											);
 											setIsDashbordSettingsOpen(false);
 										}}
+										variant="ghost"
+										color="secondary"
+										prefix={<FileJson size={14} />}
 									>
 										Export JSON
 									</Button>
 									<Button
-										type="text"
-										icon={<ClipboardCopy size={14} />}
 										onClick={(): void => {
 											setCopy(
 												JSON.stringify(sanitizeDashboardData(selectedData), null, 2),
 											);
 											setIsDashbordSettingsOpen(false);
 										}}
+										variant="ghost"
+										color="secondary"
+										prefix={<ClipboardCopy size={14} />}
 									>
 										Copy as JSON
 									</Button>
@@ -462,20 +469,23 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 						placement="bottomRight"
 					>
 						<Button
-							icon={<Ellipsis size={14} />}
-							type="text"
 							className="icons"
 							data-testid="options"
+							variant="ghost"
+							color="secondary"
+							size="icon"
+							prefix={<Ellipsis size={14} />}
 						/>
 					</Popover>
 					{!isDashboardLocked && editDashboard && (
 						<>
 							<Button
-								type="text"
 								className="configure-button"
-								icon={<ConfigureIcon />}
 								data-testid="show-drawer"
 								onClick={onConfigureClick}
+								variant="ghost"
+								color="secondary"
+								prefix={<ConfigureIcon />}
 							>
 								Configure
 							</Button>
@@ -494,9 +504,8 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 						<Button
 							className="add-panel-btn"
 							onClick={onEmptyWidgetHandler}
-							icon={<Plus size="md" />}
-							type="primary"
 							data-testid="add-panel-header"
+							prefix={<Plus size="md" />}
 						>
 							New Panel
 						</Button>
@@ -536,19 +545,19 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 				footer={
 					<div className="dashboard-rename">
 						<Button
-							type="primary"
-							icon={<Check size={14} />}
 							className="rename-btn"
 							onClick={onNameChangeHandler}
 							disabled={updateDashboardMutation.isLoading}
+							prefix={<Check size={14} />}
 						>
 							Rename Dashboard
 						</Button>
 						<Button
-							type="text"
-							icon={<X size={14} />}
 							className="cancel-btn"
 							onClick={(): void => setIsRenameDashboardOpen(false)}
+							variant="ghost"
+							color="secondary"
+							prefix={<X size={14} />}
 						>
 							Cancel
 						</Button>
@@ -577,22 +586,22 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 				footer={
 					<div className="dashboard-rename">
 						<Button
-							type="primary"
-							icon={<Check size={14} />}
 							className="rename-btn"
 							onClick={(): void => handleAddRow()}
 							disabled={updateDashboardMutation.isLoading}
+							prefix={<Check size={14} />}
 						>
 							Create Section
 						</Button>
 						<Button
-							type="text"
-							icon={<X size={14} />}
 							className="cancel-btn"
 							onClick={(): void => {
 								setIsPanelNameModalOpen(false);
 								setSectionName(DEFAULT_ROW_NAME);
 							}}
+							variant="ghost"
+							color="secondary"
+							prefix={<X size={14} />}
 						>
 							Cancel
 						</Button>

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.styles.scss

@@ -114,7 +114,7 @@
 				background: var(--l2-background);
 				box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 
-				.ant-btn {
+				button {
 					width: 114px;
 					height: 32px;
 					flex-shrink: 0;

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.tsx

@@ -5,7 +5,8 @@ import { useQuery } from 'react-query';
 import { useSelector } from 'react-redux';
 import { orange } from '@ant-design/colors';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Collapse, Input, Select, Switch, Tag } from 'antd';
+import { Collapse, Input, Select, Switch, Tag } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import dashboardVariablesQuery from 'api/dashboard/variables/dashboardVariablesQuery';
 import cx from 'classnames';
@@ -441,10 +442,11 @@ function VariableItem({
 			<div className="variable-item-container">
 				<div className="all-variables">
 					<Button
-						type="text"
 						className="all-variables-btn"
-						icon={<ArrowLeft size={14} />}
 						onClick={onCancel}
+						variant="ghost"
+						color="secondary"
+						prefix={<ArrowLeft size={14} />}
 					>
 						All variables
 					</Button>
@@ -525,8 +527,6 @@ function VariableItem({
 
 						<div className="variable-type-btn-group">
 							<Button
-								type="text"
-								icon={<Pyramid size={14} />}
 								className={cx(
 									'variable-type-btn',
 									queryType === 'DYNAMIC' ? 'selected' : '',
@@ -539,6 +539,9 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								color="secondary"
+								prefix={<Pyramid size={14} />}
 							>
 								Dynamic
 								<Tag bordered={false} className="sidenav-beta-tag" color="geekblue">
@@ -546,8 +549,6 @@ function VariableItem({
 								</Tag>
 							</Button>
 							<Button
-								type="text"
-								icon={<ClipboardType size={14} />}
 								className={cx(
 									'variable-type-btn',
 									queryType === 'TEXTBOX' ? 'selected' : '',
@@ -560,12 +561,13 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								color="secondary"
+								prefix={<ClipboardType size={14} />}
 							>
 								Textbox
 							</Button>
 							<Button
-								type="text"
-								icon={<LayoutList size={14} />}
 								className={cx(
 									'variable-type-btn',
 									queryType === 'CUSTOM' ? 'selected' : '',
@@ -578,12 +580,13 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								color="secondary"
+								prefix={<LayoutList size={14} />}
 							>
 								Custom
 							</Button>
 							<Button
-								type="text"
-								icon={<DatabaseZap size={14} />}
 								className={cx(
 									'variable-type-btn',
 									queryType === 'QUERY' ? 'selected' : '',
@@ -596,6 +599,9 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								color="secondary"
+								prefix={<DatabaseZap size={14} />}
 							>
 								Query
 								<Tag bordered={false} className="sidenav-beta-tag" color="warning">
@@ -656,14 +662,13 @@ function VariableItem({
 									}}
 								/>
 								<Button
-									type="primary"
-									size="small"
 									onClick={handleTestRunQuery}
 									style={{
 										position: 'absolute',
 										bottom: 0,
 									}}
 									loading={previewLoading}
+									size="sm"
 								>
 									Test Run Query
 								</Button>
@@ -824,19 +829,19 @@ function VariableItem({
 			<div className="variable-item-footer">
 				<VariableItemRow>
 					<Button
-						type="default"
 						onClick={onCancel}
-						icon={<X size={14} />}
 						className="footer-btn-discard"
+						variant="outlined"
+						color="secondary"
+						prefix={<X size={14} />}
 					>
 						Discard
 					</Button>
 					<Button
-						type="primary"
 						onClick={handleSave}
 						disabled={errorName || errorAttributeKey}
-						icon={<Check size={14} />}
 						className="footer-btn-save"
+						prefix={<Check size={14} />}
 					>
 						Save Variable
 					</Button>