diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
index c84c83189..dd139e656 100644
--- a/src/components/structures/CompatibilityPage.js
+++ b/src/components/structures/CompatibilityPage.js
@@ -39,9 +39,9 @@ module.exports = React.createClass({
         return (
         <div className="mx_CompatibilityPage">
             <div className="mx_CompatibilityPage_box">
-                <p>Sorry, your browser is <b>not</b> able to run Vector.</p>
+                <p>Sorry, your browser is <b>not</b> able to run Riot.</p>
                 <p>
-                Vector uses many advanced browser features, some of which are not
+                Riot uses many advanced browser features, some of which are not
                 available or experimental in your current browser.
                 </p>
                 <p>
diff --git a/src/components/views/globals/GuestWarningBar.js b/src/components/views/globals/GuestWarningBar.js
index dcd92806f..51d2ce652 100644
--- a/src/components/views/globals/GuestWarningBar.js
+++ b/src/components/views/globals/GuestWarningBar.js
@@ -34,7 +34,7 @@ module.exports = React.createClass({
             <div className="mx_GuestWarningBar">
                 <img className="mx_GuestWarningBar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
                 <div>
-                    You are using Vector as a guest. <a onClick={this.onRegisterClicked}>Register</a> or <a onClick={this.onLoginClicked}>log in</a> to access more rooms and features.
+                    You are using Riot as a guest. <a onClick={this.onRegisterClicked}>Register</a> or <a onClick={this.onLoginClicked}>log in</a> to access more rooms and features.
                 </div>
             </div>
         );
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
index 8d819323a..1aa7d55bb 100644
--- a/src/components/views/globals/NewVersionBar.js
+++ b/src/components/views/globals/NewVersionBar.js
@@ -39,7 +39,7 @@ export default function NewVersionBar(props) {
         <div className="mx_MatrixToolbar">
             <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
             <div className="mx_MatrixToolbar_content">
-                A new version of Vector is available. Refresh your browser.
+                A new version of Riot is available. Refresh your browser.
             </div>
             <button className="mx_MatrixToolbar_action" onClick={onChangelogClicked}>Changelog</button>
         </div>
@@ -49,4 +49,4 @@ export default function NewVersionBar(props) {
 NewVersionBar.propTypes = {
     version: React.PropTypes.string.isRequired,
     newVersion: React.PropTypes.string.isRequired,
-};
\ No newline at end of file
+};
diff --git a/src/components/views/login/VectorCustomServerDialog.js b/src/components/views/login/VectorCustomServerDialog.js
index f985d3f8d..0319c30f6 100644
--- a/src/components/views/login/VectorCustomServerDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@@ -33,7 +33,7 @@ module.exports = React.createClass({
                         You can use the custom server options to log into other Matrix
                         servers by specifying a different Home server URL.
                         <br/>
-                        This allows you to use Vector with an existing Matrix account on
+                        This allows you to use Riot with an existing Matrix account on
                         a different home server.
                         <br/>
                         <br/>
diff --git a/src/components/views/login/VectorLoginFooter.js b/src/components/views/login/VectorLoginFooter.js
index a5c6bbf8d..83b72867f 100644
--- a/src/components/views/login/VectorLoginFooter.js
+++ b/src/components/views/login/VectorLoginFooter.js
@@ -25,10 +25,10 @@ module.exports = React.createClass({
     },
 
     render: function() {
+        //<a href="https://medium.com/@Vector">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;-->
         return (
             <div className="mx_Login_links">
-                <a href="https://medium.com/@Vector">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-                <a href="https://twitter.com/@VectorCo">twitter</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
+                <a href="https://twitter.com/@RiotChat">twitter</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://github.com/vector-im/vector-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://matrix.org">powered by Matrix</a>
             </div>
diff --git a/src/components/views/login/VectorLoginHeader.js b/src/components/views/login/VectorLoginHeader.js
index 0a3a8c510..01ec694c0 100644
--- a/src/components/views/login/VectorLoginHeader.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -27,7 +27,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_Login_logo">
-                <img src="img/logo.png" width="249" height="78" alt="vector"/>
+                <img src="img/logo.png" height="200" alt="Riot"/>
             </div>
         );
     }
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index b6f880db1..63a83568f 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -132,7 +132,7 @@ module.exports = React.createClass({
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
                 title: "Error saving email notification preferences",
-                description: "Vector was unable to save your email notification preferences.",
+                description: "An error occurred whilst saving your email notification preferences.",
             });
         });
     },
@@ -784,7 +784,7 @@ module.exports = React.createClass({
                 <div>
                     <h3>Advanced notifications settings</h3>
                     There are advanced notifications which are not shown here.<br/>
-                    You might have configured them in another client than Vector. You cannot tune them in Vector but they still apply.
+                    You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply.
                     <ul>
                         { externalRules }
                     </ul>
diff --git a/src/skins/vector/img/logo.png b/src/skins/vector/img/logo.png
index 51d4dd5f7..61c6dd3cb 100644
Binary files a/src/skins/vector/img/logo.png and b/src/skins/vector/img/logo.png differ
diff --git a/src/vector/index.js b/src/vector/index.js
index fff61bed4..acad100ba 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -208,13 +208,13 @@ async function loadApp() {
 
     if (!preventRedirect) {
         if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-            if (confirm("Vector is not supported on mobile web. Install the app?")) {
+            if (confirm("Riot is not supported on mobile web. Install the app?")) {
                 window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067";
                 return;
             }
         }
         else if (/Android/.test(navigator.userAgent)) {
-            if (confirm("Vector is not supported on mobile web. Install the app?")) {
+            if (confirm("Riot is not supported on mobile web. Install the app?")) {
                 window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha";
                 return;
             }