diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs
index 5fbe77d385..f3f413e962 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs
@@ -17,5 +17,9 @@
 }}
 
 {{#zone "title"}}
-    {{@unit.params.pageTitle}} | {{@app.conf.appName}}
+    {{#if isCloud}}
+        {{@unit.params.pageTitle}} | WSO2 Device Cloud
+    {{else}}
+        {{@unit.params.pageTitle}} | {{@app.conf.appName}}
+    {{/if}}
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.js
new file mode 100644
index 0000000000..76da4c18f0
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.js
@@ -0,0 +1,8 @@
+function onRequest(context) {
+
+    var deviceMgtProps = require("/app/modules/conf-reader/main.js")["conf"];
+    var viewModel = {};
+    viewModel.isCloud = deviceMgtProps.isCloud;
+    return viewModel;
+
+}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/favicon.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/favicon.hbs
index 8274b5e66f..4e56417553 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/favicon.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/favicon.hbs
@@ -16,5 +16,9 @@
   under the License.
 }}
 {{#zone "favicon"}}
-    <link rel="shortcut icon" href="{{@unit.publicUri}}/img/favicon.png" />
+    {{#if isCloud}}
+        <link rel="shortcut icon" href="{{@unit.publicUri}}/img/cloud-favicon.png" />
+    {{else}}
+        <link rel="shortcut icon" href="{{@unit.publicUri}}/img/favicon.png" />
+    {{/if}}
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/favicon.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/favicon.js
new file mode 100644
index 0000000000..76da4c18f0
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/favicon.js
@@ -0,0 +1,8 @@
+function onRequest(context) {
+
+    var deviceMgtProps = require("/app/modules/conf-reader/main.js")["conf"];
+    var viewModel = {};
+    viewModel.isCloud = deviceMgtProps.isCloud;
+    return viewModel;
+
+}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/cloud-favicon.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/cloud-favicon.png
new file mode 100644
index 0000000000..e9d327e613
Binary files /dev/null and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/cloud-favicon.png differ