diff --git a/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopButton.java b/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopButton.java
index ac87586614..82648cc204 100644
--- a/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopButton.java
+++ b/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopButton.java
@@ -49,6 +49,8 @@ public class DesktopButton extends DesktopAbstractComponent<JButton> implements
     protected boolean disableOnClick = false;
     protected boolean useResponsePending = false;
 
+    protected boolean captionAsHtml = false; // just stub
+
     public DesktopButton() {
         impl = createImplementation();
         impl.addActionListener(new ValidationAwareActionListener() {
@@ -243,4 +245,14 @@ public class DesktopButton extends DesktopAbstractComponent<JButton> implements
     public void setUseResponsePending(boolean useResponsePending) {
         this.useResponsePending = useResponsePending;
     }
+
+    @Override
+    public void setCaptionAsHtml(boolean captionAsHtml) {
+        this.captionAsHtml = captionAsHtml;
+    }
+
+    @Override
+    public boolean isCaptionAsHtml() {
+        return captionAsHtml;
+    }
 }
\ No newline at end of file
diff --git a/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopPopupButton.java b/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopPopupButton.java
index 17611fa47a..c50fc57973 100644
--- a/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopPopupButton.java
+++ b/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopPopupButton.java
@@ -560,5 +560,14 @@ public class DesktopPopupButton extends DesktopAbstractActionsHolderComponent<JB
         @Override
         public void setUseResponsePending(boolean useResponsePending) {
         }
+
+        @Override
+        public void setCaptionAsHtml(boolean captionAsHtml) {
+        }
+
+        @Override
+        public boolean isCaptionAsHtml() {
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/gui/src/com/haulmont/cuba/gui/components/Button.java b/modules/gui/src/com/haulmont/cuba/gui/components/Button.java
index 568793c45a..443bcaceba 100644
--- a/modules/gui/src/com/haulmont/cuba/gui/components/Button.java
+++ b/modules/gui/src/com/haulmont/cuba/gui/components/Button.java
@@ -43,4 +43,15 @@ public interface Button extends Component, Component.HasCaption, Component.Belon
      * @param useResponsePending whether to use response pending
      */
     void setUseResponsePending(boolean useResponsePending);
+
+    /**
+     * Enable or disable HTML mode for caption.
+     *
+     * @param captionAsHtml pass true to enable HTML mode for caption.
+     */
+    void setCaptionAsHtml(boolean captionAsHtml);
+    /**
+     * @return true if caption is inserted to DOM as HTML
+     */
+    boolean isCaptionAsHtml();
 }
\ No newline at end of file
diff --git a/modules/gui/src/com/haulmont/cuba/gui/window.xsd b/modules/gui/src/com/haulmont/cuba/gui/window.xsd
index 0e954563e5..b9ab3617df 100644
--- a/modules/gui/src/com/haulmont/cuba/gui/window.xsd
+++ b/modules/gui/src/com/haulmont/cuba/gui/window.xsd
@@ -1863,6 +1863,7 @@
                 <xs:attribute name="stylename" type="buttonStylename"/>
                 <xs:attribute name="action" type="xs:string"/>
                 <xs:attribute name="invoke" type="xs:string"/>
+                <xs:attribute name="captionAsHtml" type="xs:boolean"/>
 
                 <xs:attribute name="focusable" type="xs:boolean"/>
                 <xs:attribute name="disableOnClick" type="xs:boolean"/>
diff --git a/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/ButtonLoader.java b/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/ButtonLoader.java
index 31fc989f84..0060907d1e 100644
--- a/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/ButtonLoader.java
+++ b/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/ButtonLoader.java
@@ -64,6 +64,7 @@ public class ButtonLoader extends AbstractComponentLoader<Button> {
         loadStyleName(resultComponent, element);
 
         loadCaption(resultComponent, element);
+        loadCaptionAsHtml(resultComponent, element);
         loadDescription(resultComponent, element);
         loadAction(resultComponent, element);
         loadIcon(resultComponent, element);
@@ -81,6 +82,13 @@ public class ButtonLoader extends AbstractComponentLoader<Button> {
         loadResponsive(resultComponent, element);
     }
 
+    protected void loadCaptionAsHtml(Button resultComponent, Element element) {
+        String captionAsHtml = element.attributeValue("captionAsHtml");
+        if (StringUtils.isNotEmpty(captionAsHtml)) {
+            resultComponent.setCaptionAsHtml(Boolean.parseBoolean(captionAsHtml));
+        }
+    }
+
     protected void loadDisableOnClick(Button component, Element element) {
         String disableOnClick = element.attributeValue("disableOnClick");
         if (StringUtils.isNotEmpty(disableOnClick)) {
diff --git a/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java b/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java
index 9793af0a1e..131aa2c603 100644
--- a/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java
+++ b/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java
@@ -174,4 +174,14 @@ public class WebButton extends WebAbstractComponent<CubaButton> implements Butto
     public void setUseResponsePending(boolean useResponsePending) {
         component.setUseResponsePending(useResponsePending);
     }
+
+    @Override
+    public void setCaptionAsHtml(boolean captionAsHtml) {
+        component.setCaptionAsHtml(captionAsHtml);
+    }
+
+    @Override
+    public boolean isCaptionAsHtml() {
+        return component.isCaptionAsHtml();
+    }
 }
\ No newline at end of file