diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index e796f200ca..7b06a4e479 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -120,7 +120,6 @@ define([
     'use strict';
 
     var templateHugeCaption =
-        '<div class="btn-group icon-top" id="<%= id %>" style="<%= style %>">' +
             '<button type="button" class="btn dropdown-toggle <%= cls %>" data-toggle="dropdown">' +
                 '<div class="inner-box-icon">' +
                 '<% if ( iconImg ) { %>' +
@@ -130,17 +129,18 @@ define([
                 '<% } %>' +
                 '</div>' +
                 '<span class="caption"><%= caption %></span>' +
-            '</button>' +
-        '</div>';
+            '</button>';
 
     var templateHugeMenuCaption =
         '<div class="btn-group icon-top" id="<%= id %>" style="<%= style %>">' +
             '<button type="button" class="btn dropdown-toggle <%= cls %>" data-toggle="dropdown">' +
+                '<div class="inner-box-icon">' +
                 '<% if ( iconImg ) { %>' +
                     '<img src="<%= iconImg %>">' +
                 '<% } else { %>' +
                     '<i class="icon <%= iconCls %>">&nbsp;</i>' +
                 '<% } %>' +
+                '</div>' +
                 '<div class="inner-box-caption">' +
                     '<span class="caption"><%= caption %></span>' +
                     '<span class="caret img-commonctrl"></span>' +
@@ -151,7 +151,11 @@ define([
     var templateHugeSplitCaption =
         '<div class="btn-group x-huge split icon-top" id="<%= id %>" style="<%= style %>">' +
             '<button type="button" class="btn <%= cls %> inner-box-icon">' +
-                '<i class="icon <%= iconCls %>">&nbsp;</i>' +
+                '<% if ( iconImg ) { %>' +
+                    '<img src="<%= iconImg %>">' +
+                '<% } else { %>' +
+                    '<i class="icon <%= iconCls %>">&nbsp;</i>' +
+                '<% } %>' +
             '</button>' +
             '<button type="button" class="btn <%= cls %> inner-box-caption dropdown-toggle" data-toggle="dropdown">' +
                 '<span class="caption"><%= caption %></span>' +
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index d0c185b062..b8b4a267af 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -85,7 +85,7 @@
     }
 }
 
-.btn-group.icon-top {
+.icon-top {
     display: inline-flex;
     flex-direction: column;