diff --git a/frappe/core/doctype/domain/domain.json b/frappe/core/doctype/domain/domain.json
index f257d02ae8..3ba8acdc0e 100644
--- a/frappe/core/doctype/domain/domain.json
+++ b/frappe/core/doctype/domain/domain.json
@@ -49,12 +49,12 @@
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
- "in_create": 1, 
+ "in_create": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-07-26 21:29:00.353105", 
+ "modified": "2017-09-15 12:26:21.827149", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "Domain", 
@@ -65,7 +65,7 @@
    "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 0, 
-   "create": 0, 
+   "create": 1, 
    "delete": 0, 
    "email": 1, 
    "export": 1, 
@@ -75,15 +75,15 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Administrator", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
-   "write": 0
+   "write": 1
   }
  ], 
  "quick_entry": 1, 
- "read_only": 1, 
+ "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "domain", 
  "show_name_in_global_search": 0, 
diff --git a/frappe/public/js/frappe/form/templates/grid_body.html b/frappe/public/js/frappe/form/templates/grid_body.html
index a510b48ea4..8b3a1b6082 100644
--- a/frappe/public/js/frappe/form/templates/grid_body.html
+++ b/frappe/public/js/frappe/form/templates/grid_body.html
@@ -11,7 +11,7 @@
                             {%= __("Delete") %}</button>
         				<button type="reset"
 							class="grid-add-multiple-rows btn btn-xs btn-default hide"
-                            style="margin-right: 10px;">
+                            style="margin-right: 4px;">
                             {%= __("Add Multiple") %}</a>
 						<!-- hack to allow firefox include this in tabs -->
         				<button type="reset" class="btn btn-xs btn-default grid-add-row">
diff --git a/frappe/public/js/frappe/ui/app_icon.js b/frappe/public/js/frappe/ui/app_icon.js
index 8408a7af0d..52255462ee 100644
--- a/frappe/public/js/frappe/ui/app_icon.js
+++ b/frappe/public/js/frappe/ui/app_icon.js
@@ -7,6 +7,10 @@ frappe.ui.app_icon = {
 	get_html: function(module, small) {
 		var icon = module.icon;
 		var color = module.color;
+		if (icon
+			&& icon.match(/([\uE000-\uF8FF]|\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDDFF])/g)) {
+				module.emoji = module.icon;
+			}
 		var icon_style = "";
 		if(module.reverse) {
 			icon_style = "color: #36414C;";
@@ -17,10 +21,10 @@ frappe.ui.app_icon = {
 		}
 
 		// first letter
-		if(!icon) {
+		if(!icon || module.emoji) {
 			icon = '<span class="inner" ' +
 				(module.reverse ? ('style="' + icon_style + '"') : '')
-				+ '>' + module._label[0].toUpperCase() + '</span>';
+				+ '>' + (module.emoji || module._label[0].toUpperCase()) + '</span>';
 		} else if(icon.split(".").slice(-1)[0]==="svg") {
 			$.ajax({
 				url: frappe.urllib.get_full_url(icon),
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index 9938f1f042..83c3ffe96f 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -195,7 +195,12 @@ _f.Frm.prototype.watch_model_updates = function() {
 	frappe.model.on(me.doctype, "*", function(fieldname, value, doc) {
 		// set input
 		if(doc.name===me.docname) {
-			me.dirty();
+			if (!value && !doc[value]) {
+				// both the incoming and outgoing values are falsy
+				// so don't trigger dirty
+			} else {
+				me.dirty();
+			}
 			me.fields_dict[fieldname]
 				&& me.fields_dict[fieldname].refresh(fieldname);