diff --git a/src/Types/TypeStandard2of5.php b/src/Types/TypeStandard2of5.php
index 59a5958..592f59a 100644
--- a/src/Types/TypeStandard2of5.php
+++ b/src/Types/TypeStandard2of5.php
@@ -26,16 +26,12 @@ public function getBarcodeData(string $code): Barcode
         $chr['5'] = '11101011101010';
         $chr['6'] = '10111011101010';
         $chr['7'] = '10101011101110';
-        $chr['8'] = '10101110111010';
+        $chr['8'] = '11101010111010';
         $chr['9'] = '10111010111010';
         if ($this->checksum) {
             // add checksum
             $code .= $this->checksum_s25($code);
         }
-        if ((strlen($code) % 2) != 0) {
-            // add leading zero if code-length is odd
-            $code = '0' . $code;
-        }
         $seq = '11011010';
 
         for ($i = 0; $i < strlen($code); ++$i) {
diff --git a/tests/verified-files/S25+-1234567890.svg b/tests/verified-files/S25+-1234567890.svg
index 4271d9f..dcdc32a 100644
--- a/tests/verified-files/S25+-1234567890.svg
+++ b/tests/verified-files/S25+-1234567890.svg
@@ -1,73 +1,68 @@
 <?xml version="1.0" standalone="no" ?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="366" height="30" viewBox="0 0 366 30" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<desc>012345678905</desc>
+<svg width="338" height="30" viewBox="0 0 338 30" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<desc>12345678905</desc>
 	<g id="bars" fill="black" stroke="none">
 		<rect x="0" y="0" width="4" height="30" />
 		<rect x="6" y="0" width="4" height="30" />
 		<rect x="12" y="0" width="2" height="30" />
-		<rect x="16" y="0" width="2" height="30" />
-		<rect x="20" y="0" width="2" height="30" />
-		<rect x="24" y="0" width="6" height="30" />
-		<rect x="32" y="0" width="6" height="30" />
-		<rect x="40" y="0" width="2" height="30" />
-		<rect x="44" y="0" width="6" height="30" />
-		<rect x="52" y="0" width="2" height="30" />
+		<rect x="16" y="0" width="6" height="30" />
+		<rect x="24" y="0" width="2" height="30" />
+		<rect x="28" y="0" width="2" height="30" />
+		<rect x="32" y="0" width="2" height="30" />
+		<rect x="36" y="0" width="6" height="30" />
+		<rect x="44" y="0" width="2" height="30" />
+		<rect x="48" y="0" width="6" height="30" />
 		<rect x="56" y="0" width="2" height="30" />
 		<rect x="60" y="0" width="2" height="30" />
 		<rect x="64" y="0" width="6" height="30" />
-		<rect x="72" y="0" width="2" height="30" />
-		<rect x="76" y="0" width="6" height="30" />
-		<rect x="84" y="0" width="2" height="30" />
+		<rect x="72" y="0" width="6" height="30" />
+		<rect x="80" y="0" width="6" height="30" />
 		<rect x="88" y="0" width="2" height="30" />
-		<rect x="92" y="0" width="6" height="30" />
-		<rect x="100" y="0" width="6" height="30" />
+		<rect x="92" y="0" width="2" height="30" />
+		<rect x="96" y="0" width="2" height="30" />
+		<rect x="100" y="0" width="2" height="30" />
+		<rect x="104" y="0" width="2" height="30" />
 		<rect x="108" y="0" width="6" height="30" />
 		<rect x="116" y="0" width="2" height="30" />
-		<rect x="120" y="0" width="2" height="30" />
-		<rect x="124" y="0" width="2" height="30" />
-		<rect x="128" y="0" width="2" height="30" />
-		<rect x="132" y="0" width="2" height="30" />
-		<rect x="136" y="0" width="6" height="30" />
-		<rect x="144" y="0" width="2" height="30" />
-		<rect x="148" y="0" width="6" height="30" />
-		<rect x="156" y="0" width="6" height="30" />
-		<rect x="164" y="0" width="2" height="30" />
+		<rect x="120" y="0" width="6" height="30" />
+		<rect x="128" y="0" width="6" height="30" />
+		<rect x="136" y="0" width="2" height="30" />
+		<rect x="140" y="0" width="6" height="30" />
+		<rect x="148" y="0" width="2" height="30" />
+		<rect x="152" y="0" width="2" height="30" />
+		<rect x="156" y="0" width="2" height="30" />
+		<rect x="160" y="0" width="6" height="30" />
 		<rect x="168" y="0" width="6" height="30" />
 		<rect x="176" y="0" width="2" height="30" />
 		<rect x="180" y="0" width="2" height="30" />
 		<rect x="184" y="0" width="2" height="30" />
-		<rect x="188" y="0" width="6" height="30" />
+		<rect x="188" y="0" width="2" height="30" />
+		<rect x="192" y="0" width="2" height="30" />
 		<rect x="196" y="0" width="6" height="30" />
-		<rect x="204" y="0" width="2" height="30" />
-		<rect x="208" y="0" width="2" height="30" />
-		<rect x="212" y="0" width="2" height="30" />
-		<rect x="216" y="0" width="2" height="30" />
+		<rect x="204" y="0" width="6" height="30" />
+		<rect x="212" y="0" width="6" height="30" />
 		<rect x="220" y="0" width="2" height="30" />
-		<rect x="224" y="0" width="6" height="30" />
-		<rect x="232" y="0" width="6" height="30" />
+		<rect x="224" y="0" width="2" height="30" />
+		<rect x="228" y="0" width="6" height="30" />
+		<rect x="236" y="0" width="2" height="30" />
 		<rect x="240" y="0" width="2" height="30" />
-		<rect x="244" y="0" width="2" height="30" />
-		<rect x="248" y="0" width="6" height="30" />
+		<rect x="244" y="0" width="6" height="30" />
+		<rect x="252" y="0" width="2" height="30" />
 		<rect x="256" y="0" width="6" height="30" />
 		<rect x="264" y="0" width="2" height="30" />
 		<rect x="268" y="0" width="2" height="30" />
-		<rect x="272" y="0" width="6" height="30" />
-		<rect x="280" y="0" width="2" height="30" />
+		<rect x="272" y="0" width="2" height="30" />
+		<rect x="276" y="0" width="6" height="30" />
 		<rect x="284" y="0" width="6" height="30" />
 		<rect x="292" y="0" width="2" height="30" />
-		<rect x="296" y="0" width="2" height="30" />
-		<rect x="300" y="0" width="2" height="30" />
-		<rect x="304" y="0" width="6" height="30" />
-		<rect x="312" y="0" width="6" height="30" />
+		<rect x="296" y="0" width="6" height="30" />
+		<rect x="304" y="0" width="2" height="30" />
+		<rect x="308" y="0" width="6" height="30" />
+		<rect x="316" y="0" width="2" height="30" />
 		<rect x="320" y="0" width="2" height="30" />
-		<rect x="324" y="0" width="6" height="30" />
-		<rect x="332" y="0" width="2" height="30" />
-		<rect x="336" y="0" width="6" height="30" />
-		<rect x="344" y="0" width="2" height="30" />
-		<rect x="348" y="0" width="2" height="30" />
-		<rect x="352" y="0" width="4" height="30" />
-		<rect x="358" y="0" width="2" height="30" />
-		<rect x="362" y="0" width="4" height="30" />
+		<rect x="324" y="0" width="4" height="30" />
+		<rect x="330" y="0" width="2" height="30" />
+		<rect x="334" y="0" width="4" height="30" />
 	</g>
 </svg>
diff --git a/tests/verified-files/S25-1234567890.svg b/tests/verified-files/S25-1234567890.svg
index 2a6051d..26d48c5 100644
--- a/tests/verified-files/S25-1234567890.svg
+++ b/tests/verified-files/S25-1234567890.svg
@@ -41,9 +41,9 @@
 		<rect x="192" y="0" width="2" height="30" />
 		<rect x="196" y="0" width="6" height="30" />
 		<rect x="204" y="0" width="6" height="30" />
-		<rect x="212" y="0" width="2" height="30" />
-		<rect x="216" y="0" width="2" height="30" />
-		<rect x="220" y="0" width="6" height="30" />
+		<rect x="212" y="0" width="6" height="30" />
+		<rect x="220" y="0" width="2" height="30" />
+		<rect x="224" y="0" width="2" height="30" />
 		<rect x="228" y="0" width="6" height="30" />
 		<rect x="236" y="0" width="2" height="30" />
 		<rect x="240" y="0" width="2" height="30" />