diff --git a/client/client/src/address-edit/address-edit.html b/client/client/src/address-edit/address-edit.html
index 74e273c97..3518eb274 100644
--- a/client/client/src/address-edit/address-edit.html
+++ b/client/client/src/address-edit/address-edit.html
@@ -91,7 +91,6 @@
         <vn-one>
             <vn-icon
                 pointer 
-                margin-medium-left
                 vn-tooltip="Add note"
                 tooltip-position = "right"
                 orange
diff --git a/client/item/src/barcode/item-barcode.html b/client/item/src/barcode/item-barcode.html
index 37c17298b..f95e4e28b 100644
--- a/client/item/src/barcode/item-barcode.html
+++ b/client/item/src/barcode/item-barcode.html
@@ -8,25 +8,27 @@
                 model="barcode.code"
                 vn-acl="buyer, replenisher">
             </vn-textfield>
-            <vn-one pad-medium-top>
+            <vn-one>
                 <vn-icon
-                    vn-acl="buyer, replenisher"
-                    pointer 
+                    pad-medium-top
+                    vn-acl="buyer,replenisher"
+                    pointer
                     medium-grey
+                    vn-tooltip="Remove note"
+                    tooltip-position="left"
                     icon="remove_circle_outline"
                     ng-click="$ctrl.removeBarcode($index)">
                 </vn-icon>
-                <vn-icon
-                    vn-acl="buyer, replenisher"
-                    pointer 
-                    margin-medium-left
-                    orange
-                    icon="add_circle"
-                    ng-if = "barcode.showAddIcon" 
-                    ng-click="$ctrl.addBarcode()"
-                ></vn-icon>  
             </vn-one>
         </vn-horizontal>
+        <vn-one>
+            <vn-icon
+                vn-acl="buyer, replenisher"
+                pointer vn-tooltip="Add note"
+                tooltip-position="right" orange icon="add_circle"
+                ng-click="$ctrl.addBarcode()">
+            </vn-icon>
+        </vn-one>
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>
diff --git a/client/item/src/niche/item-niche.html b/client/item/src/niche/item-niche.html
index f8948e128..24b00d267 100644
--- a/client/item/src/niche/item-niche.html
+++ b/client/item/src/niche/item-niche.html
@@ -32,25 +32,26 @@
                 rule="itemNiche.code"
                 vn-acl="buyer,replenisher">
             </vn-textfield>
-            <vn-one pad-medium-top>
+            <vn-one>
                 <vn-icon
                     vn-acl="buyer,replenisher"
-                    pointer 
+                    pointer
                     medium-grey
+                    vn-tooltip="Remove note"
+                    tooltip-position="left"
                     icon="remove_circle_outline"
                     ng-click="$ctrl.removeNiche($index)">
                 </vn-icon>
-                <vn-icon
-                    vn-acl="buyer, replenisher"
-                    pointer 
-                    margin-medium-left
-                    orange
-                    icon="add_circle"
-                    ng-if="itemNiche.showAddIcon" 
-                    ng-click="$ctrl.addNiche()">
-                </vn-icon>  
             </vn-one>
         </vn-horizontal>
+        <vn-one>
+            <vn-icon
+                vn-acl="buyer, replenisher"
+                pointer vn-tooltip="Add note"
+                tooltip-position="right" orange icon="add_circle"
+                ng-click="$ctrl.addNiche()">
+            </vn-icon>
+        </vn-one>
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>
diff --git a/client/ticket/src/note/ticket-observation.html b/client/ticket/src/note/ticket-observation.html
index dc3b1c12c..7ca256760 100644
--- a/client/ticket/src/note/ticket-observation.html
+++ b/client/ticket/src/note/ticket-observation.html
@@ -48,7 +48,7 @@
         </vn-one>
         <vn-one>
             <vn-icon
-                pointer margin-medium-left vn-tooltip="Add note"
+                pointer vn-tooltip="Add note"
                 tooltip-position="right" orange icon="add_circle"
                 ng-if="observationTypes.model.length  > $ctrl.ticketObservations.length"
                 ng-click="$ctrl.addObservation()">
diff --git a/client/ticket/src/package/index/package.html b/client/ticket/src/package/index/package.html
index 4a4430eeb..d1838924e 100644
--- a/client/ticket/src/package/index/package.html
+++ b/client/ticket/src/package/index/package.html
@@ -53,7 +53,6 @@
         <vn-one>
             <vn-icon
                 pointer 
-                margin-medium-left
                 vn-tooltip="Add package"
                 tooltip-position = "right"
                 orange