diff --git a/app/(dashboard)/relatorios/categorias/data.ts b/app/(dashboard)/relatorios/tendencias/data.ts
similarity index 100%
rename from app/(dashboard)/relatorios/categorias/data.ts
rename to app/(dashboard)/relatorios/tendencias/data.ts
diff --git a/app/(dashboard)/relatorios/categorias/layout.tsx b/app/(dashboard)/relatorios/tendencias/layout.tsx
similarity index 100%
rename from app/(dashboard)/relatorios/categorias/layout.tsx
rename to app/(dashboard)/relatorios/tendencias/layout.tsx
diff --git a/app/(dashboard)/relatorios/categorias/loading.tsx b/app/(dashboard)/relatorios/tendencias/loading.tsx
similarity index 100%
rename from app/(dashboard)/relatorios/categorias/loading.tsx
rename to app/(dashboard)/relatorios/tendencias/loading.tsx
diff --git a/app/(dashboard)/relatorios/categorias/page.tsx b/app/(dashboard)/relatorios/tendencias/page.tsx
similarity index 98%
rename from app/(dashboard)/relatorios/categorias/page.tsx
rename to app/(dashboard)/relatorios/tendencias/page.tsx
index 8ffb4b7..5d7f5dd 100644
--- a/app/(dashboard)/relatorios/categorias/page.tsx
+++ b/app/(dashboard)/relatorios/tendencias/page.tsx
@@ -58,7 +58,7 @@ export default async function Page({ searchParams }: PageProps) {
 	if (!validation.isValid) {
 		// Redirect to default if validation fails
 		redirect(
-			`/relatorios/categorias?inicio=${defaultStartPeriod}&fim=${currentPeriod}`,
+			`/relatorios/tendencias?inicio=${defaultStartPeriod}&fim=${currentPeriod}`,
 		);
 	}
 
diff --git a/app/(dashboard)/relatorios/cartoes/layout.tsx b/app/(dashboard)/relatorios/uso-cartoes/layout.tsx
similarity index 100%
rename from app/(dashboard)/relatorios/cartoes/layout.tsx
rename to app/(dashboard)/relatorios/uso-cartoes/layout.tsx
diff --git a/app/(dashboard)/relatorios/cartoes/loading.tsx b/app/(dashboard)/relatorios/uso-cartoes/loading.tsx
similarity index 100%
rename from app/(dashboard)/relatorios/cartoes/loading.tsx
rename to app/(dashboard)/relatorios/uso-cartoes/loading.tsx
diff --git a/app/(dashboard)/relatorios/cartoes/page.tsx b/app/(dashboard)/relatorios/uso-cartoes/page.tsx
similarity index 100%
rename from app/(dashboard)/relatorios/cartoes/page.tsx
rename to app/(dashboard)/relatorios/uso-cartoes/page.tsx
diff --git a/components/categorias/categories-page.tsx b/components/categorias/categories-page.tsx
index 8498e5c..74b304f 100644
--- a/components/categorias/categories-page.tsx
+++ b/components/categorias/categories-page.tsx
@@ -130,10 +130,11 @@ export function CategoriesPage({ categories }: CategoriesPageProps) {
 								</div>
 							) : (
 								<div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-									{categoriesByType[type].map((category) => (
+									{categoriesByType[type].map((category, index) => (
 										<CategoryCard
 											key={category.id}
 											category={category}
+											colorIndex={index}
 											onEdit={handleEdit}
 											onRemove={handleRemoveRequest}
 										/>
diff --git a/components/categorias/category-card.tsx b/components/categorias/category-card.tsx
index 2fcfb03..f129a5d 100644
--- a/components/categorias/category-card.tsx
+++ b/components/categorias/category-card.tsx
@@ -1,94 +1,103 @@
 "use client";
 
-import { RiDeleteBin5Line, RiMore2Fill, RiPencilLine } from "@remixicon/react";
-import Link from "next/link";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
 import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { TypeBadge } from "../type-badge";
-import { CategoryIcon } from "./category-icon";
+	RiDeleteBin5Line,
+	RiFileList2Line,
+	RiPencilLine,
+} from "@remixicon/react";
+import Link from "next/link";
+import { Card, CardContent, CardFooter } from "@/components/ui/card";
+import { cn } from "@/lib/utils/ui";
+import { CategoryIconBadge } from "./category-icon-badge";
 import type { Category } from "./types";
 
 interface CategoryCardProps {
 	category: Category;
+	colorIndex: number;
 	onEdit: (category: Category) => void;
 	onRemove: (category: Category) => void;
 }
 
 export function CategoryCard({
 	category,
+	colorIndex,
 	onEdit,
 	onRemove,
 }: CategoryCardProps) {
-	// Categorias protegidas que não podem ser editadas ou removidas
 	const categoriasProtegidas = [
 		"Transferência interna",
 		"Saldo inicial",
 		"Pagamentos",
 	];
 	const isProtegida = categoriasProtegidas.includes(category.name);
-	const canEdit = !isProtegida;
-	const canRemove = !isProtegida;
+
+	const actions = [
+		{
+			label: "editar",
+			icon: <RiPencilLine className="size-4" aria-hidden />,
+			onClick: () => onEdit(category),
+			variant: "default" as const,
+			disabled: isProtegida,
+		},
+		{
+			label: "detalhes",
+			icon: <RiFileList2Line className="size-4" aria-hidden />,
+			href: `/categorias/${category.id}`,
+			variant: "default" as const,
+			disabled: false,
+		},
+		{
+			label: "remover",
+			icon: <RiDeleteBin5Line className="size-4" aria-hidden />,
+			onClick: () => onRemove(category),
+			variant: "destructive" as const,
+			disabled: isProtegida,
+		},
+	].filter((action) => !action.disabled);
 
 	return (
-		<Card className="group py-2">
-			<CardContent className="p-2">
-				<div className="flex items-start justify-between gap-3">
-					<div className="flex items-start gap-2">
-						<span className="flex size-11 items-center justify-center text-primary">
-							<CategoryIcon name={category.icon} className="size-6" />
-						</span>
-						<div className="space-y-1">
-							<h3 className="text-base font-medium leading-tight">
-								<Link
-									href={`/categorias/${category.id}`}
-									className="underline-offset-4 hover:underline"
-								>
-									{category.name}
-								</Link>
-							</h3>
-							<div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-								<TypeBadge type={category.type} />
-							</div>
-						</div>
-					</div>
-
-					<DropdownMenu>
-						<DropdownMenuTrigger asChild>
-							<Button
-								variant="ghost"
-								size="icon-sm"
-								className="opacity-0 transition-opacity group-hover:opacity-100"
-							>
-								<RiMore2Fill className="size-4" />
-								<span className="sr-only">Abrir ações da categoria</span>
-							</Button>
-						</DropdownMenuTrigger>
-						<DropdownMenuContent align="end">
-							<DropdownMenuItem
-								onSelect={() => onEdit(category)}
-								disabled={!canEdit}
-							>
-								<RiPencilLine className="mr-2 size-4" />
-								Editar
-							</DropdownMenuItem>
-							<DropdownMenuItem
-								variant="destructive"
-								onSelect={() => onRemove(category)}
-								disabled={!canRemove}
-							>
-								<RiDeleteBin5Line className="mr-2 size-4" />
-								Remover
-							</DropdownMenuItem>
-						</DropdownMenuContent>
-					</DropdownMenu>
+		<Card className="flex h-full flex-col gap-0 py-3">
+			<CardContent className="flex flex-1 flex-col">
+				<div className="flex items-center gap-3">
+					<CategoryIconBadge
+						icon={category.icon}
+						name={category.name}
+						colorIndex={colorIndex}
+						size="md"
+					/>
+					<h3 className="leading-tight">{category.name}</h3>
 				</div>
 			</CardContent>
+
+			<CardFooter className="flex flex-wrap gap-3 px-6 pt-4 text-sm">
+				{actions.map(({ label, icon, onClick, href, variant }) => {
+					const className = cn(
+						"flex items-center gap-1 font-medium transition-opacity hover:opacity-80",
+						variant === "destructive" ? "text-destructive" : "text-primary",
+					);
+
+					if (href) {
+						return (
+							<Link key={label} href={href} className={className}>
+								{icon}
+								{label}
+							</Link>
+						);
+					}
+
+					return (
+						<button
+							key={label}
+							type="button"
+							onClick={onClick}
+							className={className}
+						>
+							{icon}
+							{label}
+						</button>
+					);
+				})}
+			</CardFooter>
 		</Card>
 	);
 }
diff --git a/components/categorias/category-detail-header.tsx b/components/categorias/category-detail-header.tsx
index f29cea6..0c7e888 100644
--- a/components/categorias/category-detail-header.tsx
+++ b/components/categorias/category-detail-header.tsx
@@ -1,25 +1,11 @@
 import { RiArrowDownLine, RiArrowUpLine } from "@remixicon/react";
 import type { CategoryType } from "@/lib/categorias/constants";
 import { currencyFormatter } from "@/lib/lancamentos/formatting-helpers";
-import { getIconComponent } from "@/lib/utils/icons";
 import { cn } from "@/lib/utils/ui";
+import { CategoryIconBadge } from "./category-icon-badge";
 import { TypeBadge } from "../type-badge";
 import { Card } from "../ui/card";
 
-const buildInitials = (value: string) => {
-	const parts = value.trim().split(/\s+/).filter(Boolean);
-	if (parts.length === 0) {
-		return "CT";
-	}
-	if (parts.length === 1) {
-		const firstPart = parts[0];
-		return firstPart ? firstPart.slice(0, 2).toUpperCase() : "CT";
-	}
-	const firstChar = parts[0]?.[0] ?? "";
-	const secondChar = parts[1]?.[0] ?? "";
-	return `${firstChar}${secondChar}`.toUpperCase() || "CT";
-};
-
 type CategorySummary = {
 	id: string;
 	name: string;
@@ -46,9 +32,6 @@ export function CategoryDetailHeader({
 	percentageChange,
 	transactionCount,
 }: CategoryDetailHeaderProps) {
-	const IconComponent = category.icon ? getIconComponent(category.icon) : null;
-	const initials = buildInitials(category.name);
-
 	const isIncrease =
 		typeof percentageChange === "number" && percentageChange > 0;
 	const isDecrease =
@@ -87,15 +70,12 @@ export function CategoryDetailHeader({
 		<Card className="px-4">
 			<div className="flex flex-col gap-6 lg:flex-row lg:items-center lg:justify-between">
 				<div className="flex items-start gap-3">
-					<span className="flex size-12 items-center justify-center rounded-xl bg-muted">
-						{IconComponent ? (
-							<IconComponent className="size-6" aria-hidden />
-						) : (
-							<span className="text-sm font-semibold uppercase text-muted-foreground">
-								{initials}
-							</span>
-						)}
-					</span>
+					<CategoryIconBadge
+						icon={category.icon}
+						name={category.name}
+						colorIndex={0}
+						size="lg"
+					/>
 					<div className="space-y-2">
 						<h1 className="text-xl font-semibold leading-tight">
 							{category.name}
diff --git a/components/categorias/category-icon-badge.tsx b/components/categorias/category-icon-badge.tsx
new file mode 100644
index 0000000..6afe675
--- /dev/null
+++ b/components/categorias/category-icon-badge.tsx
@@ -0,0 +1,78 @@
+"use client";
+
+import {
+	buildCategoryInitials,
+	getCategoryBgColor,
+	getCategoryColor,
+} from "@/lib/utils/category-colors";
+import { getIconComponent } from "@/lib/utils/icons";
+import { cn } from "@/lib/utils/ui";
+
+const sizeVariants = {
+	sm: {
+		container: "size-8",
+		icon: "size-4",
+		text: "text-[10px]",
+	},
+	md: {
+		container: "size-9",
+		icon: "size-5",
+		text: "text-xs",
+	},
+	lg: {
+		container: "size-12",
+		icon: "size-6",
+		text: "text-sm",
+	},
+} as const;
+
+export type CategoryIconBadgeSize = keyof typeof sizeVariants;
+
+export interface CategoryIconBadgeProps {
+	/** Nome do ícone Remix (ex: "RiShoppingBag3Line") */
+	icon?: string | null;
+	/** Nome da categoria (usado para gerar iniciais como fallback) */
+	name: string;
+	/** Índice para determinar a cor (cicla entre as cores disponíveis) */
+	colorIndex: number;
+	/** Tamanho do badge: sm (32px), md (36px), lg (48px) */
+	size?: CategoryIconBadgeSize;
+	/** Classes adicionais para o container */
+	className?: string;
+}
+
+export function CategoryIconBadge({
+	icon,
+	name,
+	colorIndex,
+	size = "md",
+	className,
+}: CategoryIconBadgeProps) {
+	const IconComponent = icon ? getIconComponent(icon) : null;
+	const initials = buildCategoryInitials(name);
+	const color = getCategoryColor(colorIndex);
+	const bgColor = getCategoryBgColor(colorIndex);
+	const variant = sizeVariants[size];
+
+	return (
+		<div
+			className={cn(
+				"flex shrink-0 items-center justify-center overflow-hidden rounded-lg",
+				variant.container,
+				className,
+			)}
+			style={{ backgroundColor: bgColor }}
+		>
+			{IconComponent ? (
+				<IconComponent className={variant.icon} style={{ color }} />
+			) : (
+				<span
+					className={cn("font-semibold uppercase", variant.text)}
+					style={{ color }}
+				>
+					{initials}
+				</span>
+			)}
+		</div>
+	);
+}
diff --git a/components/dashboard/expenses-by-category-widget-with-chart.tsx b/components/dashboard/expenses-by-category-widget-with-chart.tsx
index dfe659a..d550c61 100644
--- a/components/dashboard/expenses-by-category-widget-with-chart.tsx
+++ b/components/dashboard/expenses-by-category-widget-with-chart.tsx
@@ -12,15 +12,10 @@ import {
 import Link from "next/link";
 import { useMemo, useState } from "react";
 import { Pie, PieChart, Tooltip } from "recharts";
+import { CategoryIconBadge } from "@/components/categorias/category-icon-badge";
 import MoneyValues from "@/components/money-values";
 import { type ChartConfig, ChartContainer } from "@/components/ui/chart";
 import type { ExpensesByCategoryData } from "@/lib/dashboard/categories/expenses-by-category";
-import {
-	buildCategoryInitials,
-	getCategoryBgColor,
-	getCategoryColor,
-} from "@/lib/utils/category-colors";
-import { getIconComponent } from "@/lib/utils/icons";
 import { formatPeriodForUrl } from "@/lib/utils/period";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
 import { WidgetEmptyState } from "../widget-empty-state";
@@ -162,12 +157,6 @@ export function ExpensesByCategoryWidgetWithChart({
 			<TabsContent value="list" className="mt-0">
 				<div className="flex flex-col px-0">
 					{data.categories.map((category, index) => {
-						const IconComponent = category.categoryIcon
-							? getIconComponent(category.categoryIcon)
-							: null;
-						const initials = buildCategoryInitials(category.categoryName);
-						const color = getCategoryColor(index);
-						const bgColor = getCategoryBgColor(index);
 						const hasIncrease =
 							category.percentageChange !== null &&
 							category.percentageChange > 0;
@@ -192,21 +181,11 @@ export function ExpensesByCategoryWidgetWithChart({
 							>
 								<div className="flex items-center justify-between gap-3">
 									<div className="flex min-w-0 flex-1 items-center gap-2">
-										<div
-											className="flex size-10 shrink-0 items-center justify-center overflow-hidden rounded-lg"
-											style={{ backgroundColor: bgColor }}
-										>
-											{IconComponent ? (
-												<IconComponent className="size-4" style={{ color }} />
-											) : (
-												<span
-													className="text-xs font-semibold uppercase"
-													style={{ color }}
-												>
-													{initials}
-												</span>
-											)}
-										</div>
+										<CategoryIconBadge
+											icon={category.categoryIcon}
+											name={category.categoryName}
+											colorIndex={index}
+										/>
 
 										<div className="min-w-0 flex-1">
 											<div className="flex items-center gap-2">
diff --git a/components/dashboard/income-by-category-widget-with-chart.tsx b/components/dashboard/income-by-category-widget-with-chart.tsx
index 0b19b51..2418d06 100644
--- a/components/dashboard/income-by-category-widget-with-chart.tsx
+++ b/components/dashboard/income-by-category-widget-with-chart.tsx
@@ -12,15 +12,10 @@ import {
 import Link from "next/link";
 import { useMemo, useState } from "react";
 import { Pie, PieChart, Tooltip } from "recharts";
+import { CategoryIconBadge } from "@/components/categorias/category-icon-badge";
 import MoneyValues from "@/components/money-values";
 import { type ChartConfig, ChartContainer } from "@/components/ui/chart";
 import type { IncomeByCategoryData } from "@/lib/dashboard/categories/income-by-category";
-import {
-	buildCategoryInitials,
-	getCategoryBgColor,
-	getCategoryColor,
-} from "@/lib/utils/category-colors";
-import { getIconComponent } from "@/lib/utils/icons";
 import { formatPeriodForUrl } from "@/lib/utils/period";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
 import { WidgetEmptyState } from "../widget-empty-state";
@@ -162,12 +157,6 @@ export function IncomeByCategoryWidgetWithChart({
 			<TabsContent value="list" className="mt-0">
 				<div className="flex flex-col px-0">
 					{data.categories.map((category, index) => {
-						const IconComponent = category.categoryIcon
-							? getIconComponent(category.categoryIcon)
-							: null;
-						const initials = buildCategoryInitials(category.categoryName);
-						const color = getCategoryColor(index);
-						const bgColor = getCategoryBgColor(index);
 						const hasIncrease =
 							category.percentageChange !== null &&
 							category.percentageChange > 0;
@@ -192,21 +181,11 @@ export function IncomeByCategoryWidgetWithChart({
 							>
 								<div className="flex items-center justify-between gap-3">
 									<div className="flex min-w-0 flex-1 items-center gap-2">
-										<div
-											className="flex size-10 shrink-0 items-center justify-center overflow-hidden rounded-lg"
-											style={{ backgroundColor: bgColor }}
-										>
-											{IconComponent ? (
-												<IconComponent className="size-4" style={{ color }} />
-											) : (
-												<span
-													className="text-xs font-semibold uppercase"
-													style={{ color }}
-												>
-													{initials}
-												</span>
-											)}
-										</div>
+										<CategoryIconBadge
+											icon={category.categoryIcon}
+											name={category.categoryName}
+											colorIndex={index}
+										/>
 
 										<div className="min-w-0 flex-1">
 											<div className="flex items-center gap-2">
diff --git a/components/orcamentos/budget-card.tsx b/components/orcamentos/budget-card.tsx
index 3f59ed0..0f880e5 100644
--- a/components/orcamentos/budget-card.tsx
+++ b/components/orcamentos/budget-card.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { RiDeleteBin5Line, RiPencilLine } from "@remixicon/react";
-import { CategoryIcon } from "@/components/categorias/category-icon";
+import { CategoryIconBadge } from "@/components/categorias/category-icon-badge";
 import MoneyValues from "@/components/money-values";
 import { Card, CardContent, CardFooter } from "@/components/ui/card";
 import { Progress } from "@/components/ui/progress";
@@ -10,6 +10,7 @@ import type { Budget } from "./types";
 
 interface BudgetCardProps {
 	budget: Budget;
+	colorIndex: number;
 	periodLabel: string;
 	onEdit: (budget: Budget) => void;
 	onRemove: (budget: Budget) => void;
@@ -28,6 +29,7 @@ const formatCategoryName = (budget: Budget) =>
 
 export function BudgetCard({
 	budget,
+	colorIndex,
 	periodLabel,
 	onEdit,
 	onRemove,
@@ -41,12 +43,12 @@ export function BudgetCard({
 		<Card className="flex h-full flex-col">
 			<CardContent className="flex h-full flex-col gap-4">
 				<div className="flex items-start gap-3">
-					<span className="flex size-10 shrink-0 items-center justify-center text-primary">
-						<CategoryIcon
-							name={budget.category?.icon ?? undefined}
-							className="size-6"
-						/>
-					</span>
+					<CategoryIconBadge
+						icon={budget.category?.icon ?? undefined}
+						name={formatCategoryName(budget)}
+						colorIndex={colorIndex}
+						size="lg"
+					/>
 					<div className="space-y-1">
 						<h3 className="text-base font-semibold leading-tight">
 							{formatCategoryName(budget)}
diff --git a/components/orcamentos/budgets-page.tsx b/components/orcamentos/budgets-page.tsx
index e12682a..eff1828 100644
--- a/components/orcamentos/budgets-page.tsx
+++ b/components/orcamentos/budgets-page.tsx
@@ -129,10 +129,11 @@ export function BudgetsPage({
 
 				{hasBudgets ? (
 					<div className="grid gap-4 sm:grid-cols-2 xl:grid-cols-3">
-						{budgets.map((budget) => (
+						{budgets.map((budget, index) => (
 							<BudgetCard
 								key={budget.id}
 								budget={budget}
+								colorIndex={index}
 								periodLabel={periodLabel}
 								onEdit={handleEdit}
 								onRemove={handleRemoveRequest}
diff --git a/components/relatorios/cartoes/card-category-breakdown.tsx b/components/relatorios/cartoes/card-category-breakdown.tsx
index 02a0d03..d863a36 100644
--- a/components/relatorios/cartoes/card-category-breakdown.tsx
+++ b/components/relatorios/cartoes/card-category-breakdown.tsx
@@ -1,17 +1,12 @@
 "use client";
 
 import { RiPieChartLine } from "@remixicon/react";
+import { CategoryIconBadge } from "@/components/categorias/category-icon-badge";
 import MoneyValues from "@/components/money-values";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Progress } from "@/components/ui/progress";
 import { WidgetEmptyState } from "@/components/widget-empty-state";
 import type { CardDetailData } from "@/lib/relatorios/cartoes-report";
-import {
-	buildCategoryInitials,
-	getCategoryBgColor,
-	getCategoryColor,
-} from "@/lib/utils/category-colors";
-import { getIconComponent } from "@/lib/utils/icons";
 import { title_font } from "@/public/fonts/font_index";
 
 type CardCategoryBreakdownProps = {
@@ -56,64 +51,45 @@ export function CardCategoryBreakdown({ data }: CardCategoryBreakdownProps) {
 
 			<CardContent className="pt-0">
 				<div className="flex flex-col">
-					{data.map((category, index) => {
-						const IconComponent = category.icon
-							? getIconComponent(category.icon)
-							: null;
-						const color = getCategoryColor(index);
-						const bgColor = getCategoryBgColor(index);
-						const initials = buildCategoryInitials(category.name);
+					{data.map((category, index) => (
+						<div
+							key={category.id}
+							className="flex flex-col py-2 border-b border-dashed last:border-0"
+						>
+							<div className="flex items-center justify-between gap-3">
+								<div className="flex min-w-0 flex-1 items-center gap-2">
+									<CategoryIconBadge
+										icon={category.icon}
+										name={category.name}
+										colorIndex={index}
+									/>
 
-						return (
-							<div
-								key={category.id}
-								className="flex flex-col py-2 border-b border-dashed last:border-0"
-							>
-								<div className="flex items-center justify-between gap-3">
-									<div className="flex min-w-0 flex-1 items-center gap-2">
-										<div
-											className="flex size-10 shrink-0 items-center justify-center overflow-hidden rounded-lg"
-											style={{ backgroundColor: bgColor }}
-										>
-											{IconComponent ? (
-												<IconComponent className="size-4" style={{ color }} />
-											) : (
-												<span
-													className="text-xs font-semibold uppercase"
-													style={{ color }}
-												>
-													{initials}
-												</span>
-											)}
-										</div>
-
-										{/* Name and percentage */}
-										<div className="min-w-0 flex-1">
-											<span className="text-sm font-medium truncate block">
-												{category.name}
-											</span>
-											<span className="text-xs text-muted-foreground">
-												{category.percent.toFixed(0)}% do total
-											</span>
-										</div>
-									</div>
-
-									{/* Value */}
-									<div className="flex shrink-0 flex-col items-end">
-										<MoneyValues
-											className="text-foreground"
-											amount={category.amount}
-										/>
+									{/* Name and percentage */}
+									<div className="min-w-0 flex-1">
+										<span className="text-sm font-medium truncate block">
+											{category.name}
+										</span>
+										<span className="text-xs text-muted-foreground">
+											{category.percent.toFixed(0)}% do total
+										</span>
 									</div>
 								</div>
 
-								{/* Progress bar */}
-								<div className="ml-12 mt-1.5">
-									<Progress className="h-1.5" value={category.percent} />
+								{/* Value */}
+								<div className="flex shrink-0 flex-col items-end">
+									<MoneyValues
+										className="text-foreground"
+										amount={category.amount}
+									/>
 								</div>
 							</div>
-						);
-					})}
+
+							{/* Progress bar */}
+							<div className="ml-11 mt-1.5">
+								<Progress className="h-1.5" value={category.percent} />
+							</div>
+						</div>
+					))}
 				</div>
 			</CardContent>
 		</Card>
diff --git a/components/relatorios/cartoes/card-top-expenses.tsx b/components/relatorios/cartoes/card-top-expenses.tsx
index 8194c52..7536b42 100644
--- a/components/relatorios/cartoes/card-top-expenses.tsx
+++ b/components/relatorios/cartoes/card-top-expenses.tsx
@@ -60,7 +60,7 @@ export function CardTopExpenses({ data }: CardTopExpensesProps) {
 							<div className="flex items-center justify-between gap-3">
 								<div className="flex min-w-0 flex-1 items-center gap-2">
 									{/* Rank number */}
-									<div className="flex size-10 shrink-0 items-center justify-center overflow-hidden rounded-lg bg-muted">
+									<div className="flex size-9 shrink-0 items-center justify-center overflow-hidden rounded-lg bg-muted">
 										<span className="text-sm font-semibold text-muted-foreground">
 											{index + 1}
 										</span>
diff --git a/components/relatorios/cartoes/cards-overview.tsx b/components/relatorios/cartoes/cards-overview.tsx
index 5f0f156..c4f71f2 100644
--- a/components/relatorios/cartoes/cards-overview.tsx
+++ b/components/relatorios/cartoes/cards-overview.tsx
@@ -67,7 +67,7 @@ export function CardsOverview({ data }: CardsOverviewProps) {
 		const params = new URLSearchParams();
 		if (periodoParam) params.set("periodo", periodoParam);
 		params.set("cartao", cardId);
-		return `/relatorios/cartoes?${params.toString()}`;
+		return `/relatorios/uso-cartoes?${params.toString()}`;
 	};
 
 	const summaryCards = [
@@ -140,7 +140,7 @@ export function CardsOverview({ data }: CardsOverviewProps) {
 											alt={card.name}
 											width={32}
 											height={32}
-											className="rounded object-contain"
+											className="rounded-sm object-contain"
 										/>
 									) : (
 										<RiBankCard2Line className="size-5 text-muted-foreground" />
diff --git a/components/relatorios/category-cell.tsx b/components/relatorios/category-cell.tsx
index 94fe252..dc9ec96 100644
--- a/components/relatorios/category-cell.tsx
+++ b/components/relatorios/category-cell.tsx
@@ -1,6 +1,11 @@
 "use client";
 
 import { RiArrowDownLine, RiArrowUpLine } from "@remixicon/react";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "@/components/ui/tooltip";
 import { formatCurrency, formatPercentageChange } from "@/lib/relatorios/utils";
 import { cn } from "@/lib/utils/ui";
 
@@ -22,25 +27,55 @@ export function CategoryCell({
 			? ((value - previousValue) / previousValue) * 100
 			: null;
 
+	const absoluteChange = !isFirstMonth ? value - previousValue : null;
+
 	const isIncrease = percentageChange !== null && percentageChange > 0;
 	const isDecrease = percentageChange !== null && percentageChange < 0;
 
 	return (
-		<div className="flex flex-col items-end gap-0.5 min-h-9">
-			<span className="font-medium">{formatCurrency(value)}</span>
-			{!isFirstMonth && percentageChange !== null && (
-				<div
-					className={cn(
-						"flex items-center gap-0.5 text-xs",
-						isIncrease && "text-red-600 dark:text-red-400",
-						isDecrease && "text-green-600 dark:text-green-400",
+		<Tooltip>
+			<TooltipTrigger asChild>
+				<div className="flex flex-col items-end gap-0.5 min-h-9 justify-center cursor-default px-4 py-2">
+					<span className="font-medium">{formatCurrency(value)}</span>
+					{!isFirstMonth && percentageChange !== null && (
+						<div
+							className={cn(
+								"flex items-center gap-0.5 text-xs",
+								isIncrease && "text-red-600 dark:text-red-400",
+								isDecrease && "text-green-600 dark:text-green-400",
+							)}
+						>
+							{isIncrease && <RiArrowUpLine className="h-3 w-3" />}
+							{isDecrease && <RiArrowDownLine className="h-3 w-3" />}
+							<span>{formatPercentageChange(percentageChange)}</span>
+						</div>
 					)}
-				>
-					{isIncrease && <RiArrowUpLine className="h-3 w-3" />}
-					{isDecrease && <RiArrowDownLine className="h-3 w-3" />}
-					<span>{formatPercentageChange(percentageChange)}</span>
 				</div>
-			)}
-		</div>
+			</TooltipTrigger>
+			<TooltipContent side="top" className="text-xs">
+				<div className="flex flex-col gap-1">
+					<div className="font-medium">{formatCurrency(value)}</div>
+					{!isFirstMonth && absoluteChange !== null && (
+						<>
+							<div className="font-bold">
+								Mês anterior: {formatCurrency(previousValue)}
+							</div>
+							<div
+								className={cn(
+									"font-medium",
+									isIncrease && "text-red-500",
+									isDecrease && "text-green-500",
+								)}
+							>
+								Diferença:{" "}
+								{absoluteChange >= 0
+									? `+${formatCurrency(absoluteChange)}`
+									: formatCurrency(absoluteChange)}
+							</div>
+						</>
+					)}
+				</div>
+			</TooltipContent>
+		</Tooltip>
 	);
 }
diff --git a/components/relatorios/category-report-cards.tsx b/components/relatorios/category-report-cards.tsx
index d470857..af37930 100644
--- a/components/relatorios/category-report-cards.tsx
+++ b/components/relatorios/category-report-cards.tsx
@@ -1,63 +1,161 @@
 "use client";
 
-import { TypeBadge } from "@/components/type-badge";
+import Link from "next/link";
+import { useMemo } from "react";
+import { CategoryIconBadge } from "@/components/categorias/category-icon-badge";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import type { CategoryReportData } from "@/lib/relatorios/types";
+import type {
+	CategoryReportData,
+	CategoryReportItem,
+} from "@/lib/relatorios/types";
 import { formatCurrency, formatPeriodLabel } from "@/lib/relatorios/utils";
-import { getIconComponent } from "@/lib/utils/icons";
+import { formatPeriodForUrl } from "@/lib/utils/period";
 import { CategoryCell } from "./category-cell";
 
 interface CategoryReportCardsProps {
 	data: CategoryReportData;
 }
 
-export function CategoryReportCards({ data }: CategoryReportCardsProps) {
-	const { categories, periods } = data;
+interface CategoryCardProps {
+	category: CategoryReportItem;
+	periods: string[];
+	colorIndex: number;
+}
+
+function CategoryCard({ category, periods, colorIndex }: CategoryCardProps) {
+	const periodParam = formatPeriodForUrl(periods[periods.length - 1]);
 
 	return (
-		<div className="md:hidden space-y-4">
-			{categories.map((category) => {
-				const Icon = category.icon ? getIconComponent(category.icon) : null;
+		<Card>
+			<CardHeader className="pb-3">
+				<CardTitle className="flex items-center gap-3">
+					<CategoryIconBadge
+						icon={category.icon}
+						name={category.name}
+						colorIndex={colorIndex}
+					/>
+					<Link
+						href={`/categorias/${category.categoryId}?periodo=${periodParam}`}
+						className="flex-1 truncate hover:underline underline-offset-2"
+					>
+						{category.name}
+					</Link>
+				</CardTitle>
+			</CardHeader>
+			<CardContent className="space-y-2">
+				{periods.map((period, periodIndex) => {
+					const monthData = category.monthlyData.get(period);
+					const isFirstMonth = periodIndex === 0;
 
-				return (
-					<Card key={category.categoryId}>
-						<CardHeader>
-							<CardTitle className="flex items-center gap-2">
-								{Icon && <Icon className="h-5 w-5 shrink-0" />}
-								<span className="flex-1 truncate">{category.name}</span>
-								<TypeBadge type={category.type} />
-							</CardTitle>
-						</CardHeader>
-						<CardContent className="space-y-2">
-							{periods.map((period, periodIndex) => {
-								const monthData = category.monthlyData.get(period);
-								const isFirstMonth = periodIndex === 0;
+					return (
+						<div
+							key={period}
+							className="flex items-center justify-between py-2 border-b last:border-b-0"
+						>
+							<span className="text-sm text-muted-foreground">
+								{formatPeriodLabel(period)}
+							</span>
+							<CategoryCell
+								value={monthData?.amount ?? 0}
+								previousValue={monthData?.previousAmount ?? 0}
+								categoryType={category.type}
+								isFirstMonth={isFirstMonth}
+							/>
+						</div>
+					);
+				})}
+				<div className="flex items-center justify-between pt-2 font-semibold">
+					<span>Total</span>
+					<span>{formatCurrency(category.total)}</span>
+				</div>
+			</CardContent>
+		</Card>
+	);
+}
 
-								return (
-									<div
-										key={period}
-										className="flex items-center justify-between py-2 border-b last:border-b-0"
-									>
-										<span className="text-sm text-muted-foreground">
-											{formatPeriodLabel(period)}
-										</span>
-										<CategoryCell
-											value={monthData?.amount ?? 0}
-											previousValue={monthData?.previousAmount ?? 0}
-											categoryType={category.type}
-											isFirstMonth={isFirstMonth}
-										/>
-									</div>
-								);
-							})}
-							<div className="flex items-center justify-between pt-2 font-semibold">
-								<span>Total</span>
-								<span>{formatCurrency(category.total)}</span>
-							</div>
-						</CardContent>
-					</Card>
-				);
-			})}
+interface SectionProps {
+	title: string;
+	categories: CategoryReportItem[];
+	periods: string[];
+	colorIndexOffset: number;
+	total: number;
+}
+
+function Section({
+	title,
+	categories,
+	periods,
+	colorIndexOffset,
+	total,
+}: SectionProps) {
+	if (categories.length === 0) {
+		return null;
+	}
+
+	return (
+		<div className="space-y-3">
+			<div className="flex items-center justify-between">
+				<span className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+					{title}
+				</span>
+				<span className="text-sm text-muted-foreground">
+					{formatCurrency(total)}
+				</span>
+			</div>
+			{categories.map((category, index) => (
+				<CategoryCard
+					key={category.categoryId}
+					category={category}
+					periods={periods}
+					colorIndex={colorIndexOffset + index}
+				/>
+			))}
+		</div>
+	);
+}
+
+export function CategoryReportCards({ data }: CategoryReportCardsProps) {
+	const { categories, periods } = data;
+
+	// Separate categories by type and calculate totals
+	const { receitas, despesas, receitasTotal, despesasTotal } = useMemo(() => {
+		const receitas: CategoryReportItem[] = [];
+		const despesas: CategoryReportItem[] = [];
+		let receitasTotal = 0;
+		let despesasTotal = 0;
+
+		for (const category of categories) {
+			if (category.type === "receita") {
+				receitas.push(category);
+				receitasTotal += category.total;
+			} else {
+				despesas.push(category);
+				despesasTotal += category.total;
+			}
+		}
+
+		return { receitas, despesas, receitasTotal, despesasTotal };
+	}, [categories]);
+
+	return (
+		<div className="md:hidden space-y-6">
+			{/* Despesas Section */}
+			<Section
+				title="Despesas"
+				categories={despesas}
+				periods={periods}
+				colorIndexOffset={0}
+				total={despesasTotal}
+			/>
+
+			{/* Receitas Section */}
+			<Section
+				title="Receitas"
+				categories={receitas}
+				periods={periods}
+				colorIndexOffset={despesas.length}
+				total={receitasTotal}
+			/>
 		</div>
 	);
 }
diff --git a/components/relatorios/category-report-table.tsx b/components/relatorios/category-report-table.tsx
index c5b3803..6fae5d8 100644
--- a/components/relatorios/category-report-table.tsx
+++ b/components/relatorios/category-report-table.tsx
@@ -1,110 +1,49 @@
 "use client";
 
-import {
-	Table,
-	TableBody,
-	TableCell,
-	TableFooter,
-	TableHead,
-	TableHeader,
-	TableRow,
-} from "@/components/ui/table";
-import type { CategoryReportData } from "@/lib/relatorios/types";
-import { formatCurrency, formatPeriodLabel } from "@/lib/relatorios/utils";
-import { getIconComponent } from "@/lib/utils/icons";
-import DotIcon from "../dot-icon";
-import { Card } from "../ui/card";
-import { CategoryCell } from "./category-cell";
+import { useMemo } from "react";
+import type { CategoryReportData, CategoryReportItem } from "@/lib/relatorios/types";
+import { CategoryTable } from "./category-table";
 
 interface CategoryReportTableProps {
 	data: CategoryReportData;
 }
 
 export function CategoryReportTable({ data }: CategoryReportTableProps) {
-	const { categories, periods, totals, grandTotal } = data;
+	const { categories, periods } = data;
+
+	// Separate categories by type
+	const { receitas, despesas } = useMemo(() => {
+		const receitas: CategoryReportItem[] = [];
+		const despesas: CategoryReportItem[] = [];
+
+		for (const category of categories) {
+			if (category.type === "receita") {
+				receitas.push(category);
+			} else {
+				despesas.push(category);
+			}
+		}
+
+		return { receitas, despesas };
+	}, [categories]);
 
 	return (
-		<Card className="px-6 py-4">
-			<Table>
-				<TableHeader>
-					<TableRow>
-						<TableHead className="w-[280px] min-w-[280px] font-bold">
-							Categoria
-						</TableHead>
-						{periods.map((period) => (
-							<TableHead
-								key={period}
-								className="text-right min-w-[120px] font-bold"
-							>
-								{formatPeriodLabel(period)}
-							</TableHead>
-						))}
-						<TableHead className="text-right min-w-[120px] font-bold">
-							Total
-						</TableHead>
-					</TableRow>
-				</TableHeader>
+		<div className="flex flex-col gap-6">
+			{/* Despesas Table */}
+			<CategoryTable
+				title="Despesas"
+				categories={despesas}
+				periods={periods}
+				colorIndexOffset={0}
+			/>
 
-				<TableBody>
-					{categories.map((category) => {
-						const Icon = category.icon ? getIconComponent(category.icon) : null;
-						const isReceita = category.type.toLowerCase() === "receita";
-						const dotColor = isReceita
-							? "bg-green-600 dark:bg-green-400"
-							: "bg-red-600 dark:bg-red-400";
-
-						return (
-							<TableRow key={category.categoryId}>
-								<TableCell>
-									<div className="flex items-center gap-2">
-										<DotIcon bg_dot={dotColor} />
-										{Icon && <Icon className="h-4 w-4 shrink-0" />}
-										<span className="font-bold truncate">{category.name}</span>
-									</div>
-								</TableCell>
-								{periods.map((period, periodIndex) => {
-									const monthData = category.monthlyData.get(period);
-									const isFirstMonth = periodIndex === 0;
-
-									return (
-										<TableCell key={period} className="text-right">
-											<CategoryCell
-												value={monthData?.amount ?? 0}
-												previousValue={monthData?.previousAmount ?? 0}
-												categoryType={category.type}
-												isFirstMonth={isFirstMonth}
-											/>
-										</TableCell>
-									);
-								})}
-								<TableCell className="text-right font-semibold">
-									{formatCurrency(category.total)}
-								</TableCell>
-							</TableRow>
-						);
-					})}
-				</TableBody>
-
-				<TableFooter>
-					<TableRow>
-						<TableCell className="min-h-[2.5rem]">Total Geral</TableCell>
-						{periods.map((period) => {
-							const periodTotal = totals.get(period) ?? 0;
-							return (
-								<TableCell
-									key={period}
-									className="text-right font-semibold min-h-8"
-								>
-									{formatCurrency(periodTotal)}
-								</TableCell>
-							);
-						})}
-						<TableCell className="text-right font-semibold min-h-8">
-							{formatCurrency(grandTotal)}
-						</TableCell>
-					</TableRow>
-				</TableFooter>
-			</Table>
-		</Card>
+			{/* Receitas Table */}
+			<CategoryTable
+				title="Receitas"
+				categories={receitas}
+				periods={periods}
+				colorIndexOffset={despesas.length}
+			/>
+		</div>
 	);
 }
diff --git a/components/relatorios/category-table.tsx b/components/relatorios/category-table.tsx
new file mode 100644
index 0000000..6a88464
--- /dev/null
+++ b/components/relatorios/category-table.tsx
@@ -0,0 +1,150 @@
+"use client";
+
+import Link from "next/link";
+import { useMemo } from "react";
+import { CategoryIconBadge } from "@/components/categorias/category-icon-badge";
+import {
+	Table,
+	TableBody,
+	TableCell,
+	TableFooter,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "@/components/ui/table";
+import type { CategoryReportItem } from "@/lib/relatorios/types";
+import { formatCurrency, formatPeriodLabel } from "@/lib/relatorios/utils";
+import { formatPeriodForUrl } from "@/lib/utils/period";
+import DotIcon from "../dot-icon";
+import { Card } from "../ui/card";
+import { CategoryCell } from "./category-cell";
+
+export interface CategoryTableProps {
+	title: string;
+	categories: CategoryReportItem[];
+	periods: string[];
+	colorIndexOffset: number;
+}
+
+export function CategoryTable({
+	title,
+	categories,
+	periods,
+	colorIndexOffset,
+}: CategoryTableProps) {
+	// Calculate section totals
+	const sectionTotals = useMemo(() => {
+		const totalsMap = new Map<string, number>();
+		let grandTotal = 0;
+
+		for (const category of categories) {
+			grandTotal += category.total;
+			for (const period of periods) {
+				const monthData = category.monthlyData.get(period);
+				const current = totalsMap.get(period) ?? 0;
+				totalsMap.set(period, current + (monthData?.amount ?? 0));
+			}
+		}
+
+		return { totalsMap, grandTotal };
+	}, [categories, periods]);
+
+	if (categories.length === 0) {
+		return null;
+	}
+
+	return (
+		<Card className="px-6 py-4">
+			<Table>
+				<TableHeader>
+					<TableRow>
+						<TableHead className="w-[280px] min-w-[280px] font-bold">
+							Categoria
+						</TableHead>
+						{periods.map((period) => (
+							<TableHead
+								key={period}
+								className="text-right min-w-[120px] font-bold"
+							>
+								{formatPeriodLabel(period)}
+							</TableHead>
+						))}
+						<TableHead className="text-right min-w-[120px] font-bold">
+							Total
+						</TableHead>
+					</TableRow>
+				</TableHeader>
+
+				<TableBody>
+					{categories.map((category, index) => {
+						const colorIndex = colorIndexOffset + index;
+						const periodParam = formatPeriodForUrl(periods[periods.length - 1]);
+
+						return (
+							<TableRow key={category.categoryId}>
+								<TableCell>
+									<div className="flex items-center gap-2">
+										<DotIcon
+											color={
+												category.type === "receita"
+													? "bg-green-600"
+													: "bg-red-600"
+											}
+										/>
+
+										<CategoryIconBadge
+											icon={category.icon}
+											name={category.name}
+											colorIndex={colorIndex}
+										/>
+										<Link
+											href={`/categorias/${category.categoryId}?periodo=${periodParam}`}
+											className="flex items-center gap-1.5 truncate hover:underline underline-offset-2"
+										>
+											{category.name}
+										</Link>
+									</div>
+								</TableCell>
+								{periods.map((period, periodIndex) => {
+									const monthData = category.monthlyData.get(period);
+									const isFirstMonth = periodIndex === 0;
+
+									return (
+										<TableCell key={period} className="text-right p-0">
+											<CategoryCell
+												value={monthData?.amount ?? 0}
+												previousValue={monthData?.previousAmount ?? 0}
+												categoryType={category.type}
+												isFirstMonth={isFirstMonth}
+											/>
+										</TableCell>
+									);
+								})}
+								<TableCell className="text-right font-semibold">
+									{formatCurrency(category.total)}
+								</TableCell>
+							</TableRow>
+						);
+					})}
+				</TableBody>
+
+				<TableFooter>
+					<TableRow>
+						<TableCell className="font-bold">Total</TableCell>
+						{periods.map((period) => {
+							const periodTotal = sectionTotals.totalsMap.get(period) ?? 0;
+							return (
+								<TableCell key={period} className="text-right font-semibold">
+									{formatCurrency(periodTotal)}
+								</TableCell>
+							);
+						})}
+						<TableCell className="text-right font-semibold">
+							{formatCurrency(sectionTotals.grandTotal)}
+						</TableCell>
+					</TableRow>
+				</TableFooter>
+			</Table>
+		</Card>
+	);
+}
diff --git a/components/relatorios/index.ts b/components/relatorios/index.ts
index 28b3b0f..42f6a4f 100644
--- a/components/relatorios/index.ts
+++ b/components/relatorios/index.ts
@@ -5,6 +5,7 @@ export { CategoryReportExport } from "./category-report-export";
 export { CategoryReportFilters } from "./category-report-filters";
 export { CategoryReportPage } from "./category-report-page";
 export { CategoryReportTable } from "./category-report-table";
+export { CategoryTable } from "./category-table";
 export type {
 	CategoryOption,
 	CategoryReportFiltersProps,
diff --git a/components/sidebar/nav-link.tsx b/components/sidebar/nav-link.tsx
index 2c9a15d..f1757a7 100644
--- a/components/sidebar/nav-link.tsx
+++ b/components/sidebar/nav-link.tsx
@@ -184,12 +184,12 @@ export function createSidebarNavData(
 					},
 					{
 						title: "Tendências",
-						url: "/relatorios/categorias",
+						url: "/relatorios/tendencias",
 						icon: RiFileChartLine,
 					},
 					{
 						title: "Uso de Cartões",
-						url: "/relatorios/cartoes",
+						url: "/relatorios/uso-cartoes",
 						icon: RiBankCard2Line,
 					},
 				],
diff --git a/components/top-estabelecimentos/top-categories.tsx b/components/top-estabelecimentos/top-categories.tsx
index 93ace64..aae24dc 100644
--- a/components/top-estabelecimentos/top-categories.tsx
+++ b/components/top-estabelecimentos/top-categories.tsx
@@ -1,16 +1,11 @@
 "use client";
 
 import { RiPriceTag3Line } from "@remixicon/react";
+import { CategoryIconBadge } from "@/components/categorias/category-icon-badge";
 import MoneyValues from "@/components/money-values";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { WidgetEmptyState } from "@/components/widget-empty-state";
 import type { TopEstabelecimentosData } from "@/lib/top-estabelecimentos/fetch-data";
-import {
-	buildCategoryInitials,
-	getCategoryBgColor,
-	getCategoryColor,
-} from "@/lib/utils/category-colors";
-import { getIconComponent } from "@/lib/utils/icons";
 import { title_font } from "@/public/fonts/font_index";
 import { Progress } from "../ui/progress";
 
@@ -56,12 +51,6 @@ export function TopCategories({ categories }: TopCategoriesProps) {
 			<CardContent className="pt-0">
 				<div className="flex flex-col">
 					{categories.map((category, index) => {
-						const IconComponent = category.icon
-							? getIconComponent(category.icon)
-							: null;
-						const color = getCategoryColor(index);
-						const bgColor = getCategoryBgColor(index);
-						const initials = buildCategoryInitials(category.name);
 						const percent =
 							totalAmount > 0 ? (category.totalAmount / totalAmount) * 100 : 0;
 
@@ -72,21 +61,11 @@ export function TopCategories({ categories }: TopCategoriesProps) {
 							>
 								<div className="flex items-center justify-between gap-3">
 									<div className="flex min-w-0 flex-1 items-center gap-2">
-										<div
-											className="flex size-10 shrink-0 items-center justify-center overflow-hidden rounded-lg"
-											style={{ backgroundColor: bgColor }}
-										>
-											{IconComponent ? (
-												<IconComponent className="size-4" style={{ color }} />
-											) : (
-												<span
-													className="text-xs font-semibold uppercase"
-													style={{ color }}
-												>
-													{initials}
-												</span>
-											)}
-										</div>
+										<CategoryIconBadge
+											icon={category.icon}
+											name={category.name}
+											colorIndex={index}
+										/>
 
 										{/* Name and percentage */}
 										<div className="min-w-0 flex-1">
@@ -110,7 +89,7 @@ export function TopCategories({ categories }: TopCategoriesProps) {
 								</div>
 
 								{/* Progress bar */}
-								<div className="ml-12 mt-1.5">
+								<div className="ml-11 mt-1.5">
 									<Progress className="h-1.5" value={percent} />
 								</div>
 							</div>