diff --git a/app/badbrowser.html b/app/badbrowser.html
index 3e5f7a43..f8f5d852 100644
--- a/app/badbrowser.html
+++ b/app/badbrowser.html
@@ -22,7 +22,7 @@
       <div class="container">
 
         <div class="navbar-header pull-left">
-          <a class="navbar-brand" href=""><span class="tg_head_logo"></span></a>
+          <a class="navbar-brand" href="index.html"><span class="tg_head_logo"></span></a>
         </div>
 
         <div class="navbar-menu pull-right">
@@ -50,12 +50,17 @@
 
     <div class="bad_browser_wrap">
       
-      <h2>You are using outdated browser!</h2>
+      <h2>Your browser is outdated!</h2>
 
       <div class="bad_browser_text">
-        <p>Sorry, your browser is not supported by <strong>Telegram Web</strong>.</p>
-        <p>In order to use Telegram secure messaging protocol - MTProto, <strong>Telegram Web</strong> utilizes modern HTML5 technologies.</p>
-        <p>Your browser doesn't support these features. Please download a modern browser and come back soon!</p>
+        <p>
+          Don't take this personally, but your browser is too old to run <strong>Telegram Web</strong>.<br/>
+          We require HTML5 support for the MTProto secure messaging protocol to work.
+        </p>
+        <p>
+          Unfortunately, your current browser doesn't support HTML5.<br/>
+          Please download a modern browser and come back soon!
+        </p>
       </div>
 
 
diff --git a/app/css/app.css b/app/css/app.css
index 6bc64530..954366ad 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -1158,10 +1158,6 @@ a.im_dialog_selected .im_dialog_date {
 .im_history_scrollable_wrap {
   outline: none ! important;
   -webkit-user-select: text;
-
-  -webkit-transform: translateZ(0);
-  -webkit-perspective: 1000;
-  -webkit-backface-visibility: hidden;
   position: relative;
 }
 .im_history_to_bottom {
diff --git a/app/css/desktop.css b/app/css/desktop.css
index 5239d708..5476fa37 100644
--- a/app/css/desktop.css
+++ b/app/css/desktop.css
@@ -140,6 +140,11 @@ a.footer_lang_link.active:active {
 }
 .im_dialogs_scrollable_wrap {
   padding: 0 19px 0 12px;
+
+  /* Hardware acceleration in Safari */
+  -webkit-transform: translateZ(0);
+  -webkit-perspective: 1000;
+  -webkit-backface-visibility: hidden;
 }
 .im_dialogs_col .nano > .nano-pane {
   background : rgba(0,0,0,0.0);
@@ -165,6 +170,12 @@ a.footer_lang_link.active:active {
   float: left;
   width: 69%;
 }
+.im_history_scrollable_wrap {
+  /* Hardware acceleration in Safari */
+  -webkit-transform: translateZ(0);
+  -webkit-perspective: 1000;
+  -webkit-backface-visibility: hidden;
+}
 .im_history_col .nano > .nano-pane,
 .contacts_modal_col .nano > .nano-pane,
 .im_dialogs_modal_col .nano > .nano-pane {
@@ -582,7 +593,14 @@ div.im_panel_own_photo {
 }
 
 .chat_modal_actions_wrap {
+  float: right;
   position: relative;
+  width: 332px;
+}
+.chat_modal_actions_wrap > button,
+.chat_modal_actions_wrap > .chat_modal_other_btn > button,
+.chat_modal_actions_wrap > span.btn {
+  padding: 7px 10px;
 }
 
 .chat_modal_main_btn {
diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js
index 0035d509..ca2e3d1e 100644
--- a/app/js/lib/ng_utils.js
+++ b/app/js/lib/ng_utils.js
@@ -496,7 +496,8 @@ angular.module('izhukov.utils', [])
     };
 
     worker.onerror = function(error) {
-      console.log('CW error', error, error.stack);
+      console.error('CW error', error, error.stack);
+      worker = false;
     };
   }
 
diff --git a/gulpfile.js b/gulpfile.js
index 0d2b6f89..967a8808 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,7 +18,7 @@ gulp.task('templates', function() {
 });
 
 gulp.task('usemin', ['templates', 'enable-production'], function() {
-  return gulp.src('app/index.html')
+  return gulp.src(['app/index.html', 'app/badbrowser.html'])
     .pipe($.usemin({
       html: [$.minifyHtml({empty: true})],
       js: ['concat', $.ngmin(), $.uglify({outSourceMap: false})],
@@ -45,9 +45,7 @@ gulp.task('copy', function() {
       .pipe(gulp.dest('dist')),
     gulp.src(['app/img/**/*.wav'])
       .pipe(gulp.dest('dist/img')),
-    gulp.src('app/js/polyfill.js')
-      .pipe(gulp.dest('dist/js/polyfill.js')),
-    gulp.src('app/js/lib/bin_utils.js')
+    gulp.src(['app/js/lib/polyfill.js', 'app/js/lib/bin_utils.js'])
       .pipe(gulp.dest('dist/js/lib')),
     gulp.src('app/vendor/closure/long.js')
       .pipe(gulp.dest('dist/vendor/closure')),