diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 488a524a12..ea2b4012eb 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/streaming/media_streaming_loader.h" // unique_ptr<Loader>
 #include "media/streaming/media_streaming_reader.h" // make_shared<Reader>
 #include "boxes/abstract_box.h"
+#include "platform/platform_info.h"
 #include "passport/passport_form_controller.h"
 #include "window/themes/window_theme.h"
 #include "lang/lang_keys.h" // tr::lng_deleted(tr::now) in user name
@@ -205,6 +206,14 @@ Session::Session(not_null<AuthSession*> session)
 	_cache->open(Local::cacheKey());
 	_bigFileCache->open(Local::cacheBigFileKey());
 
+	if constexpr (Platform::IsLinux()) {
+		const auto wasVersion = Local::oldMapVersion();
+		if (wasVersion >= 1007011 && wasVersion < 1007015) {
+			_bigFileCache->clear();
+			_cache->clearByTag(Data::kImageCacheTag);
+		}
+	}
+
 	setupContactViewsViewer();
 	setupChannelLeavingViewer();
 	setupPeerNameViewer();
diff --git a/Telegram/SourceFiles/ui/image/image.cpp b/Telegram/SourceFiles/ui/image/image.cpp
index cd6d6249de..fb3bb58292 100644
--- a/Telegram/SourceFiles/ui/image/image.cpp
+++ b/Telegram/SourceFiles/ui/image/image.cpp
@@ -548,17 +548,17 @@ const QPixmap &Image::pix(
 	checkSource();
 
 	if (w <= 0 || !width() || !height()) {
-        w = width();
-    } else {
-        w *= cIntRetinaFactor();
-        h *= cIntRetinaFactor();
-    }
+		w = width();
+	} else {
+		w *= cIntRetinaFactor();
+		h *= cIntRetinaFactor();
+	}
 	auto options = Option::Smooth | Option::None;
 	auto k = PixKey(w, h, options);
 	auto i = _sizesCache.constFind(k);
 	if (i == _sizesCache.cend()) {
 		auto p = pixNoCache(origin, w, h, options);
-        p.setDevicePixelRatio(cRetinaFactor());
+		p.setDevicePixelRatio(cRetinaFactor());
 		i = _sizesCache.insert(k, p);
 		ActiveCache().increment(ComputeUsage(*i));
 	}
diff --git a/Telegram/SourceFiles/ui/widgets/widgets.style b/Telegram/SourceFiles/ui/widgets/widgets.style
index 0a88651295..1eb6db464e 100644
--- a/Telegram/SourceFiles/ui/widgets/widgets.style
+++ b/Telegram/SourceFiles/ui/widgets/widgets.style
@@ -1210,7 +1210,7 @@ InfoTopBar {
 }
 
 LevelMeter {
-    height: pixels;
+	height: pixels;
 	lineWidth: pixels;
 	lineSpacing: pixels;
 	lineCount: int;
@@ -1219,7 +1219,7 @@ LevelMeter {
 }
 
 defaultLevelMeter: LevelMeter {
-    height: 18px;
+	height: 18px;
 	lineWidth: 3px;
 	lineSpacing: 5px;
 	lineCount: 44;
diff --git a/Telegram/ThirdParty/rlottie b/Telegram/ThirdParty/rlottie
index 40ccf08444..302b7f98b4 160000
--- a/Telegram/ThirdParty/rlottie
+++ b/Telegram/ThirdParty/rlottie
@@ -1 +1 @@
-Subproject commit 40ccf084445c60a32d72d4811edf0efd0580dcaa
+Subproject commit 302b7f98b4f6846dc2414d9a5dc6c44864b92dd3
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
index 27e180de30..0bf2dce390 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -118,7 +118,7 @@
       '<@(style_files)',
       '<!@(<(list_sources_command) <(qt_moc_list_sources_arg))',
       'telegram_sources.txt',
-	  '<(res_loc)/langs/cloud_lang.strings',
+      '<(res_loc)/langs/cloud_lang.strings',
       '<(res_loc)/export_html/css/style.css',
       '<(res_loc)/export_html/js/script.js',
       '<(res_loc)/export_html/images/back.png',
diff --git a/Telegram/gyp/lib_base.gyp b/Telegram/gyp/lib_base.gyp
index 3ffbf7f907..10026eee4a 100644
--- a/Telegram/gyp/lib_base.gyp
+++ b/Telegram/gyp/lib_base.gyp
@@ -57,7 +57,7 @@
       '<(src_loc)/base/flat_set.h',
       '<(src_loc)/base/functors.h',
       '<(src_loc)/base/index_based_iterator.h',
-	  '<(src_loc)/base/last_used_cache.h',
+      '<(src_loc)/base/last_used_cache.h',
       '<(src_loc)/base/match_method.h',
       '<(src_loc)/base/observer.cpp',
       '<(src_loc)/base/observer.h',
diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp
index ada149e85d..9767651f2b 100644
--- a/Telegram/gyp/lib_lottie.gyp
+++ b/Telegram/gyp/lib_lottie.gyp
@@ -60,7 +60,7 @@
       '<(src_loc)/lottie/lottie_animation.h',
       '<(src_loc)/lottie/lottie_cache.cpp',
       '<(src_loc)/lottie/lottie_cache.h',
-	  '<(src_loc)/lottie/lottie_common.cpp',
+      '<(src_loc)/lottie/lottie_common.cpp',
       '<(src_loc)/lottie/lottie_common.h',
       '<(src_loc)/lottie/lottie_frame_renderer.cpp',
       '<(src_loc)/lottie/lottie_frame_renderer.h',
diff --git a/Telegram/gyp/lib_rlottie.gyp b/Telegram/gyp/lib_rlottie.gyp
index efc208500d..eb519cc95a 100644
--- a/Telegram/gyp/lib_rlottie.gyp
+++ b/Telegram/gyp/lib_rlottie.gyp
@@ -111,11 +111,7 @@
       '<(rlottie_src)/vector/vstackallocator.h',
       '<(rlottie_src)/vector/vtaskqueue.h',
     ],
-    'conditions': [[ 'not build_win', {
-      'defines': [
-        'RLOTTIE_WITH_STATIC_QT',
-      ]
-    }], [ 'build_macold', {
+    'conditions': [[ 'build_macold', {
       'xcode_settings': {
         'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
       },
diff --git a/Telegram/gyp/openssl.gypi b/Telegram/gyp/openssl.gypi
index 1e24337366..0b6c981dbb 100644
--- a/Telegram/gyp/openssl.gypi
+++ b/Telegram/gyp/openssl.gypi
@@ -7,11 +7,11 @@
 {
   'conditions': [
     [ 'build_win', {
-	  'libraries': [
+      'libraries': [
         '-llibeay32',
         '-lssleay32',
         '-lCrypt32',
-	  ],
+      ],
       'configurations': {
         'Debug': {
           'include_dirs': [
@@ -30,7 +30,7 @@
           ],
         },
       },
-	}], [ 'build_macold', {
+    }], [ 'build_macold', {
       'xcode_settings': {
         'OTHER_LDFLAGS': [
           '<(libs_loc)/macold/openssl/libssl.a',