diff --git a/templates/invoice.tex b/templates/invoice.tex
index 313f37c..7b22f35 100644
--- a/templates/invoice.tex
+++ b/templates/invoice.tex
@@ -113,8 +113,12 @@ a2 += (len(a1)-len(a2))*[""]
 
 % COMPANY ID NUMBERS
 \multicolumn{2}{X|}{} & \multicolumn{2}{X}{} \\
-    \multicolumn{2}{l|}{IČO: {{issuer.ico}}} & \multicolumn{2}{l}{IČO: {{if customer.icdph}}\hspace{0.3cm}{{endif}} {{customer.ico}}} \\
-    \multicolumn{2}{l|}{DIČ: {{issuer.dic}}} & \multicolumn{2}{l}{DIČ: {{if customer.icdph}}\hspace{0.3cm}{{endif}} {{customer.dic}}} \\
+    % ISSUER
+    \multicolumn{2}{l|}{IČO: {{issuer.ico}}} &
+        \multicolumn{2}{l}{ {{if customer.icdph}}IČO: \hspace{0.3cm}{{customer.ico}}{{endif}} } \\
+    % CUSTOMER
+    \multicolumn{2}{l|}{DIČ: {{issuer.dic}}} &
+        \multicolumn{2}{l}{ {{if customer.icdph}}DIČ: \hspace{0.3cm}{{customer.dic}}{{endif}} } \\
 {{if issuer.icdph or customer.icdph}}
     {{if issuer.icdph}}
     \multicolumn{2}{l|}{IČDPH: {{issuer.icdph}}} &