Use some icons from lib_ui.

.gitignore

@@ -1,24 +1,8 @@
 /out/
-/Debug/
-/Release/
-/Deploy/
+Debug/
+Release/
 /ThirdParty/
 /Telegram/build/target
-/Telegram/GeneratedFiles/
-/Telegram/SourceFiles/art/grid.png
-/Telegram/SourceFiles/art/grid_125x.png
-/Telegram/SourceFiles/art/grid_150x.png
-/Telegram/SourceFiles/art/grid_200x.png
-/Telegram/SourceFiles/art/sprite_125x.png
-/Telegram/SourceFiles/art/sprite_150x.png
-/Telegram/Resources/art/grid.png
-/Telegram/Resources/art/grid_125x.png
-/Telegram/Resources/art/grid_150x.png
-/Telegram/Resources/art/grid_200x.png
-/Telegram/Resources/art/sprite_125x.png
-/Telegram/Resources/art/sprite_150x.png
-/Telegram/Debug/
-/Telegram/Release/
 /Telegram/tests/
 /Telegram/gyp/tests/*.test
 /Telegram/out/
@@ -32,7 +16,6 @@
 *.VC.db
 *.aps
 *.xcodeproj
-/Win32/
 ipch/
 .vs/
 

Telegram/SourceFiles/boxes/boxes.style

@@ -10,8 +10,26 @@ using "ui/basic.style";
 using "ui/widgets/widgets.style";
 using "intro/intro.style";
 
-boxDuration: 200;
-boxRadius: 3px;
+UserpicButton {
+	size: size;
+	photoSize: pixels;
+	photoPosition: point;
+	changeButton: RoundButton;
+	changeIcon: icon;
+	changeIconPosition: point;
+	duration: int;
+	uploadHeight: pixels;
+	uploadBg: color;
+	uploadIcon: icon;
+	uploadIconPosition: point;
+}
+
+FeedUserpicButton {
+	size: size;
+	innerSize: pixels;
+	innerPosition: point;
+	innerPart: UserpicButton;
+}
 
 ServiceCheck {
 	margin: margins;
@@ -26,6 +44,9 @@ ServiceCheck {
 	duration: int;
 }
 
+boxDuration: 200;
+boxRadius: 3px;
+
 boxButtonFont: font(boxFontSize semibold);
 defaultBoxButton: RoundButton(defaultLightButton) {
 	width: -24px;
@@ -161,6 +182,28 @@ boxPhotoCompressedSkip: 20px;
 boxPhotoCaptionSkip: 8px;
 boxPhotoTextFg: windowSubTextFg;
 
+defaultChangeUserpicIcon: icon {{ "new_chat_photo", activeButtonFg }};
+defaultUploadUserpicIcon: icon {{ "upload_chat_photo", msgDateImgFg }};
+defaultUserpicButton: UserpicButton {
+	size: size(76px, 76px);
+	photoSize: 76px;
+	photoPosition: point(-1px, -1px);
+	changeButton: defaultActiveButton;
+	changeIcon: defaultChangeUserpicIcon;
+	changeIconPosition: point(23px, 25px);
+	duration: 500;
+	uploadHeight: 24px;
+	uploadBg: msgDateImgBgOver;
+	uploadIcon: defaultUploadUserpicIcon;
+	uploadIconPosition: point(-1px, 1px);
+}
+defaultFeedUserpicButton: FeedUserpicButton {
+	size: size(76px, 76px);
+	innerSize: 76px;
+	innerPosition: point(-1px, -1px);
+	innerPart: defaultUserpicButton;
+}
+
 boxLoadingAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
 	color: windowSubTextFg;
 	thickness: 2px;
@@ -224,24 +267,6 @@ contactUserIcon: icon {{ "settings_name", menuIconFg }};
 contactPhoneIcon: icon {{ "settings_phone_number", menuIconFg }};
 contactIconPosition: point(-5px, 23px);
 
-contactsAddIconAbove: icon {{ "contacts_add", activeButtonFg, point(18px, 18px) }};
-contactsAdd: TwoIconButton {
-	width: 52px;
-	height: 52px;
-
-	iconBelow: contactsAddIconBelow;
-	iconBelowOver: contactsAddIconBelowOver;
-	iconAbove: contactsAddIconAbove;
-	iconAboveOver: contactsAddIconAbove;
-
-	rippleAreaPosition: point(5px, 5px);
-	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: activeButtonBgRipple;
-	}
-}
-contactsAddPosition: point(14px, 8px);
-
 contactPadding: margins(49px, 2px, 0px, 12px);
 contactSkip: 6px;
 contactPhoneSkip: 30px;

Telegram/SourceFiles/history/history.style

@@ -47,6 +47,14 @@ historyToDownPosition: point(12px, 10px);
 historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg, point(17px, 23px) }};
 historyToDownAboveOver: icon {{ "history_down_arrow", historyToDownFgOver, point(17px, 23px) }};
 historyToDownPaddingTop: 10px;
+historyToDownBelow: icon {
+	{ "history_down_shadow", historyToDownShadow },
+	{ "history_down_circle", historyToDownBg, point(4px, 4px) },
+};
+historyToDownBelowOver: icon {
+	{ "history_down_shadow", historyToDownShadow },
+	{ "history_down_circle", historyToDownBgOver, point(4px, 4px) },
+};
 historyToDown: TwoIconButton {
 	width: 52px;
 	height: 62px;

Telegram/SourceFiles/info/profile/info_profile_cover.cpp

@@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
-#include "styles/style_info.h"
 #include "ui/widgets/labels.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
@@ -29,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
+#include "styles/style_boxes.h"
+#include "styles/style_info.h"
 
 namespace Info {
 namespace Profile {

Telegram/SourceFiles/window/window.style

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 using "ui/basic.style";
 using "ui/widgets/widgets.style";
 using "history/history.style";
+using "boxes/boxes.style"; // UserpicButton
 
 windowMinWidth: 380px;
 windowMinHeight: 480px;

Telegram/lib_ui

@@ -1 +1 @@
-Subproject commit 342fad864a30acc92f6cfc2cd5ad631c7133ee8f
+Subproject commit 946c33ef251ea5a46340e72ae903487576baf9b4