diff --git a/shop/components/order-wizard.tsx b/shop/components/order-wizard.tsx
index 142f339..b4cdf48 100644
--- a/shop/components/order-wizard.tsx
+++ b/shop/components/order-wizard.tsx
@@ -288,7 +288,7 @@ export function OrderWizard({
                     variant={customerMode === 'select' ? 'default' : 'ghost'}
                     size="sm"
                     onClick={() => setCustomerMode('select')}
-                    className="gap-2 text-white"
+                    className={`gap-2 ${customerMode === 'select' ? '' : 'text-white'}`}
                   >
                     <Building2 className="w-4 h-4" /> Bestandskunde wählen
                   </Button>
@@ -296,7 +296,7 @@ export function OrderWizard({
                     variant={customerMode === 'create' ? 'default' : 'ghost'}
                     size="sm"
                     onClick={() => setCustomerMode('create')}
-                    className="gap-2 text-white"
+                    className={`gap-2 ${customerMode === 'create' ? '' : 'text-white'}`}
                   >
                     <UserPlus className="w-4 h-4" /> Neuen Kunden anlegen
                   </Button>
@@ -376,7 +376,7 @@ export function OrderWizard({
                       <Button
                         onClick={handleCreateCustomer}
                         disabled={isCreatingCustomer || !newCustomerForm.company_name.trim()}
-                        className="gap-2 text-white"
+                        className="gap-2"
                       >
                         {isCreatingCustomer ? <Loader2 className="w-4 h-4 animate-spin" /> : <UserPlus className="w-4 h-4" />}
                         Kunden speichern & auswählen
@@ -390,7 +390,6 @@ export function OrderWizard({
               </CardContent>
               <CardFooter className="flex justify-end border-t border-white/10 pt-6">
                 <Button
-                  className="text-white"
                   onClick={nextStep}
                   disabled={customerMode === 'select' && endCustomers.filter(c => !c.is_anonymized).length > 0 && !selectedEndCustomerId}
                 >
@@ -481,7 +480,7 @@ export function OrderWizard({
                 <Button variant="ghost" className="text-white" onClick={prevStep}>
                   <ChevronLeft className="mr-2 w-4 h-4" /> Zurück
                 </Button>
-                <Button className="text-white" onClick={nextStep}>
+                <Button onClick={nextStep}>
                   Weiter zur Software <ChevronRight className="ml-2 w-4 h-4" />
                 </Button>
               </CardFooter>
@@ -747,7 +746,7 @@ export function OrderWizard({
                   </CardContent>
                   <CardFooter className="flex flex-col gap-2">
                     <Button
-                      className="w-full h-12 text-lg text-white"
+                      className="w-full h-12 text-lg"
                       onClick={nextStep}
                       disabled={!allCategoriesFilled}
                     >
@@ -879,7 +878,7 @@ export function OrderWizard({
               </CardContent>
               <CardFooter className="flex flex-col gap-4">
                 <Button
-                  className="w-full h-14 text-xl font-bold bg-primary hover:bg-primary/90 text-white"
+                  className="w-full h-14 text-xl font-bold bg-primary hover:bg-primary/90"
                   onClick={handleSubmit}
                   disabled={isSubmitting}
                 >