diff --git a/static/images/logo/dbxcornerlogo@2x.png b/static/images/logo/dbxcornerlogo@2x.png
new file mode 100644
index 0000000000..ee41c0f282
Binary files /dev/null and b/static/images/logo/dbxcornerlogo@2x.png differ
diff --git a/static/js/notifications.js b/static/js/notifications.js
index 4e1e8e72df..b8e3b3caea 100644
--- a/static/js/notifications.js
+++ b/static/js/notifications.js
@@ -143,7 +143,7 @@ exports.redraw_title = function () {
     var n;
 
     var new_title = (new_message_count ? ("(" + new_message_count + ") ") : "")
-        + page_params.realm_name + " - Zulip";
+        + page_params.realm_name + " - " + page_params.product_name;
 
     if (document.title === new_title) {
         return;
diff --git a/static/templates/settings_tab.handlebars b/static/templates/settings_tab.handlebars
index f7fe3ee5fc..c090fbd783 100644
--- a/static/templates/settings_tab.handlebars
+++ b/static/templates/settings_tab.handlebars
@@ -89,7 +89,7 @@
   <div>
     <div id="notification-settings" class="settings-section">
       <div class="settings-section-title"><i class="icon-vector-warning-sign settings-section-icon"></i>Notifications</div>
-      <div class="notification-reminder">You'll receive notifications when a message arrives and Zulip isn't in focus or the message is offscreen.</div>
+      <div class="notification-reminder">You'll receive notifications when a message arrives and {{ page_params.product_name }} isn't in focus or the message is offscreen.</div>
       <div class="alert" id="notify-settings-status"></div>
       <div class="notification-settings-form">
         <h4>Stream messages</h4>
@@ -314,11 +314,11 @@
 {{#if_or page_params.show_autoscroll_forever_option page_params.show_default_desktop_notifications_option}}
 <div class="ui-settings">
   <div id="ui-settings" class="settings-section">
-    <div class="settings-section-title"><i class="icon-vector-beaker settings-section-icon"></i>Zulip Labs</div>
+    <div class="settings-section-title"><i class="icon-vector-beaker settings-section-icon"></i>{{ page_params.product_name }} Labs</div>
     <div class="alert" id="ui-settings-status"></div>
     <div class="ui-settings-form">
       <p>
-        Zulip Labs is where you can try out some experimental new
+        {{ page_params.product_name }} Labs is where you can try out some experimental new
         features we're working on. Let us know what you think!
       </p>
       <div class="control-group">
diff --git a/templates/zerver/base.html b/templates/zerver/base.html
index 155532f207..895a8d32ab 100644
--- a/templates/zerver/base.html
+++ b/templates/zerver/base.html
@@ -9,7 +9,7 @@
     <meta charset="UTF-8">
     {% block title %}
         {% if user_profile.realm.name %}
-        <title>{{user_profile.realm.name}} - Zulip</title>
+        <title>{{user_profile.realm.name}} - {{product_name}}</title>
         {% else %}
         <title>Zulip</title>
         {% endif %}
diff --git a/templates/zerver/home.html b/templates/zerver/home.html
index e12ce841bf..6410ba104f 100644
--- a/templates/zerver/home.html
+++ b/templates/zerver/home.html
@@ -3,7 +3,7 @@
       <div id="loading_more_messages_indicator"></div>
       <div id="page_loading_indicator"></div>
       <div id="first_run_message" class="empty_feed_notice">
-        <h4>Welcome to Zulip</h4>
+        <h4>Welcome to {{product_name}}</h4>
         <p>See, the thing about it is... there aren't any messages
         here for you right now. I'm sure someone will eventually send
         you one.</p>
diff --git a/templates/zerver/invite_user.html b/templates/zerver/invite_user.html
index f5def7e661..416e0ca5fd 100644
--- a/templates/zerver/invite_user.html
+++ b/templates/zerver/invite_user.html
@@ -2,7 +2,7 @@
      aria-labelledby="invite-user-label" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="invite-user-label">Invite coworkers to Zulip</h3>
+    <h3 id="invite-user-label">Invite coworkers to {{product_name}}</h3>
   </div>
   <form id="invite_user_form" class="form-horizontal"
         action="/json/invite_users" method="POST">{% csrf_token %}
diff --git a/templates/zerver/markdown_help.html b/templates/zerver/markdown_help.html
index b448ba3923..ba5037ba24 100644
--- a/templates/zerver/markdown_help.html
+++ b/templates/zerver/markdown_help.html
@@ -18,8 +18,8 @@
           <td><b>bold</b></td>
         </tr>
         <tr>
-          <td>[Zulip](http://zulip.com)</td>
-          <td><a href="http://zulip.com" target="_blank">Zulip</a></td>
+          <td>[{{product_name}}](https://zulip.com)</td>
+          <td><a href="https://zulip.com" target="_blank">{{product_name}}</a></td>
         </tr>
         <tr>
           <td>* Archimedes<br/>
@@ -54,19 +54,19 @@
         <tr>
           <td class="preserve_spaces">```
 def zulip():
-    print "Zulip"
+    print "{{product_name}}"
 ```</td>
           <td><pre>def zulip():
-    print "Zulip"</pre></td>
+    print "{{product_name}}"</pre></td>
         </tr>
         <tr>
           <td class="preserve_spaces">``` .py
 def zulip():
-    print "Zulip"
+    print "{{product_name}}"
 ```</td>
           <td>
             <div class="codehilite"><pre><span class="k">def</span> <span class="nf">zulip</span><span class="p">():</span>
-    <span class="k">print</span> <span class="s">"Zulip"</span></pre></div>
+    <span class="k">print</span> <span class="s">"{{product_name}}"</span></pre></div>
           </td>
         </tr>
         <tr>
diff --git a/templates/zerver/navbar.html b/templates/zerver/navbar.html
index 023e1c32f6..290b3c5ca2 100644
--- a/templates/zerver/navbar.html
+++ b/templates/zerver/navbar.html
@@ -1,7 +1,7 @@
 <div class="header">
 <div class="header-main rightside-userlist" id="top_navbar">
   <div class="column-left">
-          <a class="brand logo" href="#"><img src="/static/images/logo/zulipcornerlogo@2x.png" class="logoimage" alt="Zulip" content="Zulip" /></a>
+    <a class="brand logo" href="#"><img src="/static/images/logo/{% if dbx_branding %}dbx{% else %}zulip{% endif %}cornerlogo@2x.png" class="logoimage" alt="{{product_name}}" content="{{product_name}}" /></a>
   </div>
   <div class="column-middle" id="navbar-middle">
     <div class="column-middle-inner">
@@ -93,7 +93,7 @@
                     </a>
                   </li>
                   {% if show_invites %}
-                  <li title="Invite coworkers to Zulip">
+                  <li title="Invite coworkers to {{product_name}}">
                     <a href="#invite-user" role="button" data-toggle="modal">
                       <i class="icon-vector-plus-sign"></i> Invite coworkers
                     </a>
@@ -108,8 +108,7 @@
                   {% endif %}
                   <li class="divider"></li>
                   {% if show_webathena %}
-                  <li title="Grant Zulip the Kerberos tickets needed to run your Zephyr
-                             mirror via Webathena" id="webathena_login_menu">
+                  <li title="Grant {{product_name}} the Kerberos tickets needed to run your Zephyr mirror via Webathena" id="webathena_login_menu">
                     <a href="#webathena" class="webathena_login">
                       <i class="icon-vector-bolt"></i>Link with Webathena
                     </a>
diff --git a/templates/zerver/right-sidebar.html b/templates/zerver/right-sidebar.html
index bbe031a101..a1455a03ec 100644
--- a/templates/zerver/right-sidebar.html
+++ b/templates/zerver/right-sidebar.html
@@ -1,17 +1,17 @@
           <div class="right-sidebar" id="right-sidebar">
               <div class="alert alert_sidebar alert-error home-error-bar" id="connection-error">
-                <strong>Unable to connect to Zulip.</strong>  Updates may be delayed.
+                <strong>Unable to connect to {{product_name}}.</strong>  Updates may be delayed.
                 <br /><br /> Retrying soon... <br /><br /> <a class="restart_get_updates_button">Try now</a>.
               </div>
               <div class="alert alert_sidebar alert-error home-error-bar" id="get_old_messages_error">
-                <strong>Unable to connect to Zulip.</strong>  Could not fetch messages.
+                <strong>Unable to connect to {{product_name}}.</strong>  Could not fetch messages.
                 <br /><br /> Retrying soon... <br /><br />
               </div>
               <div class="alert alert_sidebar alert-error home-error-bar" id="zephyr-mirror-error">
                 <strong>Your Zephyr mirror is not working.</strong>
                   <span id="normal-zephyr-mirror-error-text">We
                   recommend that you <a class="webathena_login">give
-                  Zulip the ability to mirror the messages for you via
+                  {{product_name}} the ability to mirror the messages for you via
                   WebAthena</a>.  If you'd prefer, you can instead
                   <a href="/zephyr-mirror" target="_blank">run the Zephyr mirror script yourself</a>
                   in a screen session.</span>
@@ -30,11 +30,11 @@
               $(function () {
                   if (window.bridge !== undefined) {
                       // Desktop app only supports "prompt", not "alert" or "confirm" :/
-                      if (window.prompt("You're currently on the production Zulip server, but everyone else is on the staging server.\n\nPress OK to be redirected there now.\n\nGoing forward, please run Zulip with the following flag to use the staging server:", "--site https://staging.zulip.com") !== null) {
+                      if (window.prompt("You're currently on the production {{product_name}} server, but everyone else is on the staging server.\n\nPress OK to be redirected there now.\n\nGoing forward, please run {{product_name}} with the following flag to use the staging server:", "--site https://staging.zulip.com") !== null) {
                           window.location.assign("https://staging.zulip.com");
                       }
                   } else {
-                      if (window.confirm("You're currently on the production Zulip server, but everyone else is on the staging server. Please use https://staging.zulip.com to use Zulip.\n\nPress OK to be redirected there now.")) {
+                      if (window.confirm("You're currently on the production {{product_name}} server, but everyone else is on the staging server. Please use https://staging.zulip.com to use {{product_name}}.\n\nPress OK to be redirected there now.")) {
                         window.location.assign("https://staging.zulip.com");
                       }
                   }
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index b837d7f67d..1dd0c32d50 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -1005,6 +1005,13 @@ def home(request):
     if page_params['domain'] == "zulip.com" and not page_params['staging']:
         send_to_staging = True
 
+    dbx_branding = False
+    product_name = "Zulip"
+    if page_params['domain'] == "zulip.com":
+        dbx_branding = True
+        product_name = "Dropbox Chat"
+
+    page_params['product_name'] = product_name
     request._log_data['extra'] = "[%s]" % (register_ret["queue_id"],)
     response = render_to_response('zerver/index.html',
                                   {'user_profile': user_profile,
@@ -1019,6 +1026,8 @@ def home(request):
                                    'enable_feedback': settings.ENABLE_FEEDBACK,
                                    'embedded': narrow_stream is not None,
                                    'send_to_staging': send_to_staging,
+                                   'dbx_branding': dbx_branding,
+                                   'product_name': product_name
                                    },
                                   context_instance=RequestContext(request))
     patch_cache_control(response, no_cache=True, no_store=True, must_revalidate=True)