diff --git a/css/welcome_page.css b/css/welcome_page.css
index 3b3c54796..e27011d7e 100644
--- a/css/welcome_page.css
+++ b/css/welcome_page.css
@@ -45,56 +45,37 @@
     border-radius: 10px;
     background-color: #FFFFFF;
     border: none;
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-    -webkit-appearance: none;
     height: 55px;
     box-shadow: none;
-    float: left;
+    padding: 0 5px 0 20px;
 }
 
 #domain_name
 {
-    float: left;
-    padding: 20px 0px 10px 20px;
     font-size: 18px;
-    font-weight: 500;
-    font-family: Helvetica;
 }
 
 #enter_room_field {
     font-size: 15px;
-    padding: 15px 0px 10px 10px;
     border: none;
-    -webkit-appearance: none;
     width: 228px;
-    height: 55px;
-    font-weight: 500;
-    font-family: Helvetica;
-    box-shadow: none;
-    float: left;
+    height: inherit;
     background-color: #FFFFFF;
-    position: relative;
-    z-index: 2;
+    display: inline;
+    box-shadow: none;
 }
 
 #enter_room_button {
     width: 73px;
     height: 45px;
     background-color: #16a8fe;
-    moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
+    border-radius: 10px;
     color: #ffffff;
-    font-weight: 600;
-    border: none;
+    border: 0;
     margin-top: 5px;
     font-size: 19px;
-    font-family: Helvetica;
     padding-top: 6px;
     outline: none;
-    float:left;
-    position: relative;
-    z-index: 2;
 }
 
 #enter_room_container {
@@ -102,11 +83,6 @@
     display: table;
 }
 
-#enter_room{
-    float:left;
-    padding-right: 5px;
-}
-
 #welcome_page_header
 {
     background-image: url(../images/welcome_page/pattern-header.png);
@@ -197,9 +173,6 @@
     height: 19px;
     color: #acacac;
     margin-top: 22px;
-    z-index: 3;
-    float:  left;
     cursor: pointer;
     text-align: center;
-    display: none;
 }
diff --git a/index.html b/index.html
index 9df068dec..60045df0f 100644
--- a/index.html
+++ b/index.html
@@ -37,13 +37,13 @@
 
             <div id="enter_room_container">
                     <div id="enter_room_form" >
-                        <div id="domain_name"></div>
-                        <div id="enter_room">
+                        <span id="domain_name"></span>
+                        <span id="enter_room">
                             <input id="enter_room_field" type="text" autofocus data-i18n="[placeholder]welcomepage.roomname" placeholder="Enter room name" />
-                            <div class="icon-reload" id="reload_roomname"></div>
+                            <span class="icon-reload" id="reload_roomname"></span>
                             <input id="enter_room_button" type="button" data-i18n="[value]welcomepage.go" value="GO" />
 
-                        </div>
+                        </span>
                     </div>
             </div>
             <div id="brand_header"></div>