diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/app/app.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/app/app.tsx
index c69fb84aa..2ce0e6a3a 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/app/app.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/app/app.tsx
@@ -14,7 +14,6 @@ export class App {
 
     constructor(jwt: String) {
         let token = container.resolve(Token)
-        console.log(jwt)
         token.currentToken = jwt
         token.init()
     }
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/main.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/main.tsx
index 938e7b9af..4d0d35e9e 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/main.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/main.tsx
@@ -3,7 +3,7 @@ import "reflect-metadata";
 import * as $ from "jquery";
 import { App } from "./app/app";
 
-let jwt_token: String = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE3NTk2NDkyNDMsImV4cCI6MTc1OTY1Mjg0Mywicm9sZXMiOlsiUk9MRV9BRE1JTiIsIlJPTEVfU0hPUF9PUEVSQVRPUiIsIlJPTEVfVVNFUiIsIlJPTEVfVVNFUiIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9FZGl0IiwiUk9MRV9QU0NfQ29sbGVjdF9Db250YWN0X0FkZCIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9EZWxldGUiLCJST0xFX1BTQ19Db2xsZWN0X0NvbnRhY3RfTG9jayIsIlJPTEVfUFNDX1IyX1NlbmRjbG91ZF9TaG93Il0sInVpZCI6MX0.rTb0nAVWvWkdVhiXeqKaW2xGesOwmLswBD92Ryx1sJ9a1Jlq6EkH0NXyW4quSBV533InhyANeQFITs0mr2d5DDf04MpAd3OENBd3IVQE-_mlMVHNu42-eaxo2xR452hS4yAhKx746xGOnGhw_3gZl07aLgg4qFmb4OYo895XWIM-J-luqy5_3315xINb9Y8P3VTHt-IJ5XPWhpfB7z7QtPCUJuOyJp3nZw6V9bXPiHpcZNG3PELKMEhHyxmjtSOHMfwUhooYKxU21mctQyWTfdiLnKzG4J7nuC3Pgy33_KOoqZZXOO4SyUakFJGZevD25mOzeHCscbTBWMgjjbNK5g";
+let jwt_token: String = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE3NTk3MzQ4NzEsImV4cCI6MTc1OTczODQ3MSwicm9sZXMiOlsiUk9MRV9BRE1JTiIsIlJPTEVfU0hPUF9PUEVSQVRPUiIsIlJPTEVfVVNFUiIsIlJPTEVfVVNFUiIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9FZGl0IiwiUk9MRV9QU0NfQ29sbGVjdF9Db250YWN0X0FkZCIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9EZWxldGUiLCJST0xFX1BTQ19Db2xsZWN0X0NvbnRhY3RfTG9jayIsIlJPTEVfUFNDX1IyX1NlbmRjbG91ZF9TaG93Il0sInVpZCI6MX0.n5IAqcnge4Gh7-XB6KazcT3eFF_H2VZFC_-jgR878svsgcAv5zXFDpLpuS5KZRl_NF1B7e1SZV1dChoOpl6rL0j0Q3dCz76S62nq7imGA0ATj9VJae-Y1DWKRfu1T7nP6ST2gQWK6BpbLKHaVyBi4doEQZr0_0VX05MmIQC1Vci5pUsPqmJ3LRpsdcxZFhN-Vn-s8Rnr8DjTGS4PzX1u1G-UcZvqON39TqaE9PuL8_SvGqtEOj0iNsK0Szp2BPljoAD_f8eM12KyIVhyrbbyO7rYmo-Ob51eoV3tbJcONau20709ShA9PAj1bQsLlZkKEetzdmiKkoXbbIYrID2HvQ";
 let app = new App(jwt_token);
 app.init();
 app.run();
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/BaseComponent.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/BaseComponent.tsx
index 20784c0be..87d133ec3 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/BaseComponent.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/BaseComponent.tsx
@@ -42,9 +42,9 @@ const BaseComponent = (props) => {
 
     return (
         <div className="min-h-screen bg-gradient-to-br from-slate-50 to-slate-100 dark:from-gray-900 dark:to-gray-800 text-gray-900 dark:text-gray-100 antialiased">
-            <div className='container mx-auto px-4 py-6 max-w-7xl'>
+            <div className='w-full px-6 py-4'>
                 {/* Header Section */}
-                <div className="flex items-center justify-between gap-4 mb-6">
+                <div className="flex items-center justify-between gap-4 mb-4">
                     <div className="flex-1">
                         <OrderAliasComponent order={order} />
                     </div>
@@ -54,7 +54,7 @@ const BaseComponent = (props) => {
                 </div>
 
                 {/* Top Bar Section */}
-                <div className="mb-6">
+                <div className="mb-4">
                     <TopBarComponent shop={shop} order={order} change={setShop} />
                 </div>
 
@@ -62,17 +62,17 @@ const BaseComponent = (props) => {
                 { shop.id != 0 && (
                     <>
                         {/* Contact Section */}
-                        <div className="mb-6">
+                        <div className="mb-4">
                             <ContactComponent shop={shop} order={order} />
                         </div>
 
                         {/* Positions Section */}
-                        <div className="mb-6">
+                        <div className="mb-4">
                             <PositionsComponent shop={shop} order={order} />
                         </div>
 
                         {/* Payment & Shipping Row */}
-                        <div className="grid grid-cols-1 lg:grid-cols-2 gap-6 mb-6">
+                        <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 mb-4">
                             <PaymentComponent shop={shop} order={order} />
                             <ShippingComponent shop={shop} order={order} />
                         </div>
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/Button.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/Button.tsx
index e21be4a35..6d64f7ad8 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/Button.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/base/Button.tsx
@@ -3,30 +3,30 @@ import React from 'react'
 
 const Button = ({ type , variant , onClick }) => {
     return (
-        <BaseButton color={variant} pill onClick={onClick}>
-            { type == 1 && 
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon" class="size-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15"></path>
+        <BaseButton color={variant} onClick={onClick} size="sm" className="p-1.5">
+            { type == 1 &&
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" className="w-4 h-4">
+  <path strokeLinecap="round" strokeLinejoin="round" d="M12 4.5v15m7.5-7.5h-15"></path>
 </svg>
             }
-            { type == 2 && 
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon" class="size-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"></path>
+            { type == 2 &&
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" className="w-4 h-4">
+  <path strokeLinecap="round" strokeLinejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"></path>
 </svg>
             }
-            { type == 3 && 
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon" fill="none" class="size-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M6 20.25h12A2.25 2.25 0 0 0 20.25 18V7.5L16.5 3.75H6A2.25 2.25 0 0 0 3.75 6v12A2.25 2.25 0 0 0 6 20.25zm9.75-16.5v5h-9.5v-5zM13 5.5V7m-6.75 4.25h11.5v6.5H6.25Z"></path>
+            { type == 3 &&
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" fill="none" className="w-4 h-4">
+  <path strokeLinecap="round" strokeLinejoin="round" d="M6 20.25h12A2.25 2.25 0 0 0 20.25 18V7.5L16.5 3.75H6A2.25 2.25 0 0 0 3.75 6v12A2.25 2.25 0 0 0 6 20.25zm9.75-16.5v5h-9.5v-5zM13 5.5V7m-6.75 4.25h11.5v6.5H6.25Z"></path>
 </svg>
             }
-            { type == 4 && 
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon" class="size-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"></path>
+            { type == 4 &&
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" className="w-4 h-4">
+  <path strokeLinecap="round" strokeLinejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"></path>
 </svg>
             }
-            { type == 5 && 
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon" class="size-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="m9.75 9.75 4.5 4.5m0-4.5-4.5 4.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"></path>
+            { type == 5 &&
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" className="w-4 h-4">
+  <path strokeLinecap="round" strokeLinejoin="round" d="m9.75 9.75 4.5 4.5m0-4.5-4.5 4.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"></path>
 </svg> }
         </BaseButton>
     );
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/contact/ContactComponent.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/contact/ContactComponent.tsx
index ba9cf158f..4895e89bc 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/contact/ContactComponent.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/contact/ContactComponent.tsx
@@ -33,15 +33,15 @@ const ContactComponent = ({order, shop}) => {
     }
 
     return (
-        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-md p-6 animate-fade-in">
-            <h2 className="text-xl font-semibold mb-4 text-gray-800 dark:text-gray-100 flex items-center gap-2">
+        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-4 animate-fade-in">
+            <h2 className="text-lg font-semibold mb-3 text-gray-800 dark:text-gray-100 flex items-center gap-2">
                 <svg className="w-6 h-6 text-blue-600 dark:text-blue-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
                 </svg>
                 Kontakt & Konto
             </h2>
 
-            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 mb-6">
+            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 mb-4">
                 <div>
                     <ContactSelect
                         order={order}
@@ -58,7 +58,7 @@ const ContactComponent = ({order, shop}) => {
 
             { order.contact.uuid != "" && (
                 <>
-                    <h3 className="text-lg font-medium mb-3 text-gray-700 dark:text-gray-200 flex items-center gap-2">
+                    <h3 className="text-base font-medium mb-2 text-gray-700 dark:text-gray-200 flex items-center gap-2">
                         <svg className="w-5 h-5 text-green-600 dark:text-green-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                             <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z" />
                             <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 11a3 3 0 11-6 0 3 3 0 016 0z" />
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/payment/PaymentComponent.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/payment/PaymentComponent.tsx
index 20ad87205..ad9c9e5da 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/payment/PaymentComponent.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/payment/PaymentComponent.tsx
@@ -44,8 +44,8 @@ const PaymentComponent = ({ shop, order }) => {
     }
 
     return (
-        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-md p-6 animate-fade-in">
-            <h2 className="text-xl font-semibold mb-4 text-gray-800 dark:text-gray-100 flex items-center gap-2">
+        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-4 animate-fade-in">
+            <h2 className="text-lg font-semibold mb-3 text-gray-800 dark:text-gray-100 flex items-center gap-2">
                 <svg className="w-6 h-6 text-emerald-600 dark:text-emerald-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z" />
                 </svg>
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/positions/PositionsComponent.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/positions/PositionsComponent.tsx
index c165d1491..72c883b7a 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/positions/PositionsComponent.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/positions/PositionsComponent.tsx
@@ -43,8 +43,8 @@ const PositionsComponent = ({order, shop, updateOrder}) => {
     }, [positions])
 
     return (
-        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-md p-6 animate-fade-in">
-            <h2 className="text-xl font-semibold mb-4 text-gray-800 dark:text-gray-100 flex items-center gap-2">
+        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-4 animate-fade-in">
+            <h2 className="text-lg font-semibold mb-3 text-gray-800 dark:text-gray-100 flex items-center gap-2">
                 <svg className="w-6 h-6 text-purple-600 dark:text-purple-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01" />
                 </svg>
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/shipping/ShippingComponent.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/shipping/ShippingComponent.tsx
index 5cef670b9..9b6741d98 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/shipping/ShippingComponent.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/shipping/ShippingComponent.tsx
@@ -42,8 +42,8 @@ const ShippingComponent = ({shop, order}) => {
     }
 
     return (
-        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-md p-6 animate-fade-in">
-            <h2 className="text-xl font-semibold mb-4 text-gray-800 dark:text-gray-100 flex items-center gap-2">
+        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-4 animate-fade-in">
+            <h2 className="text-lg font-semibold mb-3 text-gray-800 dark:text-gray-100 flex items-center gap-2">
                 <svg className="w-6 h-6 text-orange-600 dark:text-orange-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4" />
                 </svg>
diff --git a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/topbar/TopBarComponent.tsx b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/topbar/TopBarComponent.tsx
index b7ef16dc2..d77904faa 100644
--- a/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/topbar/TopBarComponent.tsx
+++ b/src/new/var/plugins/System/PSC/Invoice/InvoiceTS/src/modules/topbar/TopBarComponent.tsx
@@ -10,7 +10,7 @@ import React from 'react'
 const TopBarComponent = ({shop, order, change}) => {
 
     return (
-        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-md p-6 animate-fade-in">
+        <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-4 animate-fade-in">
             <div className="flex flex-wrap items-center gap-4">
                 <div className="w-auto">
                    <DraftComponent order={order} />