diff --git a/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json
index 867a9681..7ab06050 100644
--- a/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json
+++ b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json
@@ -1,28 +1,29 @@
 {
- "attach_print": 0, 
- "condition": "doc.paid and doc.amount and not doc.thank_you_email_sent", 
- "creation": "2017-07-07 11:29:54.935820", 
- "days_in_advance": 0, 
- "docstatus": 0, 
- "doctype": "Email Alert", 
- "document_type": "Conference Participant", 
- "enabled": 1, 
- "event": "Save", 
- "idx": 0, 
- "is_standard": 1, 
- "message": "Dear {{ doc.conference_participant }},<br><br>\n\n<p>Thank you for registering for the 2017 Conference!</p>\n\n<p>Here are your ticket details:</p>\n\n<p>\nFull Conference Tickets: {{ doc.full_conference_tickets or 0 }}\n<br>\nUser Conference Tickets: {{ doc.user_conference_tickets or 0 }}\n</p>\n\n<p>Total Amount Paid: {{ doc.get_formatted('amount') }}</p>\n\n<p>If you need any help, please email us at foundation@erpnext.com</p>", 
- "modified": "2017-07-07 16:06:47.764297", 
- "modified_by": "Administrator", 
- "module": "ERPNext Foundation", 
- "name": "Conference Registration", 
- "owner": "Administrator", 
- "property_value": "1", 
+ "attach_print": 0,
+ "condition": "doc.paid and doc.amount and not doc.thank_you_email_sent",
+ "creation": "2017-07-07 11:29:54.935820",
+ "days_in_advance": 0,
+ "docstatus": 0,
+ "doctype": "Notification",
+ "channnel": "Email",
+ "document_type": "Conference Participant",
+ "enabled": 1,
+ "event": "Save",
+ "idx": 0,
+ "is_standard": 1,
+ "message": "Dear {{ doc.conference_participant }},<br><br>\n\n<p>Thank you for registering for the 2017 Conference!</p>\n\n<p>Here are your ticket details:</p>\n\n<p>\nFull Conference Tickets: {{ doc.full_conference_tickets or 0 }}\n<br>\nUser Conference Tickets: {{ doc.user_conference_tickets or 0 }}\n</p>\n\n<p>Total Amount Paid: {{ doc.get_formatted('amount') }}</p>\n\n<p>If you need any help, please email us at foundation@erpnext.com</p>",
+ "modified": "2017-07-07 16:06:47.764297",
+ "modified_by": "Administrator",
+ "module": "ERPNext Foundation",
+ "name": "Conference Registration",
+ "owner": "Administrator",
+ "property_value": "1",
  "recipients": [
   {
-   "cc": "team@erpnext.com", 
+   "cc": "team@erpnext.com",
    "email_by_document_field": "owner"
   }
- ], 
- "set_property_after_alert": "thank_you_email_sent", 
+ ],
+ "set_property_after_alert": "thank_you_email_sent",
  "subject": "Thank you for Registering for the Conference"
 }
\ No newline at end of file
diff --git a/foundation/hooks.py b/foundation/hooks.py
index 1802d0d1..c71b93d2 100644
--- a/foundation/hooks.py
+++ b/foundation/hooks.py
@@ -67,7 +67,7 @@ website_context = {
 			], "right":1},
 	],
 	"hide_login": 0,
-	"favicon": "/assets/foundation/img/favicon.ico"
+	"favicon": "/assets/foundation/img/erpnext-logo-black.png"
 }
 # website user home page (by Role)
 # role_home_page = {
diff --git a/foundation/public/img/erpnext-logo-black.png b/foundation/public/img/erpnext-logo-black.png
new file mode 100644
index 00000000..50e721a7
Binary files /dev/null and b/foundation/public/img/erpnext-logo-black.png differ
diff --git a/foundation/public/img/erpnext-logo-black.svg b/foundation/public/img/erpnext-logo-black.svg
new file mode 100644
index 00000000..172d9a45
--- /dev/null
+++ b/foundation/public/img/erpnext-logo-black.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="88px" height="88px" viewBox="0 0 88 88" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
+    <title>erpnext-logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="erpnext-logo" transform="translate(-2.000000, -2.000000)" fill-rule="nonzero">
+            <g id="g1422-7-2" transform="translate(0.025630, 0.428785)" fill="#36414C">
+                <g id="g1418-4-6" transform="translate(0.268998, 0.867736)">
+                    <g id="g1416-4-9" transform="translate(0.749997, 0.000000)">
+                        <path d="M14.1845844,0.703479866 L75.0387175,0.703479866 C82.3677094,0.703479866 88.2679029,6.60367875 88.2679029,13.9326374 L88.2679029,74.7868158 C88.2679029,82.1157744 82.3677094,88.0159833 75.0387175,88.0159833 L14.1845844,88.0159833 C6.85569246,88.0159833 0.955398949,82.1157744 0.955398949,74.7868158 L0.955398949,13.9326374 C0.955398949,6.60367875 6.85569246,0.703479866 14.1845844,0.703479866 L14.1845844,0.703479866 Z" id="path1414-3-4"></path>
+                    </g>
+                </g>
+            </g>
+            <g id="g1444-6-7" transform="translate(27.708247, 23.320960)" fill="#FFFFFF">
+                <path d="M4.06942472,0.507006595 C3.79457554,0.507006595 3.52673783,0.534925429 3.26792241,0.587619847 C3.00908052,0.640314265 2.75926093,0.717948309 2.52171801,0.818098395 C2.40292009,0.868173438 2.28745592,0.924056085 2.17495509,0.985013441 C1.94997987,1.10692286 1.73828674,1.24983755 1.54244215,1.41134187 C0.661062132,2.13811791 0.100674618,3.23899362 0.100674618,4.4757567 L0.100674618,4.71760174 L0.100674618,39.9531653 L0.100674618,40.1945182 C0.100674618,42.3932057 1.87073716,44.1632683 4.06942472,44.1632683 L31.8263867,44.1632683 C34.0250742,44.1632683 35.7951368,42.3932057 35.7951368,40.1945182 L35.7951368,39.9531653 C35.7951368,37.7544777 34.0250742,35.9844152 31.8263867,35.9844152 L8.28000399,35.9844152 L8.28000399,26.0992376 L25.7874571,26.0992376 C27.9861447,26.0992376 29.7562072,24.3291751 29.7562072,22.1304875 L29.7562072,21.8891611 C29.7562072,19.6904735 27.9861447,17.920411 25.7874571,17.920411 L8.28000399,17.920411 L8.28000399,8.68635184 L31.8263867,8.68635184 C34.0250742,8.68635184 35.7951368,6.9162893 35.7951368,4.71760174 L35.7951368,4.4757567 C35.7951368,2.27706914 34.0250742,0.507006595 31.8263867,0.507006595 L4.06942472,0.507006595 Z" id="rect1436-8-4"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file