diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png
index a1deab3581..43c53c4066 100644
Binary files a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png and b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png differ
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png
index 8fc1947a6a..b4cba1d37c 100644
Binary files a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png and b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png differ
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png
index a1deab3581..43c53c4066 100644
Binary files a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png and b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png differ
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.png b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.png
new file mode 100644
index 0000000000..6a20ca274f
Binary files /dev/null and b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.png differ
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.svg b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.svg
deleted file mode 100644
index 72323a3fd0..0000000000
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<svg version="1.1" id="wso2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="29 -6.639 72 27.639" enable-background="new 29 -6.639 72 27.639" xml:space="preserve">
-<g>
-	<circle fill="#F47B20" cx="82.076" cy="4.192" r="8.691"/>
-	<path d="M90.804,3.776l-0.01-0.115h-0.115c-0.53-0.001-1.061,0-1.594,0c-0.531,0-1.062,0-1.593,0h-0.073l-0.035,0.063
-		c-0.402,0.711-0.798,1.425-1.193,2.14L85.843,6.49c-0.601-1.454-1.198-2.908-1.795-4.363c-0.63-1.535-1.26-3.07-1.895-4.603
-		l-0.11-0.266l-0.119,0.262c-0.456,1.005-0.908,2.013-1.359,3.021c-0.62,1.383-1.261,2.812-1.905,4.212
-		c-0.897-0.008-1.794-0.007-2.695-0.006c-0.823,0.001-1.648,0.002-2.475-0.004l-0.128-0.001l0.002,0.128
-		c0.004,0.278,0.044,0.554,0.083,0.821l0.021,0.148h0.108c1.432-0.002,2.863-0.002,4.293-0.001h1.512l0.034-0.073
-		c0.44-0.972,0.878-1.947,1.316-2.921c0.421-0.938,0.842-1.875,1.267-2.811c0.643,1.552,1.279,3.106,1.917,4.661
-		c0.558,1.359,1.115,2.719,1.677,4.077l0.098,0.237l0.127-0.224c0.576-1.025,1.147-2.054,1.719-3.082l0.528-0.951
-		c0.876,0,1.751,0,2.625,0h0.115l0.01-0.115C90.834,4.383,90.832,4.11,90.804,3.776z"/>
-	<path fill="#F47B20" d="M29-6.61c0.849,0.001,1.696-0.002,2.545,0.002c2.065,5.082,4.121,10.169,6.198,15.247
-		c2.069-5.093,4.122-10.194,6.213-15.278c2.067,5.095,4.138,10.188,6.205,15.283c2.068-5.084,4.126-10.172,6.198-15.255
-		c0.857,0.001,1.716-0.002,2.573,0.001c-2.883,7.122-5.778,14.24-8.658,21.364c-0.008,0.103-0.157,0.273-0.192,0.074
-		c-2.042-5.053-4.094-10.1-6.127-15.157c-2.084,5.111-4.142,10.233-6.216,15.347C34.82,7.813,31.908,0.602,29-6.61z"/>
-	<path fill="#F47B20" d="M60.721-5.513c1.362-0.97,3.118-1.239,4.751-1.046c1.875,0.271,3.473,1.576,4.363,3.213
-		c-0.618,0.407-1.25,0.793-1.865,1.205c-0.329-0.36-0.55-0.802-0.893-1.15c-0.453-0.498-1.041-0.895-1.709-1.027
-		c-1.316-0.275-2.805,0.074-3.734,1.083c-0.996,1.055-1.006,3.01,0.193,3.919c0.841,0.609,1.756,1.108,2.677,1.586
-		c1.174,0.532,2.363,1.052,3.429,1.787c0.741,0.523,1.531,1.047,2,1.847c0.684,1.164,0.755,2.589,0.537,3.894
-		c-0.291,1.735-1.421,3.248-2.881,4.192c-1.289,0.842-2.883,1.128-4.401,0.968c-1.382-0.108-2.744-0.654-3.748-1.624
-		c-1.047-0.983-1.665-2.335-1.985-3.718c0.763-0.234,1.526-0.463,2.288-0.698c0.283,1.176,0.807,2.364,1.789,3.12
-		c0.933,0.742,2.211,0.893,3.355,0.68c1.338-0.239,2.507-1.217,3.011-2.474c0.314-0.84,0.416-1.786,0.158-2.653
-		c-0.175-0.6-0.595-1.103-1.111-1.443c-1.075-0.714-2.207-1.342-3.385-1.869c-0.904-0.408-1.784-0.874-2.603-1.436
-		c-0.654-0.453-1.336-0.917-1.767-1.604c-0.69-1.087-0.784-2.461-0.533-3.698C58.902-3.703,59.689-4.796,60.721-5.513z"/>
-	<path fill="#FFFFFF" d="M81.274-6.595c1.743-0.113,3.52,0.152,5.121,0.864c3.276,1.389,5.746,4.501,6.343,8.011
-		c0.419,2.347,0.048,4.832-1.074,6.939c-1.465,2.814-4.231,4.91-7.342,5.546c-2.047,0.43-4.217,0.261-6.168-0.498
-		c-1.884-0.728-3.556-1.996-4.76-3.617c-1.276-1.699-2.032-3.785-2.128-5.908c-0.145-2.528,0.646-5.1,2.194-7.105
-		C75.301-4.806,78.221-6.391,81.274-6.595z M79.977-4.147c-2.324,0.573-4.367,2.172-5.489,4.285
-		c-0.785,1.439-1.099,3.101-1.022,4.731h0.024c0.004,0.283,0.047,0.565,0.088,0.846c0.455,2.707,2.287,5.133,4.77,6.303
-		c1.988,0.968,4.358,1.12,6.453,0.409c1.752-0.574,3.295-1.744,4.35-3.254c0.934-1.328,1.469-2.926,1.538-4.546
-		c0.024-0.281,0.014-0.561-0.009-0.841c-0.083-1.637-0.639-3.25-1.596-4.581c-1.104-1.553-2.738-2.719-4.566-3.258
-		C83.049-4.491,81.462-4.526,79.977-4.147z"/>
-	<path fill="#FFFFFF" d="M93.688,3.448c1.131-0.311,2.351-0.314,3.479,0.015c1.542,0.453,2.786,1.721,3.318,3.223
-		c0.526,1.563,0.294,3.35-0.576,4.747c-0.709,1.137-1.603,2.146-2.506,3.132c-1.461,1.578-2.927,3.152-4.387,4.732
-		c2.661-0.004,5.322-0.001,7.983-0.002c-0.001,0.568,0.001,1.136-0.001,1.705c-3.943-0.004-7.886,0.003-11.829-0.003
-		c2.519-2.731,5.062-5.44,7.571-8.18c0.917-1.088,1.998-2.181,2.249-3.64c0.232-1.143-0.129-2.387-0.985-3.189
-		c-1.102-1.147-2.93-1.389-4.359-0.759C93.685,4.637,93.755,4.04,93.688,3.448z"/>
-</g>
-</svg>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.png b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.png
new file mode 100644
index 0000000000..b4cba1d37c
Binary files /dev/null and b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.png differ
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.svg b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.svg
deleted file mode 100644
index f7188ed8ab..0000000000
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<svg version="1.1" id="wso2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="29 -6.639 72 27.639" enable-background="new 29 -6.639 72 27.639" xml:space="preserve">
-<circle fill="#F47B20" cx="82.076" cy="4.192" r="8.691"/>
-<path fill="#FFFFFF" d="M90.804,3.776l-0.01-0.115h-0.115c-0.53-0.001-1.061,0-1.594,0c-0.531,0-1.062,0-1.593,0h-0.073
-	l-0.035,0.063c-0.402,0.711-0.798,1.425-1.193,2.14L85.843,6.49c-0.601-1.454-1.198-2.908-1.795-4.363
-	c-0.63-1.535-1.26-3.07-1.895-4.603l-0.11-0.266L81.924-2.48c-0.456,1.005-0.908,2.013-1.359,3.021
-	c-0.62,1.383-1.261,2.812-1.905,4.212c-0.897-0.008-1.794-0.007-2.695-0.006c-0.823,0.001-1.648,0.002-2.475-0.004l-0.128-0.001
-	l0.002,0.128c0.004,0.278,0.044,0.554,0.083,0.821l0.021,0.148h0.108c1.432-0.002,2.863-0.002,4.293-0.001h1.512l0.034-0.073
-	c0.44-0.972,0.878-1.947,1.316-2.921c0.421-0.938,0.842-1.875,1.267-2.811c0.643,1.552,1.279,3.106,1.917,4.661
-	c0.558,1.359,1.115,2.719,1.677,4.077l0.098,0.237l0.127-0.224c0.576-1.025,1.147-2.054,1.719-3.082l0.528-0.951
-	c0.876,0,1.751,0,2.625,0h0.115l0.01-0.115C90.834,4.383,90.831,4.109,90.804,3.776z"/>
-<path fill="#F47B20" d="M29-6.61c0.849,0.001,1.696-0.002,2.545,0.002c2.065,5.082,4.121,10.169,6.198,15.247
-	c2.069-5.093,4.122-10.194,6.213-15.278c2.067,5.095,4.138,10.188,6.205,15.283c2.068-5.084,4.126-10.172,6.198-15.255
-	c0.857,0.001,1.716-0.002,2.573,0.001c-2.883,7.122-5.778,14.24-8.658,21.364c-0.008,0.103-0.157,0.273-0.192,0.074
-	c-2.042-5.053-4.094-10.1-6.127-15.157c-2.084,5.111-4.142,10.233-6.216,15.347C34.82,7.812,31.908,0.602,29-6.61z"/>
-<path fill="#F47B20" d="M60.721-5.513c1.362-0.97,3.118-1.239,4.751-1.046c1.875,0.271,3.473,1.576,4.363,3.213
-	c-0.618,0.407-1.25,0.793-1.865,1.205c-0.329-0.36-0.55-0.802-0.893-1.15c-0.453-0.498-1.041-0.895-1.709-1.027
-	c-1.316-0.275-2.805,0.074-3.734,1.083c-0.996,1.055-1.006,3.01,0.193,3.919c0.841,0.609,1.756,1.108,2.677,1.586
-	c1.174,0.532,2.363,1.052,3.429,1.787c0.741,0.523,1.531,1.047,2,1.847c0.684,1.164,0.755,2.589,0.537,3.894
-	c-0.291,1.735-1.421,3.248-2.881,4.192c-1.289,0.842-2.883,1.128-4.401,0.968c-1.382-0.108-2.744-0.654-3.748-1.624
-	c-1.047-0.983-1.665-2.335-1.985-3.718c0.763-0.234,1.526-0.463,2.288-0.698c0.283,1.176,0.807,2.364,1.789,3.12
-	c0.933,0.742,2.211,0.893,3.355,0.68c1.338-0.239,2.507-1.217,3.011-2.474c0.314-0.84,0.416-1.786,0.158-2.653
-	c-0.175-0.6-0.595-1.103-1.111-1.443c-1.075-0.714-2.207-1.342-3.385-1.869c-0.904-0.408-1.784-0.874-2.603-1.436
-	c-0.654-0.453-1.336-0.917-1.767-1.604c-0.69-1.087-0.784-2.461-0.533-3.698C58.902-3.703,59.689-4.796,60.721-5.513z"/>
-<path fill="#060709" d="M81.274-6.596c1.743-0.113,3.52,0.152,5.121,0.864c3.276,1.389,5.746,4.501,6.343,8.011
-	c0.419,2.347,0.048,4.832-1.074,6.939c-1.465,2.814-4.231,4.91-7.342,5.546c-2.047,0.43-4.217,0.261-6.168-0.498
-	c-1.884-0.728-3.556-1.996-4.76-3.617c-1.276-1.699-2.032-3.785-2.128-5.908c-0.145-2.528,0.646-5.1,2.194-7.105
-	C75.301-4.806,78.221-6.391,81.274-6.596z M79.977-4.147c-2.324,0.573-4.367,2.172-5.489,4.285
-	c-0.785,1.439-1.099,3.101-1.022,4.731h0.024c0.004,0.283,0.047,0.565,0.088,0.846c0.455,2.707,2.287,5.133,4.77,6.303
-	c1.988,0.968,4.358,1.12,6.453,0.409c1.752-0.574,3.295-1.744,4.35-3.254c0.934-1.328,1.469-2.926,1.538-4.546
-	c0.024-0.281,0.014-0.561-0.009-0.841c-0.083-1.637-0.639-3.25-1.596-4.581c-1.104-1.553-2.738-2.719-4.566-3.258
-	C83.049-4.491,81.462-4.526,79.977-4.147z"/>
-<path fill="#060709" d="M93.688,3.447c1.131-0.311,2.351-0.314,3.479,0.015c1.542,0.453,2.786,1.721,3.318,3.223
-	c0.526,1.563,0.294,3.35-0.576,4.747c-0.709,1.137-1.603,2.146-2.506,3.132c-1.461,1.578-2.927,3.152-4.387,4.732
-	c2.661-0.004,5.322-0.001,7.983-0.002c-0.001,0.568,0.001,1.136-0.001,1.705c-3.943-0.004-7.886,0.003-11.829-0.003
-	c2.519-2.731,5.062-5.44,7.571-8.18c0.917-1.088,1.998-2.181,2.249-3.64c0.232-1.143-0.129-2.387-0.985-3.189
-	c-1.102-1.147-2.93-1.389-4.359-0.759C93.685,4.637,93.755,4.04,93.688,3.447z"/>
-</svg>