diff --git a/src/PureModalAction.php b/src/PureModalAction.php
index 9290c6e..1b58b59 100644
--- a/src/PureModalAction.php
+++ b/src/PureModalAction.php
@@ -83,7 +83,7 @@ protected function getButtonTitle()
      */
     protected function getDialogButtonTitle()
     {
-        $title = $this->buttonTitle ?: $this->title;
+        $title = $this->dialogButtonTitle ?: $this->title;
         if ($this->buttonIcon) {
             $title = '<span class="font-icon-' . $this->buttonIcon . '"></span> ' . $title;
         }
@@ -97,7 +97,7 @@ protected function getDialogButtonTitle()
      */
     public function setDialogButtonTitle($value)
     {
-        $this->buttonTitle = $value;
+        $this->dialogButtonTitle = $value;
         return $this;
     }
 
diff --git a/templates/LeKoala/PureModal/PureModalAction.ss b/templates/LeKoala/PureModal/PureModalAction.ss
index 3976622..bef4e75 100644
--- a/templates/LeKoala/PureModal/PureModalAction.ss
+++ b/templates/LeKoala/PureModal/PureModalAction.ss
@@ -21,7 +21,9 @@
             </div>
             <% if $ShowDialogButton %>
                 <div class="toolbar toolbar--south">
-                    <input type="submit" name="action_$Name" class="btn action btn btn-info custom-action" value="$ButtonTitle">
+                    <button type="submit" name="action_$Name" class="action custom-action<% if $extraClass %> $extraClass<% end_if %>">
+                        {$DialogButtonTitle.RAW}
+                    </button>
                 </div>
             <% end_if %>
         </div>