diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco
index c16bdee10..9f1443d88 100644
--- a/app/assets/javascripts/app/views/channel/chat.jst.eco
+++ b/app/assets/javascripts/app/views/channel/chat.jst.eco
@@ -138,6 +138,17 @@
         </div>
         <span class="help-block"><%- @T('The default font size is 12px.') %></span>
       </div>
+      <div class="switch form-group formGroup--halfSize">
+        <div class="formGroup-label">
+            <label for="form-chat-flat"><%- @T('Flat Design') %></label>
+          </div>
+        <div class="controls">
+          <div class="zammad-switch">
+             <input name="flat" type="checkbox" id="form-chat-flat">
+             <label for="form-chat-flat"></label>
+          </div>          
+        </div>
+      </div>
     </fieldset>
 
     <br>
@@ -159,16 +170,6 @@
               </span>
               <%- @T('Enable debugging for implementation.') %>
             </label>
-        <tr>
-          <td>
-            <label class="inline-label">
-              <span class="checkbox-replacement checkbox-replacement--inline">
-                <input type="checkbox" name="flat" value="true">
-                <%- @Icon('checkbox', 'icon-unchecked') %>
-                <%- @Icon('checkbox-checked', 'icon-checked') %>
-              </span>
-              <%- @T('Flat design.') %>
-            </label>
       </tbody>
     </table>
   </form>