chore: antd button -> signozui button migration

cmd/community/server.go

@@ -33,7 +33,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/retention"
 	"github.com/SigNoz/signoz/pkg/modules/rulestatehistory"
 	"github.com/SigNoz/signoz/pkg/modules/serviceaccount"
-	"github.com/SigNoz/signoz/pkg/modules/tag"
 	"github.com/SigNoz/signoz/pkg/prometheus"
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/query-service/app"
@@ -101,8 +100,8 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 
 			return openfgaauthz.NewProviderFactory(sqlstore, openfgaschema.NewSchema().Get(ctx), openfgaDataStore, authtypes.NewRegistry()), nil
 		},
-		func(store sqlstore.SQLStore, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, queryParser queryparser.QueryParser, _ querier.Querier, _ licensing.Licensing, tagModule tag.Module) dashboard.Module {
-			return impldashboard.NewModule(impldashboard.NewStore(store), settings, analytics, orgGetter, queryParser, tagModule)
+		func(store sqlstore.SQLStore, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, queryParser queryparser.QueryParser, _ querier.Querier, _ licensing.Licensing) dashboard.Module {
+			return impldashboard.NewModule(impldashboard.NewStore(store), settings, analytics, orgGetter, queryParser)
 		},
 		func(_ licensing.Licensing) factory.ProviderFactory[gateway.Gateway, gateway.Config] {
 			return noopgateway.NewProviderFactory()

cmd/enterprise/server.go

@@ -46,7 +46,6 @@ import (
 	pkgcloudintegration "github.com/SigNoz/signoz/pkg/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	pkgimpldashboard "github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
-	"github.com/SigNoz/signoz/pkg/modules/tag"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
 	"github.com/SigNoz/signoz/pkg/modules/retention"
 	"github.com/SigNoz/signoz/pkg/modules/rulestatehistory"
@@ -134,8 +133,8 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 			}
 			return openfgaauthz.NewProviderFactory(sqlstore, openfgaschema.NewSchema().Get(ctx), openfgaDataStore, licensing, onBeforeRoleDelete, authtypes.NewRegistry()), nil
 		},
-		func(store sqlstore.SQLStore, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, queryParser queryparser.QueryParser, querier querier.Querier, licensing licensing.Licensing, tagModule tag.Module) dashboard.Module {
-			return impldashboard.NewModule(pkgimpldashboard.NewStore(store), store, settings, analytics, orgGetter, queryParser, querier, licensing, tagModule)
+		func(store sqlstore.SQLStore, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, queryParser queryparser.QueryParser, querier querier.Querier, licensing licensing.Licensing) dashboard.Module {
+			return impldashboard.NewModule(pkgimpldashboard.NewStore(store), settings, analytics, orgGetter, queryParser, querier, licensing)
 		},
 		func(licensing licensing.Licensing) factory.ProviderFactory[gateway.Gateway, gateway.Config] {
 			return httpgateway.NewProviderFactory(licensing)

ee/modules/dashboard/impldashboard/module.go

@@ -11,10 +11,8 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	pkgimpldashboard "github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
-	"github.com/SigNoz/signoz/pkg/modules/tag"
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/queryparser"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/coretypes"
 	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
@@ -32,9 +30,9 @@ type module struct {
 	licensing          licensing.Licensing
 }
 
-func NewModule(store dashboardtypes.Store, sqlstore sqlstore.SQLStore, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, queryParser queryparser.QueryParser, querier querier.Querier, licensing licensing.Licensing, tagModule tag.Module) dashboard.Module {
+func NewModule(store dashboardtypes.Store, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, queryParser queryparser.QueryParser, querier querier.Querier, licensing licensing.Licensing) dashboard.Module {
 	scopedProviderSettings := factory.NewScopedProviderSettings(settings, "github.com/SigNoz/signoz/ee/modules/dashboard/impldashboard")
-	pkgDashboardModule := pkgimpldashboard.NewModule(store, settings, analytics, orgGetter, queryParser, tagModule)
+	pkgDashboardModule := pkgimpldashboard.NewModule(store, settings, analytics, orgGetter, queryParser)
 
 	return &module{
 		pkgDashboardModule: pkgDashboardModule,
@@ -199,22 +197,6 @@ func (module *module) Create(ctx context.Context, orgID valuer.UUID, createdBy s
 	return module.pkgDashboardModule.Create(ctx, orgID, createdBy, creator, data)
 }
 
-func (module *module) CreateV2(ctx context.Context, orgID valuer.UUID, createdBy string, creator valuer.UUID, postable dashboardtypes.PostableDashboardV2) (*dashboardtypes.DashboardV2, error) {
-	return module.pkgDashboardModule.CreateV2(ctx, orgID, createdBy, creator, postable)
-}
-
-func (module *module) GetV2(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*dashboardtypes.DashboardV2, error) {
-	return module.pkgDashboardModule.GetV2(ctx, orgID, id)
-}
-
-func (module *module) UpdateV2(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, updateable dashboardtypes.UpdateableDashboardV2) (*dashboardtypes.DashboardV2, error) {
-	return module.pkgDashboardModule.UpdateV2(ctx, orgID, id, updatedBy, updateable)
-}
-
-func (module *module) LockUnlockV2(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, isAdmin bool, lock bool) error {
-	return module.pkgDashboardModule.LockUnlockV2(ctx, orgID, id, updatedBy, isAdmin, lock)
-}
-
 func (module *module) Get(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*dashboardtypes.Dashboard, error) {
 	return module.pkgDashboardModule.Get(ctx, orgID, id)
 }

frontend/src/api/generated/services/dashboard/index.ts

@@ -18,31 +18,19 @@ import type {
 } from 'react-query';
 
 import type {
-	CreateDashboardV2201,
 	CreatePublicDashboard201,
 	CreatePublicDashboardPathParameters,
-	CreatePublicDashboardV2200,
-	CreatePublicDashboardV2PathParameters,
-	DashboardtypesPostableDashboardV2DTO,
 	DashboardtypesPostablePublicDashboardDTO,
 	DashboardtypesUpdatablePublicDashboardDTO,
 	DeletePublicDashboardPathParameters,
-	GetDashboardV2200,
-	GetDashboardV2PathParameters,
 	GetPublicDashboard200,
 	GetPublicDashboardData200,
 	GetPublicDashboardDataPathParameters,
 	GetPublicDashboardPathParameters,
 	GetPublicDashboardWidgetQueryRange200,
 	GetPublicDashboardWidgetQueryRangePathParameters,
-	LockDashboardV2PathParameters,
 	RenderErrorResponseDTO,
-	UnlockDashboardV2PathParameters,
-	UpdateDashboardV2200,
-	UpdateDashboardV2PathParameters,
 	UpdatePublicDashboardPathParameters,
-	UpdatePublicDashboardV2200,
-	UpdatePublicDashboardV2PathParameters,
 } from '../sigNoz.schemas';
 
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
@@ -640,645 +628,3 @@ export const invalidateGetPublicDashboardWidgetQueryRange = async (
 
 	return queryClient;
 };
-
-/**
- * This endpoint creates a v2-shape dashboard with structured metadata, a typed data tree, and resolved tags.
- * @summary Create dashboard (v2)
- */
-export const createDashboardV2 = (
-	dashboardtypesPostableDashboardV2DTO?: BodyType<DashboardtypesPostableDashboardV2DTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<CreateDashboardV2201>({
-		url: `/api/v2/dashboards`,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json' },
-		data: dashboardtypesPostableDashboardV2DTO,
-		signal,
-	});
-};
-
-export const getCreateDashboardV2MutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createDashboardV2>>,
-		TError,
-		{ data?: BodyType<DashboardtypesPostableDashboardV2DTO> },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof createDashboardV2>>,
-	TError,
-	{ data?: BodyType<DashboardtypesPostableDashboardV2DTO> },
-	TContext
-> => {
-	const mutationKey = ['createDashboardV2'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof createDashboardV2>>,
-		{ data?: BodyType<DashboardtypesPostableDashboardV2DTO> }
-	> = (props) => {
-		const { data } = props ?? {};
-
-		return createDashboardV2(data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type CreateDashboardV2MutationResult = NonNullable<
-	Awaited<ReturnType<typeof createDashboardV2>>
->;
-export type CreateDashboardV2MutationBody =
-	| BodyType<DashboardtypesPostableDashboardV2DTO>
-	| undefined;
-export type CreateDashboardV2MutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Create dashboard (v2)
- */
-export const useCreateDashboardV2 = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createDashboardV2>>,
-		TError,
-		{ data?: BodyType<DashboardtypesPostableDashboardV2DTO> },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof createDashboardV2>>,
-	TError,
-	{ data?: BodyType<DashboardtypesPostableDashboardV2DTO> },
-	TContext
-> => {
-	return useMutation(getCreateDashboardV2MutationOptions(options));
-};
-/**
- * This endpoint returns a v2-shape dashboard with its tags and public sharing config (if any).
- * @summary Get dashboard (v2)
- */
-export const getDashboardV2 = (
-	{ id }: GetDashboardV2PathParameters,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<GetDashboardV2200>({
-		url: `/api/v2/dashboards/${id}`,
-		method: 'GET',
-		signal,
-	});
-};
-
-export const getGetDashboardV2QueryKey = ({
-	id,
-}: GetDashboardV2PathParameters) => {
-	return [`/api/v2/dashboards/${id}`] as const;
-};
-
-export const getGetDashboardV2QueryOptions = <
-	TData = Awaited<ReturnType<typeof getDashboardV2>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	{ id }: GetDashboardV2PathParameters,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof getDashboardV2>>,
-			TError,
-			TData
-		>;
-	},
-) => {
-	const { query: queryOptions } = options ?? {};
-
-	const queryKey = queryOptions?.queryKey ?? getGetDashboardV2QueryKey({ id });
-
-	const queryFn: QueryFunction<Awaited<ReturnType<typeof getDashboardV2>>> = ({
-		signal,
-	}) => getDashboardV2({ id }, signal);
-
-	return {
-		queryKey,
-		queryFn,
-		enabled: !!id,
-		...queryOptions,
-	} as UseQueryOptions<
-		Awaited<ReturnType<typeof getDashboardV2>>,
-		TError,
-		TData
-	> & { queryKey: QueryKey };
-};
-
-export type GetDashboardV2QueryResult = NonNullable<
-	Awaited<ReturnType<typeof getDashboardV2>>
->;
-export type GetDashboardV2QueryError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Get dashboard (v2)
- */
-
-export function useGetDashboardV2<
-	TData = Awaited<ReturnType<typeof getDashboardV2>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	{ id }: GetDashboardV2PathParameters,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof getDashboardV2>>,
-			TError,
-			TData
-		>;
-	},
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-	const queryOptions = getGetDashboardV2QueryOptions({ id }, options);
-
-	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-		queryKey: QueryKey;
-	};
-
-	return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Get dashboard (v2)
- */
-export const invalidateGetDashboardV2 = async (
-	queryClient: QueryClient,
-	{ id }: GetDashboardV2PathParameters,
-	options?: InvalidateOptions,
-): Promise<QueryClient> => {
-	await queryClient.invalidateQueries(
-		{ queryKey: getGetDashboardV2QueryKey({ id }) },
-		options,
-	);
-
-	return queryClient;
-};
-
-/**
- * This endpoint updates a v2-shape dashboard's metadata, data, and tag set. Locked dashboards are rejected.
- * @summary Update dashboard (v2)
- */
-export const updateDashboardV2 = (
-	{ id }: UpdateDashboardV2PathParameters,
-	dashboardtypesPostableDashboardV2DTO?: BodyType<DashboardtypesPostableDashboardV2DTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<UpdateDashboardV2200>({
-		url: `/api/v2/dashboards/${id}`,
-		method: 'PUT',
-		headers: { 'Content-Type': 'application/json' },
-		data: dashboardtypesPostableDashboardV2DTO,
-		signal,
-	});
-};
-
-export const getUpdateDashboardV2MutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updateDashboardV2>>,
-		TError,
-		{
-			pathParams: UpdateDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesPostableDashboardV2DTO>;
-		},
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof updateDashboardV2>>,
-	TError,
-	{
-		pathParams: UpdateDashboardV2PathParameters;
-		data?: BodyType<DashboardtypesPostableDashboardV2DTO>;
-	},
-	TContext
-> => {
-	const mutationKey = ['updateDashboardV2'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof updateDashboardV2>>,
-		{
-			pathParams: UpdateDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesPostableDashboardV2DTO>;
-		}
-	> = (props) => {
-		const { pathParams, data } = props ?? {};
-
-		return updateDashboardV2(pathParams, data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type UpdateDashboardV2MutationResult = NonNullable<
-	Awaited<ReturnType<typeof updateDashboardV2>>
->;
-export type UpdateDashboardV2MutationBody =
-	| BodyType<DashboardtypesPostableDashboardV2DTO>
-	| undefined;
-export type UpdateDashboardV2MutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Update dashboard (v2)
- */
-export const useUpdateDashboardV2 = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updateDashboardV2>>,
-		TError,
-		{
-			pathParams: UpdateDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesPostableDashboardV2DTO>;
-		},
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof updateDashboardV2>>,
-	TError,
-	{
-		pathParams: UpdateDashboardV2PathParameters;
-		data?: BodyType<DashboardtypesPostableDashboardV2DTO>;
-	},
-	TContext
-> => {
-	return useMutation(getUpdateDashboardV2MutationOptions(options));
-};
-/**
- * This endpoint unlocks a v2-shape dashboard. Only the dashboard's creator or an org admin may lock or unlock.
- * @summary Unlock dashboard (v2)
- */
-export const unlockDashboardV2 = (
-	{ id }: UnlockDashboardV2PathParameters,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<string>({
-		url: `/api/v2/dashboards/${id}/lock`,
-		method: 'DELETE',
-		signal,
-	});
-};
-
-export const getUnlockDashboardV2MutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof unlockDashboardV2>>,
-		TError,
-		{ pathParams: UnlockDashboardV2PathParameters },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof unlockDashboardV2>>,
-	TError,
-	{ pathParams: UnlockDashboardV2PathParameters },
-	TContext
-> => {
-	const mutationKey = ['unlockDashboardV2'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof unlockDashboardV2>>,
-		{ pathParams: UnlockDashboardV2PathParameters }
-	> = (props) => {
-		const { pathParams } = props ?? {};
-
-		return unlockDashboardV2(pathParams);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type UnlockDashboardV2MutationResult = NonNullable<
-	Awaited<ReturnType<typeof unlockDashboardV2>>
->;
-
-export type UnlockDashboardV2MutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Unlock dashboard (v2)
- */
-export const useUnlockDashboardV2 = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof unlockDashboardV2>>,
-		TError,
-		{ pathParams: UnlockDashboardV2PathParameters },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof unlockDashboardV2>>,
-	TError,
-	{ pathParams: UnlockDashboardV2PathParameters },
-	TContext
-> => {
-	return useMutation(getUnlockDashboardV2MutationOptions(options));
-};
-/**
- * This endpoint locks a v2-shape dashboard. Only the dashboard's creator or an org admin may lock or unlock.
- * @summary Lock dashboard (v2)
- */
-export const lockDashboardV2 = (
-	{ id }: LockDashboardV2PathParameters,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<string>({
-		url: `/api/v2/dashboards/${id}/lock`,
-		method: 'PUT',
-		signal,
-	});
-};
-
-export const getLockDashboardV2MutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof lockDashboardV2>>,
-		TError,
-		{ pathParams: LockDashboardV2PathParameters },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof lockDashboardV2>>,
-	TError,
-	{ pathParams: LockDashboardV2PathParameters },
-	TContext
-> => {
-	const mutationKey = ['lockDashboardV2'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof lockDashboardV2>>,
-		{ pathParams: LockDashboardV2PathParameters }
-	> = (props) => {
-		const { pathParams } = props ?? {};
-
-		return lockDashboardV2(pathParams);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type LockDashboardV2MutationResult = NonNullable<
-	Awaited<ReturnType<typeof lockDashboardV2>>
->;
-
-export type LockDashboardV2MutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Lock dashboard (v2)
- */
-export const useLockDashboardV2 = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof lockDashboardV2>>,
-		TError,
-		{ pathParams: LockDashboardV2PathParameters },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof lockDashboardV2>>,
-	TError,
-	{ pathParams: LockDashboardV2PathParameters },
-	TContext
-> => {
-	return useMutation(getLockDashboardV2MutationOptions(options));
-};
-/**
- * This endpoint creates the public sharing config for a v2 dashboard and returns the dashboard with the new public config attached. Lock state does not gate this endpoint.
- * @summary Make a dashboard v2 public
- */
-export const createPublicDashboardV2 = (
-	{ id }: CreatePublicDashboardV2PathParameters,
-	dashboardtypesPostablePublicDashboardDTO?: BodyType<DashboardtypesPostablePublicDashboardDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<CreatePublicDashboardV2200>({
-		url: `/api/v2/dashboards/${id}/public`,
-		method: 'PATCH',
-		headers: { 'Content-Type': 'application/json' },
-		data: dashboardtypesPostablePublicDashboardDTO,
-		signal,
-	});
-};
-
-export const getCreatePublicDashboardV2MutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createPublicDashboardV2>>,
-		TError,
-		{
-			pathParams: CreatePublicDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesPostablePublicDashboardDTO>;
-		},
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof createPublicDashboardV2>>,
-	TError,
-	{
-		pathParams: CreatePublicDashboardV2PathParameters;
-		data?: BodyType<DashboardtypesPostablePublicDashboardDTO>;
-	},
-	TContext
-> => {
-	const mutationKey = ['createPublicDashboardV2'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof createPublicDashboardV2>>,
-		{
-			pathParams: CreatePublicDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesPostablePublicDashboardDTO>;
-		}
-	> = (props) => {
-		const { pathParams, data } = props ?? {};
-
-		return createPublicDashboardV2(pathParams, data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type CreatePublicDashboardV2MutationResult = NonNullable<
-	Awaited<ReturnType<typeof createPublicDashboardV2>>
->;
-export type CreatePublicDashboardV2MutationBody =
-	| BodyType<DashboardtypesPostablePublicDashboardDTO>
-	| undefined;
-export type CreatePublicDashboardV2MutationError =
-	ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Make a dashboard v2 public
- */
-export const useCreatePublicDashboardV2 = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createPublicDashboardV2>>,
-		TError,
-		{
-			pathParams: CreatePublicDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesPostablePublicDashboardDTO>;
-		},
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof createPublicDashboardV2>>,
-	TError,
-	{
-		pathParams: CreatePublicDashboardV2PathParameters;
-		data?: BodyType<DashboardtypesPostablePublicDashboardDTO>;
-	},
-	TContext
-> => {
-	return useMutation(getCreatePublicDashboardV2MutationOptions(options));
-};
-/**
- * This endpoint updates the public sharing config (time range settings) of an already-public v2 dashboard. Lock state does not gate this endpoint.
- * @summary Update public sharing config for a dashboard v2
- */
-export const updatePublicDashboardV2 = (
-	{ id }: UpdatePublicDashboardV2PathParameters,
-	dashboardtypesUpdatablePublicDashboardDTO?: BodyType<DashboardtypesUpdatablePublicDashboardDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<UpdatePublicDashboardV2200>({
-		url: `/api/v2/dashboards/${id}/public`,
-		method: 'PUT',
-		headers: { 'Content-Type': 'application/json' },
-		data: dashboardtypesUpdatablePublicDashboardDTO,
-		signal,
-	});
-};
-
-export const getUpdatePublicDashboardV2MutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updatePublicDashboardV2>>,
-		TError,
-		{
-			pathParams: UpdatePublicDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesUpdatablePublicDashboardDTO>;
-		},
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof updatePublicDashboardV2>>,
-	TError,
-	{
-		pathParams: UpdatePublicDashboardV2PathParameters;
-		data?: BodyType<DashboardtypesUpdatablePublicDashboardDTO>;
-	},
-	TContext
-> => {
-	const mutationKey = ['updatePublicDashboardV2'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof updatePublicDashboardV2>>,
-		{
-			pathParams: UpdatePublicDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesUpdatablePublicDashboardDTO>;
-		}
-	> = (props) => {
-		const { pathParams, data } = props ?? {};
-
-		return updatePublicDashboardV2(pathParams, data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type UpdatePublicDashboardV2MutationResult = NonNullable<
-	Awaited<ReturnType<typeof updatePublicDashboardV2>>
->;
-export type UpdatePublicDashboardV2MutationBody =
-	| BodyType<DashboardtypesUpdatablePublicDashboardDTO>
-	| undefined;
-export type UpdatePublicDashboardV2MutationError =
-	ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Update public sharing config for a dashboard v2
- */
-export const useUpdatePublicDashboardV2 = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updatePublicDashboardV2>>,
-		TError,
-		{
-			pathParams: UpdatePublicDashboardV2PathParameters;
-			data?: BodyType<DashboardtypesUpdatablePublicDashboardDTO>;
-		},
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof updatePublicDashboardV2>>,
-	TError,
-	{
-		pathParams: UpdatePublicDashboardV2PathParameters;
-		data?: BodyType<DashboardtypesUpdatablePublicDashboardDTO>;
-	},
-	TContext
-> => {
-	return useMutation(getUpdatePublicDashboardV2MutationOptions(options));
-};

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/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,13 @@ 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"
 					>
 						{option.label}
 					</Button>
@@ -249,15 +249,14 @@ function CustomTimePickerPopoverContent({
 					{isLogsExplorerPage && isLogsListView && (
 						<Button
 							className={cx('data-time-live', isLiveLogsEnabled ? 'active' : '')}
-							type="text"
 							onClick={handleGoLive}
+							variant="ghost"
 						>
 							Live
 						</Button>
 					)}
 					{options.map((option) => (
 						<Button
-							type="text"
 							key={option.label + option.value}
 							onClick={(e: React.MouseEvent<HTMLButtonElement>): void => {
 								e.stopPropagation();
@@ -271,6 +270,7 @@ function CustomTimePickerPopoverContent({
 									? option.value === 'custom' && !isLiveLogsEnabled && 'active'
 									: selectedTime === option.value && !isLiveLogsEnabled && 'active',
 							)}
+							variant="ghost"
 						>
 							<span className="time-label">{option.label}</span>
 
@@ -370,11 +370,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.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/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

@@ -156,12 +156,12 @@ function HeaderRightSection({
 						variant="ghost"
 						size="icon"
 						aria-label="Announcements"
-						prefix={<Inbox size={14} />}
 						onClick={(): void => {
 							logEvent('Announcements: Clicked', {
 								page: location.pathname,
 							});
 						}}
+						prefix={<Inbox size={14} />}
 					/>
 				</Popover>
 			)}

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';
@@ -170,7 +171,9 @@ function LaunchChatSupport({
 				<Button
 					className={cx('periscope-btn', '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,7 @@ function OptionsMenu({
 					<Button
 						onClick={(): void => setIsFontSizeOptionsOpen(false)}
 						className="back-btn"
-						type="text"
+						variant="ghost"
 					>
 						<ChevronLeft size={14} className="icon" />
 						<Typography.Text className="text">Select font size</Typography.Text>
@@ -235,7 +236,7 @@ function OptionsMenu({
 								setFontSizeValue(FontSize.SMALL);
 							}}
 							className="option-btn"
-							type="text"
+							variant="ghost"
 						>
 							<Typography.Text className="text">{FontSize.SMALL}</Typography.Text>
 							{fontSizeValue === FontSize.SMALL && (
@@ -247,7 +248,7 @@ function OptionsMenu({
 								setFontSizeValue(FontSize.MEDIUM);
 							}}
 							className="option-btn"
-							type="text"
+							variant="ghost"
 						>
 							<Typography.Text className="text">{FontSize.MEDIUM}</Typography.Text>
 							{fontSizeValue === FontSize.MEDIUM && (
@@ -259,7 +260,7 @@ function OptionsMenu({
 								setFontSizeValue(FontSize.LARGE);
 							}}
 							className="option-btn"
-							type="text"
+							variant="ghost"
 						>
 							<Typography.Text className="text">{FontSize.LARGE}</Typography.Text>
 							{fontSizeValue === FontSize.LARGE && (
@@ -338,10 +339,10 @@ function OptionsMenu({
 						<div className="title">Font Size</div>
 						<Button
 							className="value"
-							type="text"
 							onClick={(): void => {
 								setIsFontSizeOptionsOpen(true);
 							}}
+							variant="ghost"
 						>
 							<Typography.Text className="font-value">{fontSizeValue}</Typography.Text>
 							<ChevronRight size={14} className="icon" />
@@ -472,9 +473,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">
 									{currentToggleTagValue({ option: option.value })}
 								</Button>
 							)}
-							<Button type="text" className="toggle-btn">
+							<Button className="toggle-btn" variant="ghost">
 								Toggle
 							</Button>
 						</div>

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,16 @@ function QuerySearch({
 						>
 							{validation.isValid ? (
 								<Button
-									type="text"
-									icon={<CircleCheck size="md" />}
+									variant="ghost"
+									size="icon"
 									className="periscope-btn ghost"
+									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/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,15 @@ function TraceOperatorEditor({
 						>
 							{validation.isValid ? (
 								<Button
-									type="text"
-									icon={<CircleCheck size="md" />}
-									className="periscope-btn ghost"
+									variant="ghost"
+									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">
 												{isSomeFilterPresentForCurrentAttribute
 													? currentFilterState[value] && !isMultipleValuesTrueForTheKey
 														? 'All'
 														: 'Only'
 													: 'Only'}
 											</Button>
-											<Button type="text" className="toggle-btn">
+											<Button className="toggle-btn" variant="ghost">
 												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,15 @@
 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 +34,12 @@ 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 +48,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/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/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,11 @@ 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"
+						>
 							<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 } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import type { RadioChangeEvent } from 'antd/lib';
 import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
@@ -24,6 +25,7 @@ import EndPointDetails from './EndPointDetails';
 import TopErrors from './TopErrors';
 
 import './DomainDetails.styles.scss';
+import ButtonGroup from 'periscope/components/ButtonGroup/ButtonGroup';
 
 const TimeRangeOffset = 1000000000;
 
@@ -176,7 +178,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 +187,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 +202,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 } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 import { useNavigateToExplorer } from 'components/CeleryTask/useNavigateToExplorer';
@@ -29,6 +30,7 @@ import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import ErrorState from './ErrorState';
 import { prepareStatusCodeBarChartsConfig } from './utils';
+import ButtonGroup from 'periscope/components/ButtonGroup/ButtonGroup';
 
 function StatusCodeBarCharts({
 	endPointStatusCodeBarChartsDataQuery,
@@ -247,23 +249,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 className="views-tabs">
 						<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 } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import { CircleX, Trash } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
@@ -9,6 +10,7 @@ import { AlertThresholdOperator } from '../context/types';
 import { normalizeOperator } from '../utils';
 import { ThresholdItemProps } from './types';
 import { NotificationChannelsNotFoundContent } from './utils';
+import ButtonGroup from 'periscope/components/ButtonGroup/ButtonGroup';
 
 function ThresholdItem({
 	threshold,
@@ -166,16 +168,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 +194,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">
 				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,10 +1,11 @@
 import { useMemo } from 'react';
-import { Button } from 'antd';
+import { Button } 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';
 import { IEditCustomScheduleProps } from 'container/CreateAlertV2/EvaluationSettings/types';
 import { Calendar1, Pencil, Trash } from '@signozhq/icons';
+import ButtonGroup from 'periscope/components/ButtonGroup/ButtonGroup';
 
 function EditCustomSchedule({
 	setIsEvaluationCadenceDetailsVisible,
@@ -80,23 +81,24 @@ function EditCustomSchedule({
 		<div className="edit-custom-schedule">
 			{displayText}
 			<div className="button-row">
-				<Button.Group>
-					<Button type="default" onClick={handleEdit}>
+				<ButtonGroup>
+					<Button onClick={handleEdit} variant="outlined" color="secondary">
 						<Pencil size={12} />
 						<Typography.Text>Edit custom schedule</Typography.Text>
 					</Button>
-					<Button type="default" onClick={handlePreview}>
+					<Button onClick={handlePreview} variant="outlined" color="secondary">
 						<Calendar1 size={12} />
 						<Typography.Text>Preview</Typography.Text>
 					</Button>
 					<Button
 						data-testid="discard-button"
-						type="default"
 						onClick={handleDiscard}
+						variant="outlined"
+						color="secondary"
 					>
 						<Trash size={12} />
 					</Button>
-				</Button.Group>
+				</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

@@ -26,8 +26,8 @@
 			}
 		}
 
-		.ant-btn-group {
-			.ant-btn {
+		.periscope-btn-group {
+			button {
 				border: 1px solid var(--l1-border);
 				color: var(--l2-foreground);
 				font-size: 13px;

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/DashboardContainer/DashboardDescription/Description.styles.scss

@@ -192,7 +192,7 @@
 			align-items: start;
 			border-bottom: 1px solid var(--l1-border);
 
-			.ant-btn {
+			button {
 				display: flex;
 				width: 100%;
 				height: 20px;
@@ -217,7 +217,7 @@
 			align-items: start;
 			border-bottom: 1px solid var(--l1-border);
 
-			.ant-btn {
+			button {
 				display: flex;
 				width: 100%;
 				height: 20px;

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,11 @@ 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"
+												prefix={<LockKeyhole size={14} />}
 											>
 												{isDashboardLocked ? 'Unlock Dashboard' : 'Lock Dashboard'}
 											</Button>
@@ -388,21 +389,21 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 
 									{!isDashboardLocked && editDashboard && (
 										<Button
-											type="text"
-											icon={<PenLine size={14} />}
 											onClick={(): void => {
 												setIsRenameDashboardOpen(true);
 												setIsDashbordSettingsOpen(false);
 											}}
+											variant="ghost"
+											prefix={<PenLine size={14} />}
 										>
 											Rename
 										</Button>
 									)}
 
 									<Button
-										type="text"
-										icon={<Fullscreen size={14} />}
 										onClick={handle.enter}
+										variant="ghost"
+										prefix={<Fullscreen size={14} />}
 									>
 										Full screen
 									</Button>
@@ -410,20 +411,18 @@ 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"
+											prefix={<FolderKanban size={14} />}
 										>
 											New section
 										</Button>
 									)}
 
 									<Button
-										type="text"
-										icon={<FileJson size={14} />}
 										onClick={(): void => {
 											downloadObjectAsJson(
 												sanitizeDashboardData(selectedData),
@@ -431,18 +430,20 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 											);
 											setIsDashbordSettingsOpen(false);
 										}}
+										variant="ghost"
+										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"
+										prefix={<ClipboardCopy size={14} />}
 									>
 										Copy as JSON
 									</Button>
@@ -462,20 +463,21 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 						placement="bottomRight"
 					>
 						<Button
-							icon={<Ellipsis size={14} />}
-							type="text"
 							className="icons"
 							data-testid="options"
+							variant="ghost"
+							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"
+								prefix={<ConfigureIcon />}
 							>
 								Configure
 							</Button>
@@ -494,9 +496,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 +537,18 @@ 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"
+							prefix={<X size={14} />}
 						>
 							Cancel
 						</Button>
@@ -577,22 +577,21 @@ 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"
+							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,10 @@ 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"
+						prefix={<ArrowLeft size={14} />}
 					>
 						All variables
 					</Button>
@@ -525,8 +526,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 +538,8 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								prefix={<Pyramid size={14} />}
 							>
 								Dynamic
 								<Tag bordered={false} className="sidenav-beta-tag" color="geekblue">
@@ -546,8 +547,6 @@ function VariableItem({
 								</Tag>
 							</Button>
 							<Button
-								type="text"
-								icon={<ClipboardType size={14} />}
 								className={cx(
 									'variable-type-btn',
 									queryType === 'TEXTBOX' ? 'selected' : '',
@@ -560,12 +559,12 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								prefix={<ClipboardType size={14} />}
 							>
 								Textbox
 							</Button>
 							<Button
-								type="text"
-								icon={<LayoutList size={14} />}
 								className={cx(
 									'variable-type-btn',
 									queryType === 'CUSTOM' ? 'selected' : '',
@@ -578,12 +577,12 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								prefix={<LayoutList size={14} />}
 							>
 								Custom
 							</Button>
 							<Button
-								type="text"
-								icon={<DatabaseZap size={14} />}
 								className={cx(
 									'variable-type-btn',
 									queryType === 'QUERY' ? 'selected' : '',
@@ -596,6 +595,8 @@ function VariableItem({
 										setHasUserManuallyChangedName(false);
 									}
 								}}
+								variant="ghost"
+								prefix={<DatabaseZap size={14} />}
 							>
 								Query
 								<Tag bordered={false} className="sidenav-beta-tag" color="warning">
@@ -656,14 +657,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 +824,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>

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

@@ -11,7 +11,8 @@ import {
 import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
 import { arrayMove, SortableContext, useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { Button, Modal, Row, RowProps, Space, Table, Flex } from 'antd';
+import { Flex, Modal, Row, RowProps, Space, Table } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import { VariablesSettingsTabHandle } from 'container/DashboardContainer/DashboardDescription/types';
 import { convertVariablesToDbFormat } from 'container/DashboardContainer/DashboardVariablesSelection/util';
@@ -331,29 +332,29 @@ function VariablesSettings({
 					<Space className="actions-btns">
 						{variable.type === 'DYNAMIC' && (
 							<Button
-								type="text"
 								onClick={(): void => onApplyToAllHandler(variable)}
 								className="apply-to-all-button"
 								loading={updateMutation.isLoading}
+								variant="ghost"
 							>
 								<Typography.Text>Apply to all</Typography.Text>
 							</Button>
 						)}
 						<Button
-							type="text"
 							onClick={(): void => onVariableViewModeEnter('EDIT', variable)}
 							className="edit-variable-button"
+							variant="ghost"
 						>
 							<PenLine size={14} />
 						</Button>
 						<Button
-							type="text"
 							onClick={(): void => {
 								if (variable) {
 									onVariableDeleteHandler(variable);
 								}
 							}}
 							className="delete-variable-button"
+							variant="ghost"
 						>
 							<Trash2 size={14} />
 						</Button>
@@ -434,7 +435,6 @@ function VariablesSettings({
 					>
 						<Button
 							data-testid="add-new-variable"
-							type="primary"
 							onClick={(): void =>
 								onVariableViewModeEnter('ADD', {} as IDashboardVariable)
 							}

frontend/src/container/DashboardContainer/DashboardSettings/PublicDashboard/index.tsx

@@ -3,7 +3,8 @@ import { useMutation } from 'react-query';
 import { useCopyToClipboard } from 'react-use';
 import { Checkbox } from '@signozhq/ui/checkbox';
 import { toast } from '@signozhq/ui/sonner';
-import { Button, Select } from 'antd';
+import { Select } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import createPublicDashboardAPI from 'api/dashboard/public/createPublicDashboard';
 import revokePublicDashboardAccessAPI from 'api/dashboard/public/revokePublicDashboardAccess';
@@ -294,20 +295,21 @@ function PublicDashboardSetting(): JSX.Element {
 							</Typography.Text>
 
 							<Button
-								type="link"
-								className="url-copy-btn periscope-btn ghost"
-								icon={<Copy size={12} />}
+								className="url-copy-btn"
 								onClick={handleCopyPublicDashboardURL}
+								variant="link"
+								size="icon"
+								prefix={<Copy size={12} />}
 							/>
 							<Button
-								type="link"
-								className="periscope-btn ghost"
-								icon={<ExternalLink size={12} />}
 								onClick={(): void => {
 									if (publicDashboardURL) {
 										openInNewTab(publicDashboardURL);
 									}
 								}}
+								variant="link"
+								size="icon"
+								prefix={<ExternalLink size={12} />}
 							/>
 						</div>
 					</div>
@@ -323,8 +325,7 @@ function PublicDashboardSetting(): JSX.Element {
 				<div className="public-dashboard-setting-actions">
 					{!isPublicDashboard ? (
 						<Button
-							type="primary"
-							className="create-public-dashboard-btn periscope-btn primary"
+							className="create-public-dashboard-btn"
 							disabled={isLoading || !isAdmin}
 							onClick={handleCreatePublicDashboard}
 							loading={
@@ -332,7 +333,7 @@ function PublicDashboardSetting(): JSX.Element {
 								isFetchingPublicDashboard ||
 								isLoadingPublicDashboard
 							}
-							icon={
+							prefix={
 								isLoadingCreatePublicDashboard ||
 								isFetchingPublicDashboard ||
 								isLoadingPublicDashboard ? (
@@ -341,29 +342,32 @@ function PublicDashboardSetting(): JSX.Element {
 									<Globe size={14} />
 								)
 							}
+							variant="solid"
+							color="primary"
 						>
 							Publish dashboard
 						</Button>
 					) : (
 						<>
 							<Button
-								type="default"
-								className="periscope-btn secondary"
 								disabled={isLoading || !isAdmin}
 								onClick={handleRevokePublicDashboardAccess}
 								loading={isLoadingRevokePublicDashboardAccess}
-								icon={<Trash size={14} />}
+								variant="outlined"
+								color="secondary"
+								prefix={<Trash size={14} />}
 							>
 								Unpublish dashboard
 							</Button>
 
 							<Button
-								type="primary"
-								className="create-public-dashboard-btn periscope-btn primary"
+								className="create-public-dashboard-btn"
 								disabled={isLoading || !isAdmin}
 								onClick={handleUpdatePublicDashboard}
 								loading={isLoadingUpdatePublicDashboard}
-								icon={<Globe size={14} />}
+								prefix={<Globe size={14} />}
+								variant="solid"
+								color="primary"
 							>
 								Update published dashboard
 							</Button>

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

@@ -1,4 +1,4 @@
-import { Button, Tabs, Tooltip } from 'antd';
+import { Tabs, Tooltip } from 'antd';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { Braces, Globe, Table } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
@@ -10,6 +10,7 @@ import GeneralDashboardSettings from './General';
 import PublicDashboardSetting from './PublicDashboard';
 
 import './DashboardSettingsContent.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function DashboardSettings({
 	variablesSettingsTabHandle,
@@ -32,11 +33,11 @@ function DashboardSettings({
 				placement="right"
 			>
 				<Button
-					type="text"
-					icon={<Globe size={14} />}
 					className={`public-dashboard-btn ${
 						user?.role !== USER_ROLES.ADMIN ? 'disabled-btn' : ''
 					}`}
+					variant="ghost"
+					prefix={<Globe size={14} />}
 				>
 					Publish
 				</Button>
@@ -50,7 +51,11 @@ function DashboardSettings({
 	const items = [
 		{
 			label: (
-				<Button type="text" icon={<Table size={14} />} className="overview-btn">
+				<Button
+					className="overview-btn"
+					variant="ghost"
+					prefix={<Table size={14} />}
+				>
 					Overview
 				</Button>
 			),
@@ -59,7 +64,11 @@ function DashboardSettings({
 		},
 		{
 			label: (
-				<Button type="text" icon={<Braces size={14} />} className="variables-btn">
+				<Button
+					className="variables-btn"
+					variant="ghost"
+					prefix={<Braces size={14} />}
+				>
 					Variables
 				</Button>
 			),

frontend/src/container/DashboardContainer/PanelTypeSelectionModal/PanelTypeSelectionModal.styles.scss

@@ -90,7 +90,7 @@
 			padding: 12px 15px;
 			margin-top: 0px;
 
-			.ant-btn {
+			button {
 				width: 100%;
 				display: flex;
 				align-items: center;

frontend/src/container/DashboardContainer/components/DashboardHeader/DashboardBreadcrumbs.tsx

@@ -1,5 +1,4 @@
 import { useCallback, useRef } from 'react';
-import { Button } from 'antd';
 import getSessionStorageApi from 'api/browser/sessionstorage/get';
 import ROUTES from 'constants/routes';
 import { DASHBOARDS_LIST_QUERY_PARAMS_STORAGE_KEY } from 'hooks/dashboard/useDashboardsListQueryParams';
@@ -11,6 +10,7 @@ import { DashboardData } from 'types/api/dashboard/getAll';
 import { Base64Icons } from '../../DashboardSettings/General/utils';
 
 import './DashboardBreadcrumbs.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function DashboardBreadcrumbs(): JSX.Element {
 	const { safeNavigate } = useSafeNavigate();
@@ -46,14 +46,14 @@ function DashboardBreadcrumbs(): JSX.Element {
 	return (
 		<div className="dashboard-breadcrumbs">
 			<Button
-				type="text"
-				icon={<LayoutGrid size={14} />}
 				className="dashboard-btn"
 				onClick={goToListPage}
+				variant="ghost"
+				prefix={<LayoutGrid size={14} />}
 			>
 				Dashboard /
 			</Button>
-			<Button type="text" className="id-btn dashboard-name-btn">
+			<Button className="id-btn dashboard-name-btn" variant="ghost">
 				<img src={image} alt="dashboard-icon" className="dashboard-icon-image" />
 				{title}
 			</Button>

frontend/src/container/DashboardContainer/visualization/components/ChartManager/ChartManager.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button, Input } from 'antd';
+import { Input } from 'antd';
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
 import { ResizeTable } from 'components/ResizeTable';
 import { useNotifications } from 'hooks/useNotifications';
@@ -15,6 +15,7 @@ import { getChartManagerColumns } from './getChartMangerColumns';
 import { ExtendedChartDataset, getDefaultTableDataSet } from './utils';
 
 import './ChartManager.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 interface ChartManagerProps {
 	config: UPlotConfigBuilder;
@@ -151,12 +152,10 @@ export default function ChartManager({
 					data-testid="filter-input"
 				/>
 				<div className="chart-manager-actions-container">
-					<Button type="default" onClick={onCancel}>
+					<Button onClick={onCancel} variant="outlined" color="secondary">
 						Cancel
 					</Button>
-					<Button type="primary" onClick={handleSave}>
-						Save
-					</Button>
+					<Button onClick={handleSave}>Save</Button>
 				</div>
 			</div>
 			<div className="chart-manager-table-container">

frontend/src/container/Download/Download.tsx

@@ -1,11 +1,12 @@
 import { useState } from 'react';
 import { CloudDownload } from '@signozhq/icons';
-import { Button, Dropdown, MenuProps, Flex } from 'antd';
+import { Dropdown, Flex, MenuProps } from 'antd';
 import { unparse } from 'papaparse';
 
 import { DownloadProps } from './Download.types';
 
 import './Download.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function Download({ data, isLoading, fileName }: DownloadProps): JSX.Element {
 	const [isDownloading, setIsDownloading] = useState(false);
@@ -71,8 +72,8 @@ function Download({ data, isLoading, fileName }: DownloadProps): JSX.Element {
 			<Button
 				className="download-button"
 				loading={isLoading || isDownloading}
-				size="small"
-				type="link"
+				size="sm"
+				variant="link"
 			>
 				<Flex align="center" gap={4}>
 					<CloudDownload size="md" />

frontend/src/container/ErrorDetails/index.tsx

@@ -2,7 +2,8 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from 'react-query';
 import { useLocation } from 'react-router-dom';
-import { Button, Divider, Space } from 'antd';
+import { Divider, Space } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import getNextPrevId from 'api/errors/getNextPrevId';
@@ -172,6 +173,8 @@ function ErrorDetails(props: ErrorDetailsProps): JSX.Element {
 									nextPrevData?.payload?.prevTimestamp || '',
 								)
 							}
+							variant="outlined"
+							color="secondary"
 						>
 							{t('older')}
 						</Button>
@@ -184,6 +187,8 @@ function ErrorDetails(props: ErrorDetailsProps): JSX.Element {
 									nextPrevData?.payload?.nextTimestamp || '',
 								)
 							}
+							variant="outlined"
+							color="secondary"
 						>
 							{t('newer')}
 						</Button>
@@ -193,7 +198,7 @@ function ErrorDetails(props: ErrorDetailsProps): JSX.Element {
 
 			<DashedContainer>
 				<Typography>{t('see_trace_graph')}</Typography>
-				<Button onClick={onClickTraceHandler} type="primary">
+				<Button onClick={onClickTraceHandler}>
 					{t('see_error_in_trace_graph')}
 				</Button>
 			</DashedContainer>

frontend/src/container/ExplorerOptions/ExplorerOptions.tsx

@@ -20,7 +20,7 @@ import {
 } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
 import {
-	Button,
+	Button as AntdButton,
 	ColorPicker,
 	Divider,
 	Input,
@@ -29,6 +29,7 @@ import {
 	Select,
 	Tooltip,
 } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageKey from 'api/browser/localstorage/set';
@@ -736,13 +737,13 @@ function ExplorerOptions({
 	const CreateAlertButton = useMemo(() => {
 		if (isOneChartPerQuery) {
 			const selectLabel = (
-				<Button
+				<AntdButton
 					disabled={disabled}
 					shape="round"
 					icon={<ConciergeBell size={16} />}
 				>
 					Create an Alert
-				</Button>
+				</AntdButton>
 			);
 			return (
 				<Select
@@ -769,14 +770,14 @@ function ExplorerOptions({
 			);
 		}
 		return (
-			<Button
+			<AntdButton
 				disabled={disabled}
 				shape="round"
 				onClick={(): void => onCreateAlertsHandler(query)}
 				icon={<ConciergeBell size={16} />}
 			>
 				Create an Alert
-			</Button>
+			</AntdButton>
 		);
 	}, [
 		disabled,
@@ -789,7 +790,7 @@ function ExplorerOptions({
 	const AddToDashboardButton = useMemo(() => {
 		if (isOneChartPerQuery) {
 			const selectLabel = (
-				<Button
+				<AntdButton
 					type="primary"
 					disabled={disabled}
 					shape="round"
@@ -797,7 +798,7 @@ function ExplorerOptions({
 					icon={<Plus size={16} />}
 				>
 					Add to Dashboard
-				</Button>
+				</AntdButton>
 			);
 			return (
 				<Select
@@ -828,7 +829,7 @@ function ExplorerOptions({
 			);
 		}
 		return (
-			<Button
+			<AntdButton
 				type="primary"
 				disabled={disabled}
 				shape="round"
@@ -836,7 +837,7 @@ function ExplorerOptions({
 				icon={<Plus size={16} />}
 			>
 				Add to Dashboard
-			</Button>
+			</AntdButton>
 		);
 	}, [disabled, isOneChartPerQuery, onAddToDashboard, splitedQueries]);
 
@@ -864,7 +865,9 @@ function ExplorerOptions({
 						<Button
 							className="action-icon"
 							onClick={handleClearSelect}
-							icon={<X size={14} />}
+							variant="outlined"
+							color="secondary"
+							prefix={<X size={14} />}
 						/>
 					</Tooltip>
 					{
@@ -881,7 +884,9 @@ function ExplorerOptions({
 									className={cx('action-icon', isEditDeleteSupported ? ' ' : 'hidden')}
 									disabled={isViewUpdating}
 									onClick={onUpdateQueryHandler}
-									icon={<Disc3 size={14} />}
+									variant="outlined"
+									color="secondary"
+									prefix={<Disc3 size={14} />}
 								/>
 							</Tooltip>
 						</>
@@ -936,7 +941,7 @@ function ExplorerOptions({
 							})}
 						</Select>
 
-						<Button
+						<AntdButton
 							shape="round"
 							onClick={handleSaveViewModalToggle}
 							className={isEditDeleteSupported ? '' : 'hidden'}
@@ -944,7 +949,7 @@ function ExplorerOptions({
 							icon={<Disc3 size={16} />}
 						>
 							Save this view
-						</Button>
+						</AntdButton>
 					</div>
 
 					<hr className={isEditDeleteSupported ? '' : 'hidden'} />
@@ -975,7 +980,7 @@ function ExplorerOptions({
 						)}
 
 						<Tooltip title="Hide">
-							<Button
+							<AntdButton
 								disabled={disabled}
 								shape="circle"
 								onClick={hideToolbar}
@@ -1005,12 +1010,13 @@ function ExplorerOptions({
 				footer={[
 					<Button
 						key="submit"
-						type="primary"
-						icon={<Check size={16} />}
 						onClick={onSaveHandler}
 						disabled={isSaveViewLoading}
 						data-testid="save-view-btn"
 						className="save-button"
+						prefix={<Check size={16} />}
+						variant="outlined"
+						color="secondary"
 					>
 						Save this view
 					</Button>,

frontend/src/container/ExplorerOptions/ExplorerOptionsHideArea.tsx

@@ -1,12 +1,13 @@
 import { Dispatch, SetStateAction } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Tooltip } from 'antd';
 import { Disc3, X } from '@signozhq/icons';
+import { Tooltip } from 'antd';
 import { DataSource } from 'types/common/queryBuilder';
 
 import { setExplorerToolBarVisibility } from './utils';
 
 import './ExplorerOptionsHideArea.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 interface DroppableAreaProps {
 	viewName: string;
@@ -47,7 +48,10 @@ function ExplorerOptionsHideArea({
 									onClick={handleClearSelect}
 									className="action-btn"
 									style={{ background: Color.BG_CHERRY_500 }}
-									icon={<X size={14} color={Color.BG_INK_500} />}
+									variant="outlined"
+									color="secondary"
+									size="icon"
+									prefix={<X size={14} color={Color.BG_INK_500} />}
 								/>
 							</Tooltip>
 							{isEditDeleteSupported && isQueryUpdated && (
@@ -56,7 +60,10 @@ function ExplorerOptionsHideArea({
 										onClick={onUpdateQueryHandler}
 										className="action-btn"
 										style={{ background: Color.BG_ROBIN_500 }}
-										icon={<Disc3 size={14} color={Color.BG_INK_500} />}
+										variant="outlined"
+										color="secondary"
+										size="icon"
+										prefix={<Disc3 size={14} color={Color.BG_INK_500} />}
 									/>
 								</Tooltip>
 							)}
@@ -67,6 +74,8 @@ function ExplorerOptionsHideArea({
 						className="explorer-show-btn"
 						onClick={handleShowExplorerOption}
 						data-testid="show-explorer-option"
+						variant="outlined"
+						color="secondary"
 					>
 						<div className="menu-bar" />
 					</Button>

frontend/src/container/ExportPanel/ExportPanelContainer.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMutation } from 'react-query';
-import { Button } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import createDashboard from 'api/v1/dashboards/create';
 import { ENTITY_VERSION_V5 } from 'constants/app';
@@ -100,7 +100,6 @@ function ExportPanelContainer({
 					filterOption={filterOptions}
 				/>
 				<Button
-					type="primary"
 					loading={isLoading}
 					disabled={isDisabled}
 					onClick={handleExportClick}

frontend/src/container/FormAlertRules/BasicInfo.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from 'react-query';
 import { Plus } from '@signozhq/icons';
-import { Button, Flex, Form, Select, Switch, Tooltip } from 'antd';
+import { Flex, Form, Select, Switch, Tooltip } from 'antd';
 import getAll from 'api/channels/getAll';
 import logEvent from 'api/common/logEvent';
 import { ALERTS_DATA_SOURCE_MAP } from 'constants/alerts';
@@ -30,6 +30,7 @@ import {
 } from './styles';
 
 import './FormAlertRules.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 const { Option } = Select;
 
@@ -256,6 +257,8 @@ function BasicInfo({
 							onClick={handleCreateNewChannels}
 							className="create-notification-btn"
 							disabled={!addNewChannelPermission}
+							variant="outlined"
+							color="secondary"
 						>
 							<Flex align="center" justify="center">
 								<Plus size="md" />

frontend/src/container/FormAlertRules/QuerySection.styles.scss

@@ -17,7 +17,7 @@
 				width: 14px;
 			}
 		}
-		.ant-btn-default {
+		button {
 			border-color: transparent;
 		}
 	}

frontend/src/container/FormAlertRules/QuerySection.tsx

@@ -1,7 +1,8 @@
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Tabs, Tooltip } from 'antd';
+import { Tabs, Tooltip } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import PromQLIcon from 'assets/Dashboard/PromQl';
@@ -105,7 +106,7 @@ function QuerySection({
 		{
 			label: (
 				<Tooltip title="Query Builder">
-					<Button className="nav-btns">
+					<Button className="nav-btns" variant="outlined" color="secondary">
 						<Atom size={14} />
 						<Typography.Text>Query Builder</Typography.Text>
 					</Button>
@@ -122,7 +123,12 @@ function QuerySection({
 							: 'ClickHouse'
 					}
 				>
-					<Button className="nav-btns" disabled={isAnomalyDetection}>
+					<Button
+						className="nav-btns"
+						disabled={isAnomalyDetection}
+						variant="outlined"
+						color="secondary"
+					>
 						<Terminal size={14} />
 						<Typography.Text>ClickHouse Query</Typography.Text>
 					</Button>
@@ -145,7 +151,12 @@ function QuerySection({
 			{
 				label: (
 					<Tooltip title="Query Builder">
-						<Button className="nav-btns" data-testid="query-builder-tab">
+						<Button
+							className="nav-btns"
+							data-testid="query-builder-tab"
+							variant="outlined"
+							color="secondary"
+						>
 							<Atom size={14} />
 							<Typography.Text>Query Builder</Typography.Text>
 						</Button>
@@ -162,7 +173,12 @@ function QuerySection({
 								: 'ClickHouse'
 						}
 					>
-						<Button className="nav-btns" disabled={isAnomalyDetection}>
+						<Button
+							className="nav-btns"
+							disabled={isAnomalyDetection}
+							variant="outlined"
+							color="secondary"
+						>
 							<Terminal size={14} />
 							<Typography.Text>ClickHouse Query</Typography.Text>
 						</Button>
@@ -180,7 +196,12 @@ function QuerySection({
 								: 'PromQL'
 						}
 					>
-						<Button className="nav-btns" disabled={isAnomalyDetection}>
+						<Button
+							className="nav-btns"
+							disabled={isAnomalyDetection}
+							variant="outlined"
+							color="secondary"
+						>
 							<PromQLIcon
 								fillColor={isDarkMode ? Color.BG_VANILLA_200 : Color.BG_INK_300}
 							/>

frontend/src/container/FormAlertRules/index.tsx

@@ -5,7 +5,8 @@ import { useQueryClient } from 'react-query';
 import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { BellDot, CircleAlert, ExternalLink, Save } from '@signozhq/icons';
-import { Button, FormInstance, Modal, SelectProps } from 'antd';
+import { FormInstance, Modal, SelectProps } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
@@ -863,9 +864,10 @@ function FormAlertRules({
 					</div>
 
 					<Button
-						className="periscope-btn"
 						onClick={(): void => handleRedirection(alertDef.alertType as AlertTypes)}
-						icon={<ExternalLink size={14} />}
+						variant="outlined"
+						color="secondary"
+						prefix={<ExternalLink size={14} />}
 					>
 						Alert Setup Guide
 					</Button>

frontend/src/container/FormAlertRules/labels/index.tsx

@@ -1,7 +1,7 @@
 import { ChangeEvent, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { CircleAlert, CircleX } from '@signozhq/icons';
-import { Button, Input, message, Modal } from 'antd';
+import { Input, message, Modal } from 'antd';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { map } from 'lodash-es';
 import { Labels } from 'types/api/alerts/def';
@@ -11,6 +11,7 @@ import QueryChip from './QueryChip';
 import { QueryChipItem, SearchContainer } from './styles';
 import { ILabelRecord } from './types';
 import { createQuery, flattenLabels, prepareLabels } from './utils';
+import { Button } from '@signozhq/ui/button';
 
 type LabelStep = 'Idle' | 'LabelKey' | 'LabelValue';
 type LabelEvent = 'NEXT' | 'onBlur' | 'RESET';
@@ -182,8 +183,9 @@ function LabelSelect({
 				{queries.length > 0 || staging.length > 0 || currentVal ? (
 					<Button
 						onClick={handleClearAll}
-						icon={<CircleX size="md" />}
-						type="text"
+						variant="ghost"
+						size="icon"
+						prefix={<CircleX size="md" />}
 					/>
 				) : null}
 			</div>

frontend/src/container/GridCardLayout/DashboardEmptyState/DashboardEmptyState.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useRef, useState } from 'react';
 import { Plus } from '@signozhq/icons';
-import { Button } 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';
@@ -107,11 +107,11 @@ export default function DashboardEmptyState(): JSX.Element {
 						{/* This Empty State needs to be consolidated. The SettingsDrawer should be global to the
 						whole dashboard page instead of confined to this Empty State */}
 						<Button
-							type="text"
 							className="configure-button"
-							icon={<ConfigureIcon />}
 							data-testid="show-drawer"
 							onClick={onConfigureClick}
+							variant="ghost"
+							prefix={<ConfigureIcon />}
 						>
 							Configure
 						</Button>
@@ -143,9 +143,8 @@ export default function DashboardEmptyState(): JSX.Element {
 							<Button
 								className="add-panel-btn"
 								onClick={onEmptyWidgetHandler}
-								icon={<Plus size="md" />}
-								type="primary"
 								data-testid="add-panel"
+								prefix={<Plus size="md" />}
 							>
 								New Panel
 							</Button>

frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx

@@ -10,7 +10,7 @@ import { useQueryClient } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux'; // old code, TODO: fix this correctly
 import { Loader, RefreshCw, Search } from '@signozhq/icons';
-import { Button, Input, Spin } from 'antd';
+import { Input, Spin } from 'antd';
 import cx from 'classnames';
 import { ToggleGraphProps } from 'components/Graph/types';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
@@ -61,6 +61,7 @@ import { GraphContainer, TimeContainer } from './styles';
 import { FullViewProps } from './types';
 
 import './WidgetFullView.styles.scss';
+import { Button } from '@signozhq/ui/button';
 
 function FullView({
 	widget,
@@ -302,7 +303,7 @@ function FullView({
 								{enableDrillDown && (
 									<div className="drildown-options-container">
 										{showResetQuery && (
-											<Button type="link" onClick={handleResetQuery}>
+											<Button onClick={handleResetQuery} variant="link">
 												Reset Query
 											</Button>
 										)}
@@ -317,6 +318,8 @@ function FullView({
 														});
 													}
 												}}
+												variant="outlined"
+												color="secondary"
 											>
 												Switch to Edit Mode
 											</Button>
@@ -350,8 +353,8 @@ function FullView({
 										onClick={(): void => {
 											response.refetch();
 										}}
-										type="primary"
-										icon={<RefreshCw size="md" />}
+										size="icon"
+										prefix={<RefreshCw size="md" />}
 									/>
 								</div>
 							</TimeContainer>

frontend/src/container/GridCardLayout/GridCardLayout.tsx

@@ -6,7 +6,8 @@ import { useIsFetching } from 'react-query';
 import { useDispatch } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Form, Input, Modal } from 'antd';
+import { Form, Input, Modal } from 'antd';
+import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';
@@ -523,9 +524,9 @@ function GraphLayout(props: GraphLayoutProps): JSX.Element {
 			{isDashboardLocked && (
 				<div className="footer">
 					<Button
-						type="text"
-						icon={<LockKeyhole size={14} />}
 						className="locked-text"
+						variant="ghost"
+						prefix={<LockKeyhole size={14} />}
 					>
 						Locked
 					</Button>
@@ -560,22 +561,21 @@ function GraphLayout(props: GraphLayoutProps): JSX.Element {
 					<Form.Item>
 						<div className="action-btns">
 							<Button
-								type="primary"
-								htmlType="submit"
 								className="ok-btn"
-								icon={<Check size={14} />}
 								disabled={updateDashboardMutation.isLoading}
+								type="submit"
+								prefix={<Check size={14} />}
 							>
 								Apply Changes
 							</Button>
 							<Button
-								type="text"
 								className="cancel-btn"
-								icon={<X size={14} />}
 								onClick={(): void => {
 									setIsSettingsModalOpen(false);
 									setCurrentSelectRowId(null);
 								}}
+								variant="ghost"
+								prefix={<X size={14} />}
 							>
 								Cancel
 							</Button>

frontend/src/container/GridCardLayout/WidgetRow.tsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Layout } from 'react-grid-layout';
-import { Button, Popover } from 'antd';
+import { Popover } from 'antd';
 import useComponentPermission from 'hooks/useComponentPermission';
 import { Ellipsis, PenLine, Plus, X } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
@@ -12,6 +12,7 @@ import {
 } from 'providers/Dashboard/store/useDashboardStore';
 import { ROLES, USER_ROLES } from 'types/roles';
 import { ComponentTypes } from 'utils/permission';
+import { Button } from '@signozhq/ui/button';
 
 interface WidgetRowHeaderProps {
 	rowWidgetProperties: {
@@ -67,14 +68,14 @@ export function WidgetRowHeader(props: WidgetRowHeaderProps): JSX.Element {
 					<section className="section-1">
 						<Button
 							className="rename-btn"
-							type="text"
 							disabled={!editWidget}
-							icon={<PenLine size={14} />}
 							onClick={(): void => {
 								setIsSettingsModalOpen(true);
 								setCurrentSelectRowId(id);
 								setIsRowSettingsOpen(false);
 							}}
+							variant="ghost"
+							prefix={<PenLine size={14} />}
 						>
 							Rename
 						</Button>
@@ -82,9 +83,7 @@ export function WidgetRowHeader(props: WidgetRowHeaderProps): JSX.Element {
 					<section className="section-1">
 						<Button
 							className="new-panel-btn"
-							type="text"
 							disabled={!editWidget && addPanelPermission && !isDashboardLocked}
-							icon={<Plus size={14} />}
 							onClick={(): void => {
 								// TODO: @AshwinBhatkal Simplify this check in cleanup of https://github.com/SigNoz/engineering-pod/issues/3953
 								if (!dashboardData?.id) {
@@ -94,6 +93,8 @@ export function WidgetRowHeader(props: WidgetRowHeaderProps): JSX.Element {
 								setSelectedRowWidgetId(dashboardData.id, id);
 								setIsPanelTypeSelectionModalOpen(true);
 							}}
+							variant="ghost"
+							prefix={<Plus size={14} />}
 						>
 							New Panel
 						</Button>
@@ -102,14 +103,14 @@ export function WidgetRowHeader(props: WidgetRowHeaderProps): JSX.Element {
 						<section className="section-2">
 							<Button
 								className="remove-section"
-								type="text"
-								icon={<X size={14} />}
 								disabled={!deleteWidget}
 								onClick={(): void => {
 									setIsDeleteModalOpen(true);
 									setCurrentSelectRowId(id);
 									setIsRowSettingsOpen(false);
 								}}
+								variant="ghost"
+								prefix={<X size={14} />}
 							>
 								Remove Section
 							</Button>

frontend/src/container/Home/AlertRules/AlertRules.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Link, useLocation } from 'react-router-dom';
-import { Button, Skeleton, Tag } from 'antd';
+import { Skeleton, Tag } from 'antd';
 import logEvent from 'api/common/logEvent';
 import { useListRules } from 'api/generated/services/rules';
 import type { RuletypesRuleDTO } from 'api/generated/services/sigNoz.schemas';
@@ -17,6 +17,7 @@ import { USER_ROLES } from 'types/roles';
 import beaconUrl from '@/assets/Icons/beacon.svg';
 
 import { getItemIcon } from '../constants';
+import { Button } from '@signozhq/ui/button';
 
 export default function AlertRules({
 	onUpdateChecklistDoneItem,
@@ -89,19 +90,18 @@ export default function AlertRules({
 					<div className="empty-actions-container">
 						<Link to={ROUTES.ALERTS_NEW}>
 							<Button
-								type="default"
-								className="periscope-btn secondary"
-								icon={<Plus size={16} />}
 								onClick={(): void => {
 									logEvent('Homepage: Create alert rule clicked', {});
 								}}
+								variant="outlined"
+								color="secondary"
+								prefix={<Plus size={16} />}
 							>
 								Create Alert Rule
 							</Button>
 						</Link>
 
 						<Button
-							type="link"
 							className="learn-more-link"
 							onClick={(): void => {
 								logEvent('Homepage: Learn more clicked', {
@@ -114,6 +114,7 @@ export default function AlertRules({
 									'noreferrer noopener',
 								);
 							}}
+							variant="link"
 						>
 							Learn more <ArrowUpRight size={12} />
 						</Button>
@@ -227,11 +228,11 @@ export default function AlertRules({
 					<div className="alert-rules-footer home-data-card-footer">
 						<Link to={ROUTES.LIST_ALL_ALERT}>
 							<Button
-								type="link"
-								className="periscope-btn link learn-more-link"
+								className="learn-more-link"
 								onClick={(): void => {
 									logEvent('Homepage: All alert rules clicked', {});
 								}}
+								variant="link"
 							>
 								All Alert Rules <ArrowRight size={12} />
 							</Button>

frontend/src/container/Home/Dashboards/Dashboards.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
-import { Button, Skeleton, Tag } from 'antd';
+import { Skeleton, Tag } from 'antd';
 import logEvent from 'api/common/logEvent';
 import ROUTES from 'constants/routes';
 import { useGetAllDashboard } from 'hooks/dashboard/useGetAllDashboard';
@@ -15,6 +15,7 @@ import { openInNewTab } from 'utils/navigation';
 import dialsUrl from '@/assets/Icons/dials.svg';
 
 import { getItemIcon } from '../constants';
+import { Button } from '@signozhq/ui/button';
 
 export default function Dashboards({
 	onUpdateChecklistDoneItem,
@@ -70,19 +71,18 @@ export default function Dashboards({
 					<div className="empty-actions-container">
 						<Link to={ROUTES.ALL_DASHBOARD}>
 							<Button
-								type="default"
-								className="periscope-btn secondary"
-								icon={<Plus size={16} />}
 								onClick={(): void => {
 									logEvent('Homepage: Create dashboard clicked', {});
 								}}
+								variant="outlined"
+								color="secondary"
+								prefix={<Plus size={16} />}
 							>
 								New Dashboard
 							</Button>
 						</Link>
 
 						<Button
-							type="link"
 							className="learn-more-link"
 							onClick={(): void => {
 								logEvent('Homepage: Learn more clicked', {
@@ -93,6 +93,7 @@ export default function Dashboards({
 									'_blank',
 								);
 							}}
+							variant="link"
 						>
 							Learn more <ArrowUpRight size={12} />
 						</Button>
@@ -198,11 +199,11 @@ export default function Dashboards({
 					<div className="dashboards-footer home-data-card-footer">
 						<Link to={ROUTES.ALL_DASHBOARD}>
 							<Button
-								type="link"
-								className="periscope-btn link learn-more-link"
+								className="learn-more-link"
 								onClick={(): void => {
 									logEvent('Homepage: All dashboards clicked', {});
 								}}
+								variant="link"
 							>
 								All Dashboards <ArrowRight size={12} />
 							</Button>