diff --git a/src/App.tsx b/src/App.tsx
index 71315074..508fc342 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -52,9 +52,9 @@ const App = () => {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
 
   return (
-    <QueryClientProvider client={queryClient}>
-      <ThemeProvider attribute="class" defaultTheme="dark" enableSystem>
-        <ErrorBoundary>
+    <ErrorBoundary>
+      <QueryClientProvider client={queryClient}>
+        <ThemeProvider attribute="class" defaultTheme="dark" enableSystem>
           <TooltipProvider>
             <Toaster />
             <Sonner />
@@ -120,9 +120,9 @@ const App = () => {
               </div>
             </BrowserRouter>
           </TooltipProvider>
-        </ErrorBoundary>
-      </ThemeProvider>
-    </QueryClientProvider>
+        </ThemeProvider>
+      </QueryClientProvider>
+    </ErrorBoundary>
   );
 };
 
diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
index 40905a6b..a9c659ad 100644
--- a/src/components/ErrorBoundary.tsx
+++ b/src/components/ErrorBoundary.tsx
@@ -85,12 +85,16 @@ class ErrorBoundary extends Component<Props, State> {
                 <RefreshCw className="w-4 h-4 mr-2" />
                 Intentar de nuevo
               </Button>
-              <Link to="/">
-                <Button variant="outline" className="w-full">
-                  <Home className="w-4 h-4 mr-2" />
-                  Ir al inicio
-                </Button>
-              </Link>
+              <Button 
+                variant="outline" 
+                className="w-full"
+                onClick={() => {
+                  window.location.href = '/';
+                }}
+              >
+                <Home className="w-4 h-4 mr-2" />
+                Ir al inicio
+              </Button>
             </div>
           </div>
         </div>
diff --git a/src/components/layout/MenuSheet.tsx b/src/components/layout/MenuSheet.tsx
index 83e01461..33073643 100644
--- a/src/components/layout/MenuSheet.tsx
+++ b/src/components/layout/MenuSheet.tsx
@@ -88,9 +88,10 @@ const MenuSheet = memo(({ isOpen, onClose }: MenuSheetProps) => {
 
         <div className="p-4 space-y-2">
           {menuItems.map((item, index) => {
+            const Icon = item.icon;
             const content = (
               <>
-                <span className="text-muted-foreground">{item.icon}</span>
+                <span className="text-muted-foreground"><Icon className="w-5 h-5" /></span>
                 <span className="font-medium text-foreground">{item.label}</span>
               </>
             );