diff --git a/src/components/admin/machines/admin-machines-overview.tsx b/src/components/admin/machines/admin-machines-overview.tsx
index 2020525..a12a0cc 100644
--- a/src/components/admin/machines/admin-machines-overview.tsx
+++ b/src/components/admin/machines/admin-machines-overview.tsx
@@ -367,7 +367,7 @@ function MachineStatusBadge({ status }: { status?: string | null }) {
 
   const isOnline = s === "online"
   return (
-    <Badge className={cn("inline-flex h-9 items-center gap-2 rounded-full border border-slate-200 px-3 text-sm font-semibold", className)}>
+    <Badge className={cn("inline-flex h-9 items-center gap-3 rounded-full border border-slate-200 px-3 text-sm font-semibold", className)}>
       <span className="relative inline-flex items-center">
         <span className={cn("size-2 rounded-full", colorClass)} />
         {isOnline ? (
@@ -556,12 +556,7 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
                 </div>
                 <MachineStatusBadge status={machine.status} />
               </div>
-              {String(machine.status ?? "").toLowerCase() === "online" ? (
-                <div className="relative h-2 w-2">
-                  <span className="absolute left-1/2 top-1/2 size-2 -translate-x-1/2 -translate-y-1/2 rounded-full bg-emerald-500" />
-                  <span className="absolute left-1/2 top-1/2 size-4 -translate-x-1/2 -translate-y-1/2 rounded-full bg-emerald-400/30 animate-ping" />
-                </div>
-              ) : null}
+              {/* ping integrado na badge de status */}
               <div className="flex flex-wrap items-center gap-2">
                 <Badge variant="outline" className="border-slate-300 bg-slate-100 text-xs font-medium text-slate-700">
                   {machine.osName ?? "SO desconhecido"} {machine.osVersion ?? ""}
@@ -1229,7 +1224,7 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
 function MachinesGrid({ machines }: { machines: MachinesQueryItem[] }) {
   if (!machines || machines.length === 0) return <EmptyState />
   return (
-    <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+    <div className="grid grid-cols-1 gap-3 [@supports(display:grid)]:grid-cols-[repeat(auto-fit,minmax(280px,1fr))]">
       {machines.map((m) => (
         <MachineCard key={m.id} machine={m} />
       ))}