diff --git a/src/Netzmacht/Bootstrap/Form/Subscriber.php b/src/Netzmacht/Bootstrap/Form/Subscriber.php
index 93f959e..d2dfa0e 100644
--- a/src/Netzmacht/Bootstrap/Form/Subscriber.php
+++ b/src/Netzmacht/Bootstrap/Form/Subscriber.php
@@ -5,6 +5,7 @@
 
 use Netzmacht\Bootstrap\Bootstrap;
 use Netzmacht\Bootstrap\Helper\Icons;
+use Netzmacht\FormHelper\Element\StaticHtml;
 use Netzmacht\FormHelper\Event\Events;
 use Netzmacht\FormHelper\Event\GenerateEvent;
 use Netzmacht\FormHelper\Event\SelectLayoutEvent;
@@ -163,9 +164,13 @@ public function generate(GenerateEvent $event)
 
 					if($widget->bootstrap_addSubmitIconPosition == 'left') {
 						$position = Node::POSITION_FIRST;
+						$icon .= ' ';
+					}
+					else {
+						$icon = ' ' . $icon;
 					}
 
-					$submit->addChild($icon, $position);
+					$submit->addChild(new StaticHtml($icon), $position);
 				}
 
 				$inputGroup->setRight($submit, $inputGroup::BUTTON);