diff --git a/Telegram/SourceFiles/_other/genemoji.h b/Telegram/SourceFiles/_other/genemoji.h
index d29ffeeef2..bd3dcee0d2 100644
--- a/Telegram/SourceFiles/_other/genemoji.h
+++ b/Telegram/SourceFiles/_other/genemoji.h
@@ -40,17 +40,17 @@ using std::exception;
 class Exception : public exception {
 public:
 
-    Exception(const QString &msg) : _msg(msg) {
+    Exception(const QString &msg) : _msg(msg.toUtf8()) {
 	}
 
     virtual const char *what() const throw() {
-        return _msg.toUtf8().constData();
+        return _msg.constData();
     }
     virtual ~Exception() throw() {
     }
 
 private:
-	QString _msg;
+	QByteArray _msg;
 };
 
 bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_png);
diff --git a/Telegram/SourceFiles/_other/genlang.h b/Telegram/SourceFiles/_other/genlang.h
index e4bc246dd2..0648ad9537 100644
--- a/Telegram/SourceFiles/_other/genlang.h
+++ b/Telegram/SourceFiles/_other/genlang.h
@@ -38,17 +38,17 @@ using std::exception;
 class Exception : public exception {
 public:
     
-    Exception(const QString &msg) : _msg(msg) {
+	Exception(const QString &msg) : _msg(msg.toUtf8()) {
 	}
     
     virtual const char *what() const throw() {
-        return _msg.toUtf8().constData();
+        return _msg.constData();
     }
     virtual ~Exception() throw() {
     }
     
 private:
-	QString _msg;
+	QByteArray _msg;
 };
 
 bool genLang(const QString &lang_in, const QString &lang_out);
diff --git a/Telegram/SourceFiles/_other/genstyles.h b/Telegram/SourceFiles/_other/genstyles.h
index 855ce86685..6066654d04 100644
--- a/Telegram/SourceFiles/_other/genstyles.h
+++ b/Telegram/SourceFiles/_other/genstyles.h
@@ -37,17 +37,17 @@ using std::exception;
 class Exception : public exception {
 public:
     
-    Exception(const QString &msg) : _msg(msg) {
+    Exception(const QString &msg) : _msg(msg.toUtf8()) {
 	}
     
     virtual const char *what() const throw() {
-        return _msg.toUtf8().constData();
+        return _msg.constData();
     }
     virtual ~Exception() throw() {
     }
     
 private:
-	QString _msg;
+	QByteArray _msg;
 };
 
 bool genStyles(const QString &classes_in, const QString &classes_out, const QString &styles_in, const QString &styles_out, const QString &path_to_sprites);
diff --git a/Telegram/SourceFiles/art/grid.png b/Telegram/SourceFiles/art/grid.png
deleted file mode 100644
index 07ab30f8b6..0000000000
Binary files a/Telegram/SourceFiles/art/grid.png and /dev/null differ
diff --git a/Telegram/SourceFiles/art/grid_125x.png b/Telegram/SourceFiles/art/grid_125x.png
deleted file mode 100644
index 96ebd1ef01..0000000000
Binary files a/Telegram/SourceFiles/art/grid_125x.png and /dev/null differ
diff --git a/Telegram/SourceFiles/art/grid_150x.png b/Telegram/SourceFiles/art/grid_150x.png
deleted file mode 100644
index f8a9436d38..0000000000
Binary files a/Telegram/SourceFiles/art/grid_150x.png and /dev/null differ
diff --git a/Telegram/SourceFiles/art/grid_200x.png b/Telegram/SourceFiles/art/grid_200x.png
deleted file mode 100644
index 6ec78ce5f3..0000000000
Binary files a/Telegram/SourceFiles/art/grid_200x.png and /dev/null differ
diff --git a/Telegram/SourceFiles/art/sprite_125x.png b/Telegram/SourceFiles/art/sprite_125x.png
deleted file mode 100644
index abebece00f..0000000000
Binary files a/Telegram/SourceFiles/art/sprite_125x.png and /dev/null differ
diff --git a/Telegram/SourceFiles/art/sprite_150x.png b/Telegram/SourceFiles/art/sprite_150x.png
deleted file mode 100644
index 3e4fa0109a..0000000000
Binary files a/Telegram/SourceFiles/art/sprite_150x.png and /dev/null differ
diff --git a/Telegram/SourceFiles/gui/twidget.h b/Telegram/SourceFiles/gui/twidget.h
index 559b9e2f97..5fbf1600c6 100644
--- a/Telegram/SourceFiles/gui/twidget.h
+++ b/Telegram/SourceFiles/gui/twidget.h
@@ -31,7 +31,7 @@ public:
 		return dynamic_cast<const TWidget*>(parentWidget());
 	}
 
-	virtual void leaveToChildEvent(QEvent */*e*/) { // e -- from enterEvent() of child TWidget
+	virtual void leaveToChildEvent(QEvent *e) { // e -- from enterEvent() of child TWidget
 	}
 
 protected:
diff --git a/Telegram/SourceFiles/pspecific_wnd.cpp b/Telegram/SourceFiles/pspecific_wnd.cpp
index d0127d8a36..45fa011853 100644
--- a/Telegram/SourceFiles/pspecific_wnd.cpp
+++ b/Telegram/SourceFiles/pspecific_wnd.cpp
@@ -895,8 +895,9 @@ void PsMainWindow::psIdleTimeout() {
 	}
 }
 
-bool PsMainWindow::psIsActive() const {
-	return isActiveWindow() && isVisible() && !(windowState() & Qt::WindowMinimized) && !psIdle;
+bool PsMainWindow::psIsActive(int state) const {
+	if (state < 0) state = this->windowState();
+	return isActiveWindow() && isVisible() && !(state & Qt::WindowMinimized) && !psIdle;
 }
 
 bool PsMainWindow::psIsOnline(int windowState) const {
diff --git a/Telegram/SourceFiles/pspecific_wnd.h b/Telegram/SourceFiles/pspecific_wnd.h
index 109316d88b..cb188d63c2 100644
--- a/Telegram/SourceFiles/pspecific_wnd.h
+++ b/Telegram/SourceFiles/pspecific_wnd.h
@@ -102,7 +102,7 @@ public:
 	void psFlash();
 	void psNotifySettingGot();
 
-	bool psIsActive() const;
+	bool psIsActive(int state = -1) const;
 	bool psIsOnline(int windowState) const;
 
 	void psUpdateWorkmode();
diff --git a/Telegram/SourceFiles/types.h b/Telegram/SourceFiles/types.h
index 363286ba24..81bbc33232 100644
--- a/Telegram/SourceFiles/types.h
+++ b/Telegram/SourceFiles/types.h
@@ -49,7 +49,7 @@ using std::swap;
 class Exception : public exception {
 public:
 
-    Exception(const QString &msg, bool isFatal = true) : _fatal(isFatal), _msg(msg) {
+    Exception(const QString &msg, bool isFatal = true) : _fatal(isFatal), _msg(msg.toUtf8()) {
 		LOG(("Exception: %1").arg(msg));
 	}
 	bool fatal() const {
@@ -57,14 +57,14 @@ public:
 	}
 
     virtual const char *what() const throw() {
-        return _msg.toUtf8().constData();
+        return _msg.constData();
     }
     virtual ~Exception() throw() {
     }
 
 private:
 	bool _fatal;
-    QString _msg;
+    QByteArray _msg;
 };
 
 class MTPint;
diff --git a/Telegram/Telegram.vcxproj b/Telegram/Telegram.vcxproj
index 6110d47d1d..8b2d0b4367 100644
--- a/Telegram/Telegram.vcxproj
+++ b/Telegram/Telegram.vcxproj
@@ -793,11 +793,11 @@
     </CustomBuild>
     <CustomBuild Include="Resources\style_classes.txt">
       <Outputs>.\GeneratedFiles\style_classes.h</Outputs>
-      <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h"</Command>
+      <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art"</Command>
     </CustomBuild>
     <CustomBuild Include="Resources\style.txt">
       <Outputs>.\GeneratedFiles\style_auto.h</Outputs>
-      <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h"</Command>
+      <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art"</Command>
     </CustomBuild>
     <CustomBuild Include="Resources\lang.txt">
       <Outputs>.\GeneratedFiles\lang.h</Outputs>