diff --git a/app.js b/app.js
index fa1e0c10d..ba309dba0 100644
--- a/app.js
+++ b/app.js
@@ -190,7 +190,8 @@ function doJoin() {
         if (path.length > 1) {
             roomnode = path.substr(1).toLowerCase();
         } else {
-            roomnode = Math.random().toString(36).substr(2, 20);
+            roomnode = RoomNameGenerator.generateRoomWithoutSeparator(3);
+
             window.history.pushState('VideoChat',
                     'Room: ' + roomnode, window.location.pathname + roomnode);
         }
@@ -1036,7 +1037,7 @@ $(document).ready(function () {
         {
             var val = $("#enter_room_field").val();
             if(!val)
-                val = $("#enter_room_field").attr("placeholder");
+                val = $("#enter_room_field").attr("room_name");
             window.location.pathname = "/" + val;
         });
 
@@ -1047,20 +1048,30 @@ $(document).ready(function () {
             }
         });
 
+        var updateTimeout;
+        var animateTimeout;
+        $("#reload_roomname").click(function () {
+            clearTimeout(updateTimeout);
+            clearTimeout(animateTimeout);
+            update_roomname();
+        });
+
         function animate(word) {
             var currentVal = $("#enter_room_field").attr("placeholder");
             $("#enter_room_field").attr("placeholder", currentVal + word.substr(0, 1));
-            setTimeout(function() {
+            animateTimeout = setTimeout(function() {
                     animate(word.substring(1, word.length))
-                }, 150);
+                }, 70);
         }
 
+
         function update_roomname()
         {
-
+            var word = RoomNameGenerator.generateRoomWithoutSeparator();
+            $("#enter_room_field").attr("room_name", word);
             $("#enter_room_field").attr("placeholder", "");
-            animate(RoomNameGenerator.generateRoomWithoutSeparator());
-            setTimeout(update_roomname, 10000);
+            animate(word);
+            updateTimeout = setTimeout(update_roomname, 10000);
 
         }
         update_roomname();
diff --git a/css/font.css b/css/font.css
index c03b02c0b..e9fe8c2c7 100755
--- a/css/font.css
+++ b/css/font.css
@@ -99,3 +99,7 @@
 .icon-hangup:before {
     content: "\e617";
 }
+
+.icon-reload:before {
+    content: "\e618";
+}
diff --git a/css/welcome_page.css b/css/welcome_page.css
index 55f1e38dc..9b3b9f81e 100644
--- a/css/welcome_page.css
+++ b/css/welcome_page.css
@@ -3,46 +3,42 @@
     display:none;
 }
 
+.disable_welcome_position
+{
+    margin: -139px auto 0px auto;
+    padding-left: 39px;
+    padding-top: 7px;
+    width: 269px;
+    height: 31px;
+    display:block;
+}
+
 #disable_welcome + label
 {
     background-image: url(../images/welcome_page/disable-welcome.png);
-    display:inline-block;
-    position:absolute;
-    height: 54px;
     cursor: pointer;
     -webkit-user-select: none;
     -moz-user-select: none;
     background-repeat: no-repeat;
-    padding-left: 62px;
-    padding-top: 19px;
     font-weight: 500;
     font-family: Helvetica;
     font-size: 16px;
     color: #acacac;
     z-index: 2;
-    float: left;
-    margin-left: 5px;
 }
 
 #disable_welcome:checked + label
 {
     background-image: url(../images/welcome_page/disable-welcome-selected.png);
-    display:inline-block;
-    position:absolute;
-    height: 54px;
     cursor: pointer;
     -webkit-user-select: none;
     -moz-user-select: none;
     background-repeat: no-repeat;
-    padding-left: 62px;
-    padding-top: 19px;
     font-weight: 500;
     font-family: Helvetica;
     font-size: 16px;
     color: #acacac;
     z-index: 2;
-    float: left;
-    margin-left: 5px;
 }
 
 #enter_room_form {
@@ -68,7 +64,7 @@
 
 #enter_room_field {
     font-size: 16px;
-    padding: 15px 5px 10px 10px;
+    padding: 15px 0px 10px 10px;
     border: none;
     -webkit-appearance: none;
     width: 228px;
@@ -86,8 +82,8 @@
     width: 73px;
     height: 45px;
     background-color: #16a8fe;
-    moz-border-radius: 15px;
-    -webkit-border-radius: 15px;
+    moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
     color: #ffffff;
     font-weight: 600;
     border: none;
@@ -103,7 +99,7 @@
 
 #enter_room_container {
     margin: 70px auto 0px auto;
-    width:531px;
+    display: table;
 }
 
 #enter_room{
@@ -154,20 +150,18 @@
     background-image:url(../images/welcome_page/header-big.png);
     width: 583px;
     height: 274px;
-    margin: -55px auto 0px auto;
+    margin: -110px auto 0px auto;
 }
 
 #header_text
 {
-    left: 200px;
-    top: 150px;
     width: 885px;
     height: 100px;
     color: #ffffff;
     font-family: Helvetica;
     font-size: 24px;
     text-align: center;
-    margin: -139px auto 0px auto;
+    margin: 0px auto 0px auto;
 }
 
 #features
@@ -216,4 +210,16 @@
     padding-top: 30px;
     line-height: 22px;
     font-weight: 200;
+}
+
+#reload_roomname
+{
+    width: 30px;
+    height: 19px;
+    color: #acacac;
+    margin-top: 22px;
+    z-index: 3;
+    float:  left;
+    cursor: pointer;
+    text-align: center;
 }
\ No newline at end of file
diff --git a/debian/jitsi-meet.postinst b/debian/jitsi-meet.postinst
index eab06e568..0befa07e1 100644
--- a/debian/jitsi-meet.postinst
+++ b/debian/jitsi-meet.postinst
@@ -23,15 +23,14 @@ case "$1" in
 
         # nginx conf
         . /etc/default/jitsi-videobridge
-        cp /usr/share/doc/jitsi-meet/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
-        if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ]; then
-            ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
-        fi
-        sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/nginx/sites-available/$JVB_HOSTNAME.conf
-        # FIXME do we need the default?
-        if [ ! -f /etc/nginx/sites-enabled/default ]; then
-            ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+        if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ]; then
+            cp /usr/share/doc/jitsi-meet/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
+            if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ]; then
+                ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
+            fi
+            sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/nginx/sites-available/$JVB_HOSTNAME.conf
         fi
+
         if grep "# server_names_hash_bucket_size 64" /etc/nginx/nginx.conf > /dev/null; then
             sed -i "s/#\ server_names_hash_bucket_size\ 64/\ server_names_hash_bucket_size\ 64/" /etc/nginx/nginx.conf
         fi
diff --git a/fonts/jitsi.eot b/fonts/jitsi.eot
index 9aafd530f..fe5029e8a 100755
Binary files a/fonts/jitsi.eot and b/fonts/jitsi.eot differ
diff --git a/fonts/jitsi.svg b/fonts/jitsi.svg
index 2e319a98a..6f504253b 100755
--- a/fonts/jitsi.svg
+++ b/fonts/jitsi.svg
@@ -31,4 +31,5 @@
 <glyph unicode="&#xe615;" d="M508.412 2.883c-1.026 7.687-2.666 15.269-3.93 22.923-4.167 25.229-16.503 43.252-41.031 53.961-39.187 17.099-77.551 36.060-116.055 54.697-27.843 13.512-26.204 44.26-17.048 57.207 5.945 8.44 11.172 17.286 11.788 28.426 0.222 4.113 4.151 9.495 7.909 11.647 13.035 7.518 19.081 19.782 25.010 32.491 1.555 3.348 3.69 6.594 6.133 9.361 4.236 4.834 6.132 9.618 3.039 15.921-0.717 1.485 0.666 4.167 1.4 6.183 2.152 6.013 5.142 11.838 6.56 18.022 1.778 7.669 2.699 15.612 3.126 23.487 0.187 3.262-3.022 6.764-2.681 9.975 1.741 15.956-7.279 28.101-12.37 41.988-6.233 17.099-18.464 27.81-29.26 40.553-2.033 2.392-2.613 6.526-2.786 9.943-0.36 7.294-3.366 10.898-11.002 9.906-3.055-0.394-6.386-1.248-9.205-0.496-2.478 0.667-6.203 3.144-6.338 5.056-0.769 9.668-4.132 11.258-14.008 9.618-6.182-1.025-14.228 4.577-20.292 8.78-5.072 3.521-9.445 5.023-15.341 3.588-2.457-0.598-5.772-0.495-7.858 0.717-2.221 1.332-4.387 2.119-6.559 2.562v0.374c-0.478-0.016-0.991-0.102-1.469-0.154-0.477 0.051-0.956 0.137-1.434 0.154v-0.375c-2.185-0.444-4.375-1.231-6.578-2.562-2.066-1.213-5.381-1.316-7.84-0.718-5.911 1.434-10.285-0.068-15.342-3.588-6.079-4.202-14.108-9.805-20.292-8.781-9.873 1.641-13.255 0.052-14.024-9.618-0.154-1.912-3.843-4.389-6.338-5.056-2.834-0.752-6.149 0.102-9.223 0.495-7.618 0.992-10.625-2.613-10.985-9.906-0.169-3.416-0.751-7.551-2.784-9.943-10.794-12.743-23.025-23.454-29.278-40.553-5.058-13.886-14.094-26.031-12.335-41.987 0.343-3.211-2.872-6.714-2.7-9.975 0.445-7.875 1.368-15.818 3.127-23.487 1.418-6.184 4.407-12.010 6.576-18.022 0.719-2.016 2.121-4.698 1.384-6.183-3.091-6.303-1.179-11.087 3.058-15.921 2.427-2.767 4.56-6.013 6.115-9.361 5.929-12.709 11.974-24.974 25.007-32.491 3.76-2.152 7.689-7.534 7.929-11.647 0.596-11.14 5.825-19.986 11.785-28.426 9.141-12.947 10.573-43.369-17.081-57.207-38.228-19.132-76.871-37.6-116.021-54.697-24.564-10.709-36.863-28.731-41.032-53.961-1.263-7.656-2.939-15.238-3.929-22.923-1.505-11.464-3.912-34.883-3.912-34.883h512.306c-0.001 0-2.39 23.419-3.894 34.883z" horiz-adv-x="513" />
 <glyph unicode="&#xe616;" d="M513.087 224.534c0-141.673-114.855-256.526-256.554-256.526-141.674 0-256.534 114.851-256.534 256.526 0 141.692 114.861 256.553 256.534 256.553 141.7 0 256.554-114.861 256.554-256.553zM256.534-31.993c67.863 0 129.556 26.356 175.437 69.37-4.858 5.825-11.276 10.557-19.557 14.171-29.467 12.873-58.313 27.128-87.267 41.128-20.935 10.161-19.702 33.293-12.82 43.029 4.471 6.346 8.402 12.999 8.864 21.373 0.166 3.084 3.12 7.142 5.945 8.761 9.802 5.652 14.349 14.873 18.802 24.43 1.17 2.515 2.777 4.945 4.615 7.038 3.185 3.622 4.612 7.218 2.286 11.971-0.543 1.104 0.502 3.12 1.053 4.637 1.619 4.534 3.866 8.901 4.93 13.558 1.335 5.774 2.029 11.74 2.351 17.661 0.14 2.451-2.272 5.092-2.017 7.493 1.31 12.011-5.471 21.136-9.299 31.579-4.688 12.857-13.885 20.91-22.002 30.485-1.529 1.812-1.964 4.919-2.094 7.476-0.269 5.49-2.53 8.207-8.272 7.462-2.299-0.3-4.805-0.943-6.921-0.378-1.864 0.494-4.663 2.362-4.767 3.802-0.577 7.269-3.106 8.465-10.533 7.238-4.648-0.772-10.697 3.429-15.257 6.601-3.816 2.646-7.104 3.777-11.534 2.69-1.849-0.45-4.341-0.373-5.908 0.547-1.671 0.988-3.303 1.592-4.933 1.919v0.276c-0.36-0.007-0.745-0.065-1.104-0.108-0.361 0.044-0.72 0.103-1.078 0.108v-0.276c-1.645-0.327-3.287-0.931-4.945-1.919-1.556-0.918-4.046-0.996-5.899-0.547-4.443 1.087-7.724-0.044-11.532-2.69-4.578-3.173-10.611-7.373-15.259-6.601-7.431 1.226-9.97 0.031-10.547-7.238-0.109-1.439-2.897-3.308-4.758-3.802-2.139-0.565-4.624 0.077-6.944 0.378-5.728 0.745-7.994-1.971-8.258-7.462-0.131-2.555-0.565-5.665-2.095-7.476-8.111-9.575-17.308-17.629-22.009-30.485-3.814-10.443-10.602-19.568-9.285-31.579 0.256-2.401-2.152-5.042-2.023-7.493 0.327-5.923 1.020-11.888 2.351-17.661 1.065-4.656 3.313-9.024 4.945-13.558 0.547-1.516 1.587-3.531 1.041-4.637-2.325-4.754-0.894-8.351 2.291-11.971 1.837-2.094 3.437-4.523 4.612-7.038 4.45-9.555 8.996-18.779 18.798-24.43 2.827-1.619 5.78-5.676 5.952-8.761 0.457-8.374 4.387-15.027 8.869-21.373 6.873-9.735 7.951-32.623-12.837-43.029-28.76-14.386-57.8-28.255-87.251-41.128-8.285-3.615-14.704-8.347-19.561-14.169 45.88-43.015 107.569-69.372 175.422-69.372z" horiz-adv-x="513" />
 <glyph unicode="&#xe617;" d="M32.887 258.374c5.026 4.679 12.994 10.886 21.642 16.349 25.668 16.31 54.057 25.449 83.415 32.066 24.381 5.475 49.123 8.444 74.033 10.101 27.877 1.877 55.779 1.89 83.696 0.399 19.972-1.092 39.843-3.251 59.56-6.606 21.978-3.753 43.519-8.997 64.392-16.875 12.209-4.587 24.086-10.053 35.267-16.786 14.858-8.946 28.276-19.612 38.61-33.674 10.409-14.151 15.861-30.204 16.914-47.696 0.873-13.701 0.358-27.349-2.828-40.794-1.438-6.041-4.113-11.567-8.277-16.193-5.709-6.324-13.212-8.51-21.386-8.818-10.231-0.334-20.205 2.057-30.18 4.113-19.456 3.985-38.918 8.123-58.349 12.364-7.069 1.517-14.344 2.546-20.825 6.298-11.154 6.478-17.223 15.887-17.017 28.892 0.129 8.435 1.108 16.891 1.235 25.348 0.156 12.505-4.962 22.581-15.449 29.521-7.197 4.769-15.347 7.456-23.726 9.333-20.206 4.523-40.693 5.089-61.281 5.025-14.411-0.063-28.791-0.834-43.047-3.071-9.974-1.581-19.781-3.906-28.866-8.507-12.159-6.182-19.677-15.732-20.036-29.676-0.22-8.175 0.487-16.401 0.964-24.575 0.321-5.911-0.040-11.723-2.648-17.144-4.63-9.692-12.468-15.836-22.685-18.482-11.323-2.933-22.802-5.27-34.252-7.611-19.051-3.882-38.108-7.684-57.208-11.259-7.263-1.387-14.627-0.976-21.567 1.801-9.371 3.728-14.462 11.387-17.069 20.668-3.548 12.699-3.921 25.757-3.483 38.865 0.45 13.52 2.942 26.618 9.202 38.803 4.897 9.532 11.246 17.977 21.246 27.821z" horiz-adv-x="513" />
+<glyph unicode="&#xe618;" d="M398.543 56.151c-0.029 0.082-0.060 0.164-0.080 0.243-35.7-22.819-75.891-34.966-117.012-34.966-0.007 0-0.010 0-0.014 0-61.26 0-118.75 26.386-157.734 72.37-49.889 58.849-67.126 164.977-36.511 213.894 2.002-0.831 3.938-1.616 5.84-2.387 6.793-2.756 13.207-5.358 21.153-9.548 3.031-1.601 6.169-2.406 9.337-2.406 5.857 0 11.3 2.824 14.924 7.743 3.907 5.309 5.156 12.389 3.269 18.476l-1.762 5.705c-5.344 17.295-10.862 35.177-17.106 52.539-4.992 13.882-11.2 31.163-29.613 31.163-6.028 0-13.019-1.828-23.365-6.102-22.147-9.159-35.529-14.981-57.267-24.905-7.551-3.444-12.617-11.349-12.601-19.672 0.014-7.921 4.496-14.668 11.988-18.058 9.104-4.128 15.268-6.858 21.734-9.723l5.343-2.377c-50.969-129.551 12.401-263.229 105.657-319.606 41.749-25.237 89.25-38.57 137.385-38.57h0.021c51.36 0 102.781 15.55 142.25 42.599-15.865 14.401-22.783 34.584-25.836 43.586zM549.101 105.045c-9.057 4.288-15.178 7.129-21.611 10.122l-5.248 2.446c53.224 128.634-7.784 263.401-100.034 321.394-42.68 26.832-91.562 41.016-141.358 41.016-52.424 0-103.205-15.297-142.983-43.083l-2.692-1.882c15.798-13.782 22.93-33.394 26.459-43.205 36.463 23.97 77.838 36.704 119.947 36.704 62.704 0 121.071-27.392 160.147-75.158 48.841-59.724 64.219-166.128 32.749-214.508-1.995 0.868-3.908 1.692-5.812 2.499-6.736 2.88-13.102 5.59-20.977 9.911-3.101 1.712-6.322 2.577-9.606 2.577-5.793 0-11.2-2.779-14.845-7.634-3.906-5.217-5.239-12.216-3.483-18.257l1.639-5.651c5.048-17.423 10.265-35.428 16.206-52.921 4.794-14.119 10.757-31.691 29.589-31.691 5.921 0 12.788 1.712 22.94 5.7 22.175 8.719 35.66 14.3 57.704 23.889 7.595 3.312 12.801 11.126 12.929 19.447 0.14 7.911-4.222 14.75-11.663 18.284z" horiz-adv-x="561" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/fonts/jitsi.ttf b/fonts/jitsi.ttf
index dbba4b098..4dc1cbaf8 100755
Binary files a/fonts/jitsi.ttf and b/fonts/jitsi.ttf differ
diff --git a/fonts/jitsi.woff b/fonts/jitsi.woff
index 780ff9fa8..765cb5dd2 100755
Binary files a/fonts/jitsi.woff and b/fonts/jitsi.woff differ
diff --git a/fonts/selection.json b/fonts/selection.json
index 75f79403b..fb08aef9e 100755
--- a/fonts/selection.json
+++ b/fonts/selection.json
@@ -1,6 +1,40 @@
 {
 	"IcoMoonType": "selection",
 	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"",
+					"M797.086 847.699c-0.059-0.163-0.119-0.328-0.16-0.485-71.399 45.638-151.782 69.931-234.023 69.931-0.013 0-0.021 0-0.028 0-122.52 0-237.501-52.772-315.469-144.741-99.778-117.698-134.252-329.954-73.022-427.789 4.004 1.662 7.875 3.233 11.68 4.773 13.585 5.511 26.413 10.716 42.305 19.096 6.063 3.202 12.338 4.812 18.673 4.812 11.714 0 22.6-5.648 29.848-15.486 7.815-10.617 10.313-24.778 6.538-36.951l-3.525-11.41c-10.687-34.59-21.723-70.354-34.211-105.078-9.983-27.765-22.399-62.327-59.226-62.327-12.057 0-26.037 3.656-46.73 12.204-44.294 18.319-71.058 29.961-114.534 49.81-15.102 6.887-25.234 22.698-25.203 39.343 0.028 15.842 8.992 29.337 23.975 36.115 18.208 8.257 30.536 13.716 43.468 19.447l10.687 4.753c-101.938 259.102 24.803 526.458 211.314 639.212 83.497 50.474 178.5 77.14 274.769 77.14h0.041c102.72 0 205.561-31.099 284.501-85.198-31.729-28.803-45.566-69.167-51.671-87.171z",
+					"M1098.203 749.91c-18.113-8.577-30.356-14.258-43.221-20.244l-10.496-4.892c106.448-257.268-15.569-526.801-200.067-642.788-85.36-53.663-183.123-82.032-282.716-82.032-104.848 0-206.41 30.593-285.967 86.165l-5.385 3.764c31.597 27.564 45.86 66.788 52.917 86.41 72.926-47.94 155.675-73.409 239.895-73.409 125.407 0 242.142 54.785 320.294 150.316 97.683 119.447 128.439 332.255 65.498 429.015-3.989-1.736-7.815-3.385-11.624-4.998-13.471-5.759-26.204-11.18-41.954-19.821-6.203-3.424-12.645-5.155-19.212-5.155-11.585 0-22.399 5.558-29.69 15.267-7.813 10.434-10.478 24.432-6.966 36.515l3.279 11.301c10.096 34.845 20.531 70.857 32.412 105.842 9.588 28.238 21.514 63.382 59.179 63.382 11.843 0 25.577-3.424 45.881-11.399 44.351-17.439 71.319-28.601 115.409-47.777 15.19-6.623 25.601-22.252 25.859-38.894 0.281-15.822-8.445-29.499-23.325-36.569z"
+				],
+				"attrs": [
+					{},
+					{},
+					{}
+				],
+				"width": 1122,
+				"grid": 0,
+				"tags": [
+					"reload"
+				]
+			},
+			"attrs": [
+				{},
+				{},
+				{}
+			],
+			"properties": {
+				"order": 25,
+				"id": 28,
+				"prevSize": 32,
+				"code": 58904,
+				"name": "reload",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 0
+		},
 		{
 			"icon": {
 				"paths": [
@@ -27,7 +61,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 0
+			"iconIdx": 1
 		},
 		{
 			"icon": {
@@ -55,7 +89,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 1
+			"iconIdx": 2
 		},
 		{
 			"icon": {
@@ -94,7 +128,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 2
+			"iconIdx": 3
 		},
 		{
 			"icon": {
@@ -117,7 +151,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 3
+			"iconIdx": 4
 		},
 		{
 			"icon": {
@@ -140,7 +174,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 4
+			"iconIdx": 5
 		},
 		{
 			"icon": {
@@ -164,7 +198,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 5
+			"iconIdx": 6
 		},
 		{
 			"icon": {
@@ -189,7 +223,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 6
+			"iconIdx": 7
 		},
 		{
 			"icon": {
@@ -212,7 +246,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 7
+			"iconIdx": 8
 		},
 		{
 			"icon": {
@@ -236,7 +270,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 8
+			"iconIdx": 9
 		},
 		{
 			"icon": {
@@ -260,7 +294,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 9
+			"iconIdx": 10
 		},
 		{
 			"icon": {
@@ -282,7 +316,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 10
+			"iconIdx": 11
 		},
 		{
 			"icon": {
@@ -306,7 +340,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 11
+			"iconIdx": 12
 		},
 		{
 			"icon": {
@@ -330,7 +364,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 12
+			"iconIdx": 13
 		},
 		{
 			"icon": {
@@ -357,7 +391,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 13
+			"iconIdx": 14
 		},
 		{
 			"icon": {
@@ -381,7 +415,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 14
+			"iconIdx": 15
 		},
 		{
 			"icon": {
@@ -405,7 +439,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 15
+			"iconIdx": 16
 		},
 		{
 			"icon": {
@@ -430,7 +464,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 16
+			"iconIdx": 17
 		},
 		{
 			"icon": {
@@ -452,7 +486,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 17
+			"iconIdx": 18
 		},
 		{
 			"icon": {
@@ -475,7 +509,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 18
+			"iconIdx": 19
 		},
 		{
 			"icon": {
@@ -497,7 +531,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 19
+			"iconIdx": 20
 		},
 		{
 			"icon": {
@@ -520,7 +554,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 20
+			"iconIdx": 21
 		},
 		{
 			"icon": {
@@ -543,7 +577,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 21
+			"iconIdx": 22
 		},
 		{
 			"icon": {
@@ -567,7 +601,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 22
+			"iconIdx": 23
 		},
 		{
 			"icon": {
@@ -590,7 +624,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 23
+			"iconIdx": 24
 		}
 	],
 	"height": 1024,
diff --git a/images/welcome_page/disable-welcome-selected.png b/images/welcome_page/disable-welcome-selected.png
index 23c0a4b9d..8f64eba94 100644
Binary files a/images/welcome_page/disable-welcome-selected.png and b/images/welcome_page/disable-welcome-selected.png differ
diff --git a/images/welcome_page/disable-welcome.png b/images/welcome_page/disable-welcome.png
index dc30fb69b..a96a753f5 100644
Binary files a/images/welcome_page/disable-welcome.png and b/images/welcome_page/disable-welcome.png differ
diff --git a/index.html b/index.html
index 3a5f2ff5e..9c3fe7075 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
     <script src="desktopsharing.js?v=2"></script><!-- desktop sharing -->
     <script src="data_channels.js?v=3"></script><!-- data channels -->
-    <script src="app.js?v=6"></script><!-- application logic -->
+    <script src="app.js?v=7"></script><!-- application logic -->
     <script src="commands.js?v=1"></script><!-- application logic -->
     <script src="chat.js?v=9"></script><!-- chat logic -->
     <script src="contact_list.js?v=1"></script><!-- contact list logic -->
@@ -40,8 +40,8 @@
     <script src="replacement.js?v=6"></script><!-- link and smiley replacement -->
     <script src="moderatemuc.js?v=3"></script><!-- moderator plugin -->
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
-    <script src="rtp_stats.js?v=1"></script><!-- RTP stats processing -->
-    <script src="local_stats.js?v=1"></script><!-- Local stats processing -->
+    <script src="rtp_sts.js?v=1"></script><!-- RTP stats processing -->
+    <script src="local_sts.js?v=1"></script><!-- Local stats processing -->
     <script src="videolayout.js?v=8"></script><!-- video ui -->
     <script src="toolbar.js?v=4"></script><!-- toolbar ui -->
     <script src="canvas_util.js?v=1"></script><!-- canvas drawing utils -->
@@ -79,13 +79,15 @@
                         <div id="domain_name"></div>
                         <div id="enter_room">
                             <input id="enter_room_field" type="text" placeholder="Enter room name" />
+                            <div class="icon-reload" id="reload_roomname"></div>
                             <input id="enter_room_button" type="button" value="GO" />
+
                         </div>
                     </div>
-                    <input type='checkbox' name='checkbox' id="disable_welcome"/>
-                    <label for="disable_welcome">Don't show this page</label>
             </div>
             <div id="brand_header"></div>
+            <input type='checkbox' name='checkbox' id="disable_welcome"/>
+            <label for="disable_welcome" class="disable_welcome_position">Don't show this page next time I enter</label>
             <div id="header_text"></div>
         </div>
         <div id="welcome_page_main">
@@ -106,7 +108,7 @@
                     <div class="feature_holder">
                         <div class="feature_icon">Open source</div>
                         <div class="feature_description">
-                            <span name="appName"></span> is licensed under the &lt;GPL/LGPL/WHATEVER&gt;. You can download, use, modify, and share the software without any restrictions.
+                            <span name="appName"></span> is licensed under MIT. You are free to download, use, modify, and share them as per these licenses.
                         </div>
                     </div>
                     <div class="feature_holder">
diff --git a/local_stats.js b/local_sts.js
similarity index 100%
rename from local_stats.js
rename to local_sts.js
diff --git a/rtp_stats.js b/rtp_sts.js
similarity index 100%
rename from rtp_stats.js
rename to rtp_sts.js