diff --git a/Telegram/Resources/etc/qt_linux.conf b/Telegram/Resources/etc/qt_linux.conf
deleted file mode 100644
index 6d80862b5..000000000
--- a/Telegram/Resources/etc/qt_linux.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Paths]
-Libraries=:/gui/art
diff --git a/Telegram/Resources/etc/qt_win.conf b/Telegram/Resources/etc/qt_win.conf
deleted file mode 100644
index f26ffe77f..000000000
--- a/Telegram/Resources/etc/qt_win.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Platforms]
-WindowsArguments = nomousefromtouch
diff --git a/Telegram/Resources/fc-custom.conf b/Telegram/Resources/fc-custom.conf
deleted file mode 100644
index ab5c18306..000000000
--- a/Telegram/Resources/fc-custom.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
- /usr/share/fonts
- /usr/local/share/fonts
- ~/.fonts
- ~/.local/share/fonts
- /usr/X11R6/lib/X11/fonts
- fonts
-
-
- mono
-
-
- monospace
-
-
-
-
- sans serif
-
-
- sans-serif
-
-
-
-
- sans
-
-
- sans-serif
-
-
- /var/cache/fontconfig_11
- fontconfig_11
- ~/.fontconfig_11
-
-
- true
-
-
- false
-
-
- true
-
-
- hintslight
-
-
- lcddefault
-
-
- rgb
-
-
-
diff --git a/Telegram/Resources/fonts/OpenSans-Bold.ttf b/Telegram/Resources/fonts/OpenSans-Bold.ttf
deleted file mode 100644
index fd79d43be..000000000
Binary files a/Telegram/Resources/fonts/OpenSans-Bold.ttf and /dev/null differ
diff --git a/Telegram/Resources/fonts/OpenSans-Regular.ttf b/Telegram/Resources/fonts/OpenSans-Regular.ttf
deleted file mode 100644
index db433349b..000000000
Binary files a/Telegram/Resources/fonts/OpenSans-Regular.ttf and /dev/null differ
diff --git a/Telegram/Resources/fonts/OpenSans-Semibold.ttf b/Telegram/Resources/fonts/OpenSans-Semibold.ttf
deleted file mode 100644
index 1a7679e39..000000000
Binary files a/Telegram/Resources/fonts/OpenSans-Semibold.ttf and /dev/null differ
diff --git a/Telegram/Resources/qrc/fonts.qrc b/Telegram/Resources/qrc/fonts.qrc
deleted file mode 100644
index 233b8d572..000000000
--- a/Telegram/Resources/qrc/fonts.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- ../fonts/OpenSans-Regular.ttf
- ../fonts/OpenSans-Bold.ttf
- ../fonts/OpenSans-Semibold.ttf
-
-
diff --git a/Telegram/Resources/qrc/linux.qrc b/Telegram/Resources/qrc/linux.qrc
deleted file mode 100644
index 164e8d4f2..000000000
--- a/Telegram/Resources/qrc/linux.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- ../etc/qt_linux.conf
-
-
- ../fc-custom.conf
-
-
diff --git a/Telegram/Resources/qrc/mac.qrc b/Telegram/Resources/qrc/mac.qrc
deleted file mode 100644
index 03585ec03..000000000
--- a/Telegram/Resources/qrc/mac.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Telegram/Resources/qrc/wnd.qrc b/Telegram/Resources/qrc/wnd.qrc
deleted file mode 100644
index 447387bfb..000000000
--- a/Telegram/Resources/qrc/wnd.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- ../etc/qt_win.conf
-
-
diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style
index d090907c8..da50b0ab2 100644
--- a/Telegram/SourceFiles/history/history.style
+++ b/Telegram/SourceFiles/history/history.style
@@ -639,3 +639,12 @@ scheduleTimeSeparator: FlatLabel(defaultFlatLabel) {
}
}
scheduleTimeSeparatorPadding: margins(2px, 0px, 2px, 0px);
+
+youtubeIcon: icon {
+ { "media_youtube_play_bg", youtubePlayIconBg },
+ { "media_youtube_play", youtubePlayIconFg, point(24px, 12px) },
+};
+videoIcon: icon {
+ { "media_video_play_bg", videoPlayIconBg },
+ { "media_video_play", videoPlayIconFg, point(12px, 12px) },
+};
diff --git a/Telegram/gyp/helpers b/Telegram/gyp/helpers
index 85d6a5afc..14890fb48 160000
--- a/Telegram/gyp/helpers
+++ b/Telegram/gyp/helpers
@@ -1 +1 @@
-Subproject commit 85d6a5afc029d398411aac27c02970f00132bc42
+Subproject commit 14890fb48acb3ee8151f98589847ffcfd3aa7826
diff --git a/Telegram/gyp/telegram/mac.gypi b/Telegram/gyp/telegram/mac.gypi
index 6ac51ec4a..4a9f29c7a 100644
--- a/Telegram/gyp/telegram/mac.gypi
+++ b/Telegram/gyp/telegram/mac.gypi
@@ -14,7 +14,7 @@
],
'xcode_settings': {
'INFOPLIST_FILE': '../Telegram.plist',
- 'CURRENT_PROJECT_VERSION': '