diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
index 358d3e7bffa..282e6024fa5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
@@ -103,7 +103,7 @@
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
                             <span>
-                                <span class="fw-stack">
+                                <span class="fw-stack add-margin-right-2x">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-share fw-stack-1x"></i>
                                 </span> Group Sharing
@@ -145,7 +145,7 @@
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
                             <span>
-                                <span class="fw-stack">
+                                <span class="fw-stack add-margin-right-2x">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-bookmark fw-stack-1x"></i>
                                 </span> Group Sharing Role
@@ -262,7 +262,7 @@
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
                             <span>
-                                <span class="fw-stack">
+                                <span class="fw-stack add-margin-right-2x">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-edit fw-stack-1x"></i>
                                 </span> Update Group
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js
index 4a29eae7b2b..4845833088f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js
@@ -6,7 +6,7 @@
  * Opens a modal popup with input to enter multiple email addresses to send invites
  */
 function toggleEmailInvite(){
-    modalDialog.header('<h4 class="pull-left modal-title"><span class="fw-stack add-margin-right-1x">' +
+    modalDialog.header('<h4 class="pull-left modal-title"><span class="fw-stack add-margin-right-2x">' +
                        '<i class="fw fw-user fw-stack-2x"></i>' +
                        '<span class="fw-stack fw-move-right fw-move-bottom">' +
                        '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.qr-modal/qr-modal.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.qr-modal/qr-modal.hbs
index 3a3cab1736d..0e03d4b8988 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.qr-modal/qr-modal.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.qr-modal/qr-modal.hbs
@@ -19,7 +19,7 @@
     <div id="qr-code-modal" data-enrollment-url="{{@unit.params.enrollmentURL}}" class="hidden">
         <div class="modal-header">
             <h4 class="pull-left modal-title">
-                <span class="fw-stack">
+                <span class="fw-stack add-margin-right-2x">
                     <i class="fw fw-mobile fw-stack-2x"></i>
                     <span class="fw-stack fw-move-right fw-move-bottom">
                       <i class="fw fw-circle-outline fw-stack-2x"></i>