diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
index e856208e3af..1fdef264e85 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
@@ -35,16 +35,26 @@
                     <div class="row no-gutter">
                         <div class="wr-hidden-operations-nav col-lg-4">
                             <a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
-                                            <span class="wr-hidden-operations-icon fw-stack">
-                                                <i class="fw fw-settings fw-stack-2x"></i>
-                                            </span>
+                                <span class="wr-hidden-operations-icon fw-stack">
+                                    <i class="fw fw-settings fw-stack-2x"></i>
+                                    <span class="fw-stack fw-move-right fw-move-bottom">
+                                        <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
+                                        <i class="fw fw-circle fw-stack-2x"></i>
+                                        <i class="fw fw-mobile fw-stack-1x fw-inverse"></i>
+                                    </span>
+                                </span>
                                 General Configurations
                             </a>
                             {{#each deviceTypes}}
                                 <a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)">
-                                            <span class="wr-hidden-operations-icon fw-stack">
-                                                <i class="fw fw-settings fw-stack-2x"></i>
-                                            </span>
+                                    <span class="wr-hidden-operations-icon fw-stack">
+                                        <i class="fw fw-settings fw-stack-2x"></i>
+                                        <span class="fw-stack fw-move-right fw-move-bottom">
+                                            <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
+                                            <i class="fw fw-circle fw-stack-2x"></i>
+                                            <i class="fw fw-{{name}} fw-stack-1x fw-inverse"></i>
+                                        </span>
+                                    </span>
                                     {{label}} Configurations
                                 </a>
                             {{/each}}
@@ -79,9 +89,7 @@
                                                    placeholder="[ Required Field ]">
                                         </div>
                                         <div class="wr-input-control wr-btn-grp">
-                                            <button id="save-general-btn" class="wr-btn">
-                                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            </button>
+                                            <button id="save-general-btn" class="wr-btn">Save</button>
                                         </div>
                                     </div>
                                 </div>
@@ -107,12 +115,8 @@
                     <b>"Exit"</b> to complete the process and go back to the dashboard.
                     <hr/>
                     <button class="wr-btn"
-                            onclick="window.location.href='{{@app.context}}/platform-configuration'">Go
-                                                                                                     back
-                                                                                                     to
-                                                                                                     configurations
-                    </button>
-                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">&nbsp;&nbsp;&nbsp;&nbsp;Exit&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                            onclick="window.location.href='{{@app.context}}/platform-configuration'">Go back to configurations</button>
+                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">Exit</button>
                 </div>
             </div>
             <!-- /content -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
index 0fede3d552a..a0e58076363 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
@@ -16,10 +16,6 @@
  * under the License.
  */
 
-.wr-content {
-    padding-left: 33px;
-    padding-right: 33px;
-}
 
 .wr-input-control .helper {
     font-weight: 100;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index fe75cb54f03..6d253dcc0d3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -167,7 +167,7 @@ pre {
   position: absolute;
   right: 0;
   height: 10000px;
-  width: 60px;
+  width: 20px;
 }
 
 body.inverse .fade-edge:after {
@@ -181,7 +181,7 @@ body.inverse .fade-edge:after {
   position: absolute;
   right: 0;
   height: 10000px;
-  width: 60px;
+  width: 20px;
 }
 
 .visible-block {
@@ -4552,6 +4552,15 @@ a.wr-side-panel-toggle-btn.selected {
     background: #f4f4f4;
 }
 
+.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i{
+    color: #526A84;
+}
+.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x{
+    color: #fff;
+}
+.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x.fw-stroke.fw-inverse{
+    color: #526A84;
+}
 .wr-advance-operations .wr-hidden-operations-nav a.selected, .wr-hidden-operations .wr-hidden-operations-nav a.selected:hover {
     color: #ffffff;
     background: #526A84;
@@ -5515,7 +5524,7 @@ ul.listing li.grouped-input ul.grouped-child-input.disabled {
     position: absolute;
     right: 0;
     height: 10000px;
-    width: 60px;
+    width: 20px;
 }
 body.inverse .fade-edge:after {
     content: "";
@@ -5528,7 +5537,7 @@ body.inverse .fade-edge:after {
     position: absolute;
     right: 0;
     height: 10000px;
-    width: 60px;
+    width: 20px;
 }
 
 /* ========================================================================
@@ -5752,7 +5761,7 @@ body.inverse .fade-edge:after {
     position: absolute;
     right: 0;
     height: 10000px;
-    width: 60px;
+    width: 20px;
 }
 .table.table-selectable > tbody > tr:hover {
     cursor: pointer;
@@ -6495,3 +6504,6 @@ select > option:hover {
   /*background:url('http://cdn-sg1.pgimgs.com/images/pg/close-button.png') no-repeat center center;*/
 }
 
+.label-bold{
+    font-weight:400;
+}