diff --git a/Telegram/SourceFiles/gui/flatbutton.cpp b/Telegram/SourceFiles/gui/flatbutton.cpp
index 88f31d7d2..8cc1353d9 100644
--- a/Telegram/SourceFiles/gui/flatbutton.cpp
+++ b/Telegram/SourceFiles/gui/flatbutton.cpp
@@ -233,12 +233,10 @@ void MaskedButton::paintEvent(QPaintEvent *e) {
 		p.drawText(t.x(), t.y() + _st.font->ascent, _text);
 	}
 
-	const QRect &i((_state & StateDown) ? _st.downIcon : _st.icon);
-	if (i.width()) {
+	const style::sprite &i((_state & StateDown) ? _st.downIcon : _st.icon);
+	if (i.pxWidth()) {
 		const QPoint &t((_state & StateDown) ? _st.downIconPos : _st.iconPos);
-		QRect r(i);
-		r.moveTo(t);
-		p.fillRect(r, a_bg.current());
+		p.fillRect(QRect(t, QSize(i.pxWidth(), i.pxHeight())), a_bg.current());
 		p.drawPixmap(t, App::sprite(), i);
 	}
 }
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index 80262d781..50b65e8a6 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -1148,7 +1148,7 @@ void MediaView::receiveMouse() {
 
 void MediaView::onCheckActive() {
 	if (App::wnd() && isVisible()) {
-		if (App::wnd()->isActiveWindow()) {
+		if (App::wnd()->isActiveWindow() && App::wnd()->hasFocus()) {
 			activateWindow();
 			setFocus();
 		}
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index 5524a7b48..f4424dd66 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -329,9 +329,9 @@ NotifyWindow::~NotifyWindow() {
 	if (App::wnd()) App::wnd()->notifyShowNext(this);
 }
 
-Window::Window(QWidget *parent) : PsMainWindow(parent),
+Window::Window(QWidget *parent) : PsMainWindow(parent), _serviceHistoryRequest(0),
 intro(0), main(0), settings(0), layerBG(0), _topWidget(0),
-_connecting(0), _clearManager(0), dragging(false), _inactivePress(false), _mediaView(0), _serviceHistoryRequest(0) {
+_connecting(0), _clearManager(0), dragging(false), _inactivePress(false), _mediaView(0) {
 
 	icon16 = icon256.scaledToWidth(16, Qt::SmoothTransformation);
 	icon32 = icon256.scaledToWidth(32, Qt::SmoothTransformation);