diff --git a/apps/web/pages/v2/apps/[slug]/setup.tsx b/apps/web/pages/v2/apps/[slug]/setup.tsx
index a412c29b3a..4cd7a56216 100644
--- a/apps/web/pages/v2/apps/[slug]/setup.tsx
+++ b/apps/web/pages/v2/apps/[slug]/setup.tsx
@@ -4,7 +4,6 @@ import { useRouter } from "next/router";
 
 import { getStaticProps } from "@calcom/app-store/_pages/setup/_getStaticProps";
 import { AppSetupPage } from "@calcom/app-store/_pages/v2/setup";
-import Loader from "@calcom/ui/Loader";
 
 export default function SetupInformation(props: InferGetStaticPropsType<typeof getStaticProps>) {
   const router = useRouter();
@@ -12,11 +11,7 @@ export default function SetupInformation(props: InferGetStaticPropsType<typeof g
   const { status } = useSession();
 
   if (status === "loading") {
-    return (
-      <div className="absolute z-50 flex h-screen w-full items-center bg-gray-200">
-        <Loader />
-      </div>
-    );
+    return <div className="absolute z-50 flex h-screen w-full items-center bg-gray-200" />;
   }
 
   if (status === "unauthenticated") {
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 84f15b803e..543585e982 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1299,5 +1299,7 @@
   "dont_update": "Don't update",
   "email_address_action": "send email to a specific email address",
   "after_event_trigger": "after event ends",
-  "how_long_after": "How long after event ends?"
+  "how_long_after": "How long after event ends?",
+  "no_available_slots": "No Available slots",
+  "time_available": "Time available"
 }
diff --git a/packages/app-store/zapier/pages/v2/setup/index.tsx b/packages/app-store/zapier/pages/v2/setup/index.tsx
index 3de79fed76..5a6ad474ce 100644
--- a/packages/app-store/zapier/pages/v2/setup/index.tsx
+++ b/packages/app-store/zapier/pages/v2/setup/index.tsx
@@ -41,11 +41,7 @@ export default function ZapierSetup(props: IZapierSetupProps) {
   }
 
   if (integrations.isLoading) {
-    return (
-      <div className="absolute z-50 flex h-screen w-full items-center bg-gray-200">
-        <Loader />
-      </div>
-    );
+    return <div className="absolute z-50 flex h-screen w-full items-center bg-gray-200" />;
   }
 
   return (
diff --git a/packages/features/ee/teams/components/v2/SkeletonLoaderAvailabilityTimes.tsx b/packages/features/ee/teams/components/v2/SkeletonLoaderAvailabilityTimes.tsx
new file mode 100644
index 0000000000..745da0cf38
--- /dev/null
+++ b/packages/features/ee/teams/components/v2/SkeletonLoaderAvailabilityTimes.tsx
@@ -0,0 +1,15 @@
+import { SkeletonContainer, SkeletonText } from "@calcom/ui";
+
+function SkeletonLoader() {
+  return (
+    <SkeletonContainer>
+      <div className="mr-3">
+        <SkeletonText className="h-4 w-28" />
+        <SkeletonText className="mt-3 h-11 w-full" />
+        <SkeletonText className="mt-2 h-11 w-full" />
+      </div>
+    </SkeletonContainer>
+  );
+}
+
+export default SkeletonLoader;
diff --git a/packages/features/ee/teams/components/v2/TeamAvailabilityTimes.tsx b/packages/features/ee/teams/components/v2/TeamAvailabilityTimes.tsx
index ca18bd899f..c1c75dbaf0 100644
--- a/packages/features/ee/teams/components/v2/TeamAvailabilityTimes.tsx
+++ b/packages/features/ee/teams/components/v2/TeamAvailabilityTimes.tsx
@@ -3,9 +3,11 @@ import React from "react";
 import { ITimezone } from "react-timezone-select";
 
 import { Dayjs } from "@calcom/dayjs";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import getSlots from "@calcom/lib/slots";
 import { trpc } from "@calcom/trpc/react";
-import { Loader } from "@calcom/ui/v2";
+
+import SkeletonLoader from "./SkeletonLoaderAvailabilityTimes";
 
 interface Props {
   teamId: number;
@@ -18,6 +20,8 @@ interface Props {
 }
 
 export default function TeamAvailabilityTimes(props: Props) {
+  const { t } = useLocale();
+
   const { data, isLoading } = trpc.useQuery(
     [
       "viewer.teams.getMemberAvailability",
@@ -47,13 +51,13 @@ export default function TeamAvailabilityTimes(props: Props) {
   return (
     <div className={classNames("min-w-60 flex-grow pl-0", props.className)}>
       {props.HeaderComponent}
-      {isLoading && times.length === 0 && <Loader />}
+      {isLoading && times.length === 0 && <SkeletonLoader />}
       {!isLoading && times.length === 0 ? (
         <div className="flex flex-col items-center justify-center pt-4">
-          <span className="text-sm text-gray-500">No Available slots</span>
+          <span className="text-sm text-gray-500">{t("no_available_slots")}</span>
         </div>
       ) : (
-        <>{!isLoading && <p className="mb-3 text-sm text-gray-600">Time available</p>}</>
+        <>{!isLoading && <p className="mb-3 text-sm text-gray-600">{t("time_available")}</p>}</>
       )}
       <div className="max-h-[390px] overflow-scroll">
         {times.map((time) => (
diff --git a/packages/features/ee/workflows/components/v2/SkeletonLoaderEdit.tsx b/packages/features/ee/workflows/components/v2/SkeletonLoaderEdit.tsx
index 3e8c3e2a02..3de67223b9 100644
--- a/packages/features/ee/workflows/components/v2/SkeletonLoaderEdit.tsx
+++ b/packages/features/ee/workflows/components/v2/SkeletonLoaderEdit.tsx
@@ -1,5 +1,4 @@
-import { SkeletonAvatar, SkeletonContainer, SkeletonText } from "@calcom/ui";
-import { Icon } from "@calcom/ui/Icon";
+import { SkeletonContainer, SkeletonText } from "@calcom/ui";
 
 function SkeletonLoader() {
   return (