diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index db04eedd1..45a3d4e3e 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -244,7 +244,7 @@ export default {
         firstCodeInput: `vn-item-niche vn-horizontal:nth-child(1) > vn-textfield[label="Code"] input`,
         secondWarehouseAutocomplete: `vn-item-niche vn-horizontal:nth-child(2) > vn-autocomplete[field="niche.warehouseFk"]`,
         secondCodeInput: `vn-item-niche vn-horizontal:nth-child(2) > vn-textfield[label="Code"] input`,
-        secondNicheRemoveButton: `vn-item-niche vn-horizontal:nth-child(2) > vn-none > vn-icon[icon="delete"]`,
+        secondNicheRemoveButton: `vn-item-niche vn-horizontal:nth-child(2) > vn-none > vn-icon-button[icon="delete"]`,
         thirdWarehouseAutocomplete: `vn-item-niche vn-horizontal:nth-child(3) > vn-autocomplete[field="niche.warehouseFk"]`,
         thirdCodeInput: `vn-item-niche vn-horizontal:nth-child(3) > vn-textfield[label="Code"] input`,
         submitNichesButton: `vn-item-niche ${components.vnSubmit}`
@@ -423,7 +423,7 @@ export default {
         firstQuantityInput: 'vn-ticket-service vn-textfield[label="Quantity"] input',
         firstPriceInput: 'vn-ticket-service vn-textfield[label="Price"] input',
         firstVatTypeAutocomplete: 'vn-ticket-service vn-autocomplete[label="Tax class"]',
-        fistDeleteServiceButton: 'vn-ticket-card > vn-main-block > div.content-block.ng-scope > vn-ticket-service > form > vn-card > div > vn-one:nth-child(1) > vn-horizontal:nth-child(1) > vn-auto > vn-icon[icon="delete"]',
+        fistDeleteServiceButton: 'vn-ticket-card > vn-main-block > div.content-block.ng-scope > vn-ticket-service > form > vn-card > div > vn-one:nth-child(1) > vn-horizontal:nth-child(1) > vn-auto > vn-icon-button[icon="delete"]',
         serviceLine: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(2) > vn-horizontal',
         saveServiceButton: `${components.vnSubmit}`
     },
diff --git a/front/core/components/icon-button/style.scss b/front/core/components/icon-button/style.scss
index d5932fa39..a93096840 100644
--- a/front/core/components/icon-button/style.scss
+++ b/front/core/components/icon-button/style.scss
@@ -4,19 +4,22 @@ vn-icon-button {
     outline: 0;
     color: $color-main;
     display: inline-block;
+    font-size: 18pt;
+    padding: .25em;
     
     & > button {
         background-color: transparent;
         display: block;
         color: inherit;
         border: 0;
-        padding: .25em;
+        padding: 0;
 
         &:hover {
             background-color: initial;
         }
         & > vn-icon {
             display: block;
+            font-size: inherit;
         }
     }
 }
diff --git a/front/salix/components/app/style.scss b/front/salix/components/app/style.scss
index 83b6dc736..d2d4e516e 100644
--- a/front/salix/components/app/style.scss
+++ b/front/salix/components/app/style.scss
@@ -57,6 +57,8 @@ vn-app {
             margin: $margin-medium;
 
             form vn-horizontal {
+                align-items: center;
+
                 & > * {
                     padding: .2em;
                 }
diff --git a/front/salix/components/main-menu/main-menu.html b/front/salix/components/main-menu/main-menu.html
index 188f854eb..8d46ccb8d 100644
--- a/front/salix/components/main-menu/main-menu.html
+++ b/front/salix/components/main-menu/main-menu.html
@@ -5,31 +5,27 @@
         class="unselectable">
         {{currentUserName}}
     </div>
-    <div>
-        <vn-icon
-            id="apps"
-            icon="apps"
-            vn-popover="apps-menu"
-            translate-attr="{title: 'Applications'}">
-        </vn-icon>
-        <vn-menu vn-id="apps-menu">
-            <ul pad-small>
-                <li ng-repeat="mod in ::$ctrl.modules" ui-sref="{{::mod.route.state}}">
-                    <vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
-                    <span translate>{{::mod.name}}</span>
-                </li>
-            </ul>
-        </vn-menu>
-    </div>
-    <div>
-        <vn-icon
-            id="logout"
-            icon="exit_to_app"
-            translate-attr="{title: 'Logout'}"
-            ng-click="$ctrl.onLogoutClick()">
-        </vn-icon>
-    </div>
+    <vn-icon-button
+        id="apps"
+        icon="apps"
+        vn-popover="apps-menu"
+        translate-attr="{title: 'Applications'}">
+    </vn-icon-button>
+    <vn-icon-button
+        id="logout"
+        icon="exit_to_app"
+        translate-attr="{title: 'Logout'}"
+        ng-click="$ctrl.onLogoutClick()">
+    </vn-icon-button>
 </div>
+<vn-menu vn-id="apps-menu">
+    <ul pad-small>
+        <li ng-repeat="mod in ::$ctrl.modules" ui-sref="{{::mod.route.state}}">
+            <vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
+            <span translate>{{::mod.name}}</span>
+        </li>
+    </ul>
+</vn-menu>
 <vn-user-configuration-popover
     vn-id="popover">
 </vn-user-configuration-popover>
\ No newline at end of file
diff --git a/front/salix/components/main-menu/style.scss b/front/salix/components/main-menu/style.scss
index fb7acf296..ac3ee18c7 100644
--- a/front/salix/components/main-menu/style.scss
+++ b/front/salix/components/main-menu/style.scss
@@ -11,22 +11,20 @@ vn-main-menu {
         align-items: center;
         box-sizing: border-box;
 
-        & > * {
-            cursor: pointer;
-            padding-left: .6em;
-    
-            &:hover {
-                color: $color-main;
-            }
+        & > *:hover {
+            color: $color-main;
         }
         & > #user {
             vertical-align: middle;
             font-weight: bold;
             margin-right: .2em;
+            cursor: pointer;
         }
-        & > div > vn-icon {
-            display: block;
+        & > vn-icon-button {
             font-size: 2.1em;
+            color: inherit;
+            padding: 0;
+            margin-left: .3em;
         }
     } 
     vn-menu.vn-popover > div > div.content > ul {
diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss
index dcabb77c6..d06269c86 100644
--- a/front/salix/styles/misc.scss
+++ b/front/salix/styles/misc.scss
@@ -171,11 +171,12 @@ vn-tool-bar {
             & > .buttons {
                 align-items: center;
     
-                vn-icon {
+                vn-icon-button {
                     opacity: .4;
                     color: $color-main;
                     margin-left: .5em;
                     transition: opacity 250ms ease-out;
+                    padding: 0;
                     font-size: 2em;
     
                     &:hover {
diff --git a/modules/client/front/contact/index.html b/modules/client/front/contact/index.html
index 8ac1f4f4f..b66eb782e 100644
--- a/modules/client/front/contact/index.html
+++ b/modules/client/front/contact/index.html
@@ -27,13 +27,13 @@
                 rule="clientContact.phone" vn-focus>
             </vn-textfield>
             <vn-none>
-                <vn-icon
+                <vn-icon-button
                     pointer
                     margin-medium-v
                     vn-tooltip="Remove contact"
                     icon="delete"
                     ng-click="model.remove($index)">
-                </vn-icon>  
+                </vn-icon-button>
             </vn-none>
         </vn-horizontal>
         <vn-one>
diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html
index 90074aa13..aacc8ba75 100644
--- a/modules/client/front/index/index.html
+++ b/modules/client/front/index/index.html
@@ -39,11 +39,11 @@
                         </vn-label-value>
                     </vn-one>
                     <vn-horizontal class="buttons">
-                        <vn-icon
-                            ng-click="$ctrl.openSummary(client, $event)"
+                        <vn-icon-button
+                            ng-click="$ctrl.preview($event)"
                             vn-tooltip="Preview"
                             icon="desktop_windows">
-                        </vn-icon>
+                        </vn-icon-button>
                     </vn-horizontal>
                 </vn-horizontal>
             </a>
diff --git a/modules/item/front/barcode/index.html b/modules/item/front/barcode/index.html
index c196b5c89..14bde170b 100644
--- a/modules/item/front/barcode/index.html
+++ b/modules/item/front/barcode/index.html
@@ -22,13 +22,13 @@
                 vn-focus>
             </vn-textfield>
             <vn-none>
-                <vn-icon
+                <vn-icon-button
                     vn-acl="buyer,replenisher"
                     pointer
                     vn-tooltip="Remove barcode"
                     icon="delete"
                     ng-click="model.remove($index)">
-                </vn-icon>
+                </vn-icon-button>
             </vn-none>
         </vn-horizontal>
         <vn-one>
diff --git a/modules/item/front/niche/index.html b/modules/item/front/niche/index.html
index 4d96f60d1..e87034577 100644
--- a/modules/item/front/niche/index.html
+++ b/modules/item/front/niche/index.html
@@ -30,13 +30,13 @@
                 vn-acl="buyer,replenisher">
             </vn-textfield>
             <vn-none>
-                <vn-icon
+                <vn-icon-button
                     vn-acl="buyer,replenisher"
                     pointer
                     vn-tooltip="Remove niche"
                     icon="delete"
                     ng-click="model.remove($index)">
-                </vn-icon>
+                </vn-icon-button>
             </vn-none>
         </vn-horizontal>
         <vn-one>
diff --git a/modules/order/front/catalog/index.html b/modules/order/front/catalog/index.html
index adf7e46cd..d088238df 100644
--- a/modules/order/front/catalog/index.html
+++ b/modules/order/front/catalog/index.html
@@ -80,7 +80,7 @@
                                     </vn-one>
                                     <vn-auto>
                                         <a href="" vn-tooltip="Add">
-                                            <vn-icon icon="add_circle" ng-click="$ctrl.preview($event, item)"></vn-icon>
+                                            <vn-icon-button icon="add_circle" ng-click="$ctrl.preview($event, item)"></vn-icon-button>
                                         </a>
                                     </vn-auto>
                                 </vn-horizontal>
diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html
index e5201cd44..ba50c4651 100644
--- a/modules/ticket/front/services/index.html
+++ b/modules/ticket/front/services/index.html
@@ -41,12 +41,12 @@
                     field="service.taxClassFk">
                 </vn-autocomplete>
                 <vn-auto pad-medium-top>
-                    <vn-icon
+                    <vn-icon-button
                         pointer
                         vn-tooltip="Remove service"
                         icon="delete"
                         ng-click="model.remove($index)">
-                    </vn-icon>  
+                    </vn-icon-button>  
                 </vn-one>
             </vn-horizontal>
         </vn-one>
diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html
index 99a5f6912..54bcda982 100644
--- a/modules/worker/front/index/index.html
+++ b/modules/worker/front/index/index.html
@@ -40,11 +40,11 @@
                         </vn-label-value>
                     </vn-one>
                     <vn-horizontal class="buttons">
-                        <vn-icon
+                        <vn-icon-button
                             ng-click="$ctrl.preview($event, worker)"
                             vn-tooltip="Preview"
                             icon="desktop_windows">
-                        </vn-icon>
+                        </vn-icon-button>
                     </vn-horizontal>
                 </vn-horizontal>
             </a>