diff --git a/app/css/app.css b/app/css/app.css
index 8f4f12fa..757ce4ea 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -8,9 +8,12 @@ html {
 body {
   color: #000;
   background: none;
-  font: 12px/18px 'Open Sans', "Lucida Grande", "Lucida Sans Unicode", Tahoma, sans-serif;
+  font: 12px/18px 'Open Sans', "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif;
   overflow: visible;
 }
+body.non_osx {
+  font: 13px/18px Tahoma, sans-serif, Arial, Helvetica;
+}
 h1, h2, h3, h4, h5 {
   color: #222;
 }
diff --git a/app/css/desktop.css b/app/css/desktop.css
index 7ebbe082..a8cfd15e 100644
--- a/app/css/desktop.css
+++ b/app/css/desktop.css
@@ -162,6 +162,9 @@
 .tg_head_peer_dropdown {
   float: right;
 }
+.tg_head_msgs_edit_btn {
+  float: right;
+}
 .tg_head_peer_status {
   font-weight: normal;
 }
@@ -182,10 +185,11 @@
 }
 
 .tg_head_peer_dropdown .dropdown-menu > li > a {
-  font-size: 12px;
+  font-size: 13px;
   line-height: 15px;
   padding: 11px 18px 11px 18px;
   color: #52719a;
+  font-weight: bold;
 }
 .tg_head_peer_dropdown .dropdown-menu > li > a:hover {
   background: #f3f6fa;
@@ -632,6 +636,7 @@ a.footer_link.active:active {
   min-width: 0;
   width: auto;
   padding: 0;
+  font-weight: bold;
 }
 .im_submit:hover {
   color: #2c78b6;
diff --git a/app/index.html b/app/index.html
index 98c5036b..6a441e7f 100644
--- a/app/index.html
+++ b/app/index.html
@@ -15,7 +15,7 @@
   <!-- endbuild -->
 
   <!-- <link rel="stylesheet" href="css/font.css"/> -->
-  <link href="//fonts.googleapis.com/css?family=Open+Sans:400,600&amp;subset=cyrillic,cyrillic-ext,latin,latin-ext" rel="stylesheet" type="text/css">
+  <!-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&amp;subset=cyrillic,cyrillic-ext,latin,latin-ext" rel="stylesheet" type="text/css"> -->
 
   <link rel="icon" href="favicon.ico" type="image/x-icon" />
 
diff --git a/app/js/controllers.js b/app/js/controllers.js
index b24b14c4..b4a63eff 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -466,7 +466,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
     LocationParamsService.start();
   })
 
-  .controller('AppImDialogsController', function ($scope, $location, $q, $timeout, $routeParams, MtpApiManager, AppUsersManager, AppChatsManager, AppMessagesManager, AppPeersManager, PhonebookContactsService, ErrorService) {
+  .controller('AppImDialogsController', function ($scope, $location, $q, $timeout, $routeParams, MtpApiManager, AppUsersManager, AppChatsManager, AppMessagesManager, AppPeersManager, PhonebookContactsService, ErrorService, AppRuntimeManager) {
 
     $scope.dialogs = [];
     $scope.contacts = [];
@@ -2334,7 +2334,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
 
   })
 
-  .controller('SettingsModalController', function ($rootScope, $scope, $timeout, $modal, AppUsersManager, AppChatsManager, AppPhotosManager, MtpApiManager, Storage, NotificationsManager, MtpApiFileManager, ApiUpdatesManager, ChangelogNotifyService, ErrorService, _) {
+  .controller('SettingsModalController', function ($rootScope, $scope, $timeout, $modal, AppUsersManager, AppChatsManager, AppPhotosManager, MtpApiManager, Storage, NotificationsManager, MtpApiFileManager, ApiUpdatesManager, ChangelogNotifyService, AppRuntimeManager, ErrorService, _) {
 
     $scope.profile = {};
     $scope.photo = {};
diff --git a/app/partials/desktop/head.html b/app/partials/desktop/head.html
index b3c2e19f..2b597cea 100644
--- a/app/partials/desktop/head.html
+++ b/app/partials/desktop/head.html
@@ -40,13 +40,7 @@
 
       <div ng-switch-default class="tg_head_main_peer_wrap">
 
-        <div class="tg_head_peer_dropdown tg_head_peer_more_dropdown dropdown" dropdown>
-          <a class="tg_head_btn dropdown-toggle" dropdown-toggle my-i18n="head_peer_more"></a>
-          <ul class="dropdown-menu">
-            <li><a ng-click="toggleEdit()" my-i18n="head_edit_messages"></a></li>
-            <li><a ng-click="selectedFlush()" my-i18n="head_clear_all"></a></li>
-          </ul>
-        </div>
+        <a class="tg_head_btn tg_head_msgs_edit_btn" my-i18n="im_edit" ng-click="toggleEdit()"></a>
 
         <div class="tg_head_peer_dropdown tg_head_peer_media_dropdown dropdown" dropdown>
           <a class="tg_head_btn dropdown-toggle" dropdown-toggle my-i18n="im_media"></a>
diff --git a/app/webogram.appcache b/app/webogram.appcache
index b6d18265..a43a10bd 100644
--- a/app/webogram.appcache
+++ b/app/webogram.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 54
+# 55
 
 NETWORK:
 *