diff --git a/contao/forms/FormSubmit.php b/contao/forms/FormSubmit.php
index 7a193d54a2..53aefe61fc 100644
--- a/contao/forms/FormSubmit.php
+++ b/contao/forms/FormSubmit.php
@@ -93,11 +93,6 @@ public function validate()
 	 */
 	public function parse($arrAttributes=null)
 	{
-		if ($this->tableless)
-		{
-			$this->strClass = trim('submit_container ' . $this->strClass);
-		}
-
 		if ($this->imageSubmit && $this->singleSRC != '')
 		{
 			$objModel = \FilesModel::findByUuid($this->singleSRC);
diff --git a/contao/templates/forms/form_submit.html5 b/contao/templates/forms/form_submit.html5
index 59af8754c1..4b172a2398 100644
--- a/contao/templates/forms/form_submit.html5
+++ b/contao/templates/forms/form_submit.html5
@@ -1,15 +1,26 @@
-<?php $this->extend('form_row'); ?>
-
-<?php $this->block('field'); ?>
-  <?php if (!$this->tableless): ?>
-    <div class="submit_container">
-  <?php endif; ?>
-  <?php if ($this->src): ?>
-    <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
-  <?php else: ?>
-    <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
-  <?php endif; ?>
-  <?php if (!$this->tableless): ?>
-    </div>
-  <?php endif; ?>
-<?php $this->endblock(); ?>
+<?php if ($this->tableless): ?>
+
+  <div class="submit_container<?php if ($this->class) echo ' ' . $this->class; ?>">
+    <?php if ($this->src): ?>
+      <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
+    <?php else: ?>
+      <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
+    <?php endif; ?>
+  </div>
+
+<?php else: ?>
+
+  <tr class="<?php echo $this->rowClass; ?>">
+    <td class="col_0 col_first">&nbsp;</td>
+    <td class="col_1 col_last">
+      <div class="submit_container">
+        <?php if ($this->src): ?>
+          <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
+        <?php else: ?>
+          <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>
+        <?php endif; ?>
+      </div>
+    </td>
+  </tr>
+
+<?php endif; ?>
diff --git a/contao/templates/forms/form_submit.xhtml b/contao/templates/forms/form_submit.xhtml
index c7fde6b357..3da8d22692 100644
--- a/contao/templates/forms/form_submit.xhtml
+++ b/contao/templates/forms/form_submit.xhtml
@@ -1,15 +1,26 @@
-<?php $this->extend('form_row'); ?>
-
-<?php $this->block('field'); ?>
-  <?php if (!$this->tableless): ?>
-    <div class="submit_container">
-  <?php endif; ?>
-  <?php if ($this->src): ?>
-    <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
-  <?php else: ?>
-    <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
-  <?php endif; ?>
-  <?php if (!$this->tableless): ?>
-    </div>
-  <?php endif; ?>
-<?php $this->endblock(); ?>
+<?php if ($this->tableless): ?>
+
+  <div class="submit_container<?php if ($this->class) echo ' ' . $this->class; ?>">
+    <?php if ($this->src): ?>
+      <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
+    <?php else: ?>
+      <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
+    <?php endif; ?>
+  </div>
+
+<?php else: ?>
+
+  <tr class="<?php echo $this->rowClass; ?>">
+    <td class="col_0 col_first">&nbsp;</td>
+    <td class="col_1 col_last">
+      <div class="submit_container">
+        <?php if ($this->src): ?>
+          <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
+        <?php else: ?>
+          <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?> />
+        <?php endif; ?>
+      </div>
+    </td>
+  </tr>
+
+<?php endif; ?>