diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 4004b9adf..48431a041 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=Telegram Messenger LLP, O=Telegram Messenger LLP, L=London, C=GB"
-    Version="1.0.25.0" />
+    Version="1.0.18.1" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 8dc1e1321..8c5cfcd83 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,25,0
- PRODUCTVERSION 1,0,25,0
+ FILEVERSION 1,0,18,1
+ PRODUCTVERSION 1,0,18,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "1.0.25.0"
+            VALUE "FileVersion", "1.0.18.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2017"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.0.25.0"
+            VALUE "ProductVersion", "1.0.18.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index a29d12904..b264a66fe 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,25,0
- PRODUCTVERSION 1,0,25,0
+ FILEVERSION 1,0,18,1
+ PRODUCTVERSION 1,0,18,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "1.0.25.0"
+            VALUE "FileVersion", "1.0.18.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2017"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.0.25.0"
+            VALUE "ProductVersion", "1.0.18.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h
index c36027aa9..3f46faa0d 100644
--- a/Telegram/SourceFiles/core/utils.h
+++ b/Telegram/SourceFiles/core/utils.h
@@ -26,6 +26,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <set>
 #include <gsl/gsl>
 
+#ifdef OS_MAC_OLD
+namespace gsl {
+
+inline span<char> make_span(QByteArray &container) {
+	return span<char>(container.begin(), container.end());
+}
+
+inline span<const char> make_span(const QByteArray &container) {
+	return span<const char>(container.begin(), container.end());
+}
+
+} // namespace gsl
+#endif // OS_MAC_OLD
+
 // Release build assertions.
 inline void t_noop() {
 }
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 7edea9247..a0b350cb2 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,9 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "core/utils.h"
 
-#define BETA_VERSION_MACRO (0ULL)
+#define BETA_VERSION_MACRO (1000018001ULL)
 
-constexpr int AppVersion = 1000025;
-constexpr str_const AppVersionStr = "1.0.25";
-constexpr bool AppAlphaVersion = true;
+constexpr int AppVersion = 1000018;
+constexpr str_const AppVersionStr = "1.0.18";
+constexpr bool AppAlphaVersion = false;
 constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index db8fb7c1b..e8474da9d 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -3443,10 +3443,10 @@ HistoryInvoice::HistoryInvoice(HistoryItem *parent, const HistoryInvoice &other)
 
 QString HistoryInvoice::fillAmountAndCurrency(int amount, const QString &currency) {
 	static auto shortCurrencyNames = QMap<QString, QString> {
-		{ qsl("USD"), qsl("$") },
-		{ qsl("GBP"), qsl("£") },
-		{ qsl("EUR"), qsl("€") },
-		{ qsl("JPY"), qsl("¥") },
+		{ qsl("USD"), QString::fromUtf8("\x24") },
+		{ qsl("GBP"), QString::fromUtf8("\xC2\xA3") },
+		{ qsl("EUR"), QString::fromUtf8("\xE2\x82\xAC") },
+		{ qsl("JPY"), QString::fromUtf8("\xC2\xA5") },
 	};
 	auto amountBucks = amount / 100;
 	auto amountCents = amount % 100;
diff --git a/Telegram/build/version b/Telegram/build/version
index 0f96e2aa6..738a045fb 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion         1000025
+AppVersion         1000018
 AppVersionStrMajor 1.0
-AppVersionStrSmall 1.0.25
-AppVersionStr      1.0.25
-AlphaChannel       1
-BetaVersion        0
+AppVersionStrSmall 1.0.18
+AppVersionStr      1.0.18
+AlphaChannel       0
+BetaVersion        1000018001