diff --git a/Telegram/Resources/art/ayu/chibi/app.png b/Telegram/Resources/art/ayu/chibi/app.png
new file mode 100644
index 000000000..d4d7bbbe2
Binary files /dev/null and b/Telegram/Resources/art/ayu/chibi/app.png differ
diff --git a/Telegram/Resources/art/ayu/chibi/app_icon.ico b/Telegram/Resources/art/ayu/chibi/app_icon.ico
new file mode 100644
index 000000000..546e64ff9
Binary files /dev/null and b/Telegram/Resources/art/ayu/chibi/app_icon.ico differ
diff --git a/Telegram/Resources/art/ayu/chibi/app_preview.png b/Telegram/Resources/art/ayu/chibi/app_preview.png
new file mode 100644
index 000000000..eac4ae141
Binary files /dev/null and b/Telegram/Resources/art/ayu/chibi/app_preview.png differ
diff --git a/Telegram/Resources/art/ayu/chibi2/app.png b/Telegram/Resources/art/ayu/chibi2/app.png
new file mode 100644
index 000000000..5b576a197
Binary files /dev/null and b/Telegram/Resources/art/ayu/chibi2/app.png differ
diff --git a/Telegram/Resources/art/ayu/chibi2/app_icon.ico b/Telegram/Resources/art/ayu/chibi2/app_icon.ico
new file mode 100644
index 000000000..cd27a6c68
Binary files /dev/null and b/Telegram/Resources/art/ayu/chibi2/app_icon.ico differ
diff --git a/Telegram/Resources/art/ayu/chibi2/app_preview.png b/Telegram/Resources/art/ayu/chibi2/app_preview.png
new file mode 100644
index 000000000..cc9ff6d40
Binary files /dev/null and b/Telegram/Resources/art/ayu/chibi2/app_preview.png differ
diff --git a/Telegram/Resources/qrc/ayu/ayu.qrc b/Telegram/Resources/qrc/ayu/ayu.qrc
index 912ce484b..a02b36f73 100644
--- a/Telegram/Resources/qrc/ayu/ayu.qrc
+++ b/Telegram/Resources/qrc/ayu/ayu.qrc
@@ -6,6 +6,12 @@
         <file alias="art/ayu/bard/app.png">../../art/ayu/bard/app.png</file>
         <file alias="art/ayu/bard/app_preview.png">../../art/ayu/bard/app_preview.png</file>
         <file alias="art/ayu/bard/app_icon.ico">../../art/ayu/bard/app_icon.ico</file>
+        <file alias="art/ayu/chibi/app.png">../../art/ayu/chibi/app.png</file>
+        <file alias="art/ayu/chibi/app_preview.png">../../art/ayu/chibi/app_preview.png</file>
+        <file alias="art/ayu/chibi/app_icon.ico">../../art/ayu/chibi/app_icon.ico</file>
+        <file alias="art/ayu/chibi2/app.png">../../art/ayu/chibi2/app.png</file>
+        <file alias="art/ayu/chibi2/app_preview.png">../../art/ayu/chibi2/app_preview.png</file>
+        <file alias="art/ayu/chibi2/app_icon.ico">../../art/ayu/chibi2/app_icon.ico</file>
         <file alias="art/ayu/default/app.png">../../art/ayu/default/app.png</file>
         <file alias="art/ayu/default/app_preview.png">../../art/ayu/default/app_preview.png</file>
         <file alias="art/ayu/default/app_icon.ico">../../art/ayu/default/app_icon.ico</file>
diff --git a/Telegram/SourceFiles/ayu/ui/ayu_logo.h b/Telegram/SourceFiles/ayu/ui/ayu_logo.h
index 78c1b1156..556e93bc4 100644
--- a/Telegram/SourceFiles/ayu/ui/ayu_logo.h
+++ b/Telegram/SourceFiles/ayu/ui/ayu_logo.h
@@ -18,6 +18,8 @@ ICON(EXTERA, "extera");
 ICON(NOTHING, "nothing");
 ICON(BARD, "bard");
 ICON(YAPLUS, "yaplus");
+ICON(CHIBI, "chibi");
+ICON(CHIBI2, "chibi2");
 
 void loadAppIco();
 
diff --git a/Telegram/SourceFiles/ayu/ui/ayu_styles.style b/Telegram/SourceFiles/ayu/ui/ayu_styles.style
index 658cb0553..8dc351e64 100644
--- a/Telegram/SourceFiles/ayu/ui/ayu_styles.style
+++ b/Telegram/SourceFiles/ayu/ui/ayu_styles.style
@@ -12,12 +12,10 @@ using "ui/colors.palette";
 using "ui/widgets/widgets.style";
 using "info/info.style";
 
-iconPreviewStroke: activeButtonBg;
-
 /* Color Picker */
 cpPadding: 14px;
 cpSelectedPadding: 2px;
-cpPenSize: 2px;
+cpSelectedRounding: 12px;
 cpImagePadding: 4px;
 cpSpacingX: 16px;
 cpSpacingY: 8px;
diff --git a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp
index 9ae900c3d..988b81828 100644
--- a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp
+++ b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp
@@ -28,7 +28,9 @@ const QVector<QString> icons{
 	AyuAssets::EXTERA_ICON,
 	AyuAssets::NOTHING_ICON,
 	AyuAssets::BARD_ICON,
-	AyuAssets::YAPLUS_ICON
+	AyuAssets::YAPLUS_ICON,
+	AyuAssets::CHIBI_ICON,
+	AyuAssets::CHIBI2_ICON,
 };
 
 const auto rows = static_cast<int>(icons.size()) / 4 + std::min(1, static_cast<int>(icons.size()) % 4);
@@ -36,18 +38,26 @@ const auto rows = static_cast<int>(icons.size()) / 4 + std::min(1, static_cast<i
 void drawIcon(QPainter &p, const QImage &icon, int xOffset, int yOffset, float strokeOpacity) {
 	xOffset += st::cpPadding;
 
-	// stroke
 	p.save();
-	p.setPen(QPen(st::iconPreviewStroke, st::cpPenSize));
+	p.setPen(QPen(st::boxDividerBg, 0));
+	p.setBrush(QBrush(st::boxDividerBg));
 	p.setOpacity(strokeOpacity);
-	p.drawEllipse(xOffset + st::cpSelectedPadding,
-				  yOffset + st::cpSelectedPadding,
-				  st::cpIconSize + st::cpSelectedPadding * 2,
-				  st::cpIconSize + st::cpSelectedPadding * 2);
+	p.drawRoundedRect(
+		xOffset + st::cpSelectedPadding,
+		yOffset + st::cpSelectedPadding,
+		st::cpIconSize + st::cpSelectedPadding * 2,
+		st::cpIconSize + st::cpSelectedPadding * 2,
+		st::cpSelectedRounding,
+		st::cpSelectedRounding
+	);
 	p.restore();
-	// /stroke
 
-	auto rect = QRect(xOffset + st::cpImagePadding, yOffset + st::cpImagePadding, st::cpIconSize, st::cpIconSize);
+	auto rect = QRect(
+		xOffset + st::cpImagePadding,
+		yOffset + st::cpImagePadding,
+		st::cpIconSize,
+		st::cpIconSize
+	);
 	p.drawImage(rect, icon);
 }
 
@@ -65,7 +75,7 @@ void applyIcon() {
 
 IconPicker::IconPicker(QWidget *parent)
 	: RpWidget(parent) {
-	setMinimumSize(st::boxWidth, (st::cpIconSize + st::cpPadding) * rows);
+	setMinimumSize(st::boxWidth, (st::cpIconSize + st::cpPadding) * rows - st::cpPadding);
 }
 
 void IconPicker::paintEvent(QPaintEvent *e) {
@@ -80,21 +90,27 @@ void IconPicker::paintEvent(QPaintEvent *e) {
 			auto const idx = i + row * 4;
 
 			const auto &iconName = icons[idx];
+			if (iconName.isEmpty()) {
+				continue;
+			}
+
 			auto icon = AyuAssets::loadPreview(iconName)
 				.scaled(st::cpIconSize, st::cpIconSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
 			auto opacity = 0.0f;
-		    if (iconName == wasSelected) {
+			if (iconName == wasSelected) {
 				opacity = 1.0f - animation.value(1.0f);
 			} else if (iconName == AyuAssets::currentAppLogoName()) {
 				opacity = wasSelected.isEmpty() ? 1.0f : animation.value(1.0f);
 			}
 
-			drawIcon(p,
-					 icon,
-					 (st::cpIconSize + st::cpSpacingX) * i + offset,
-					 row * (st::cpIconSize + st::cpSpacingY),
-					 opacity);
+			drawIcon(
+				p,
+				icon,
+				(st::cpIconSize + st::cpSpacingX) * i + offset,
+				row * (st::cpIconSize + st::cpSpacingY),
+				opacity
+			);
 		}
 	}
 }
@@ -114,6 +130,10 @@ void IconPicker::mousePressEvent(QMouseEvent *e) {
 			if (x >= xOffset && x <= xOffset + st::cpIconSize && e->pos().y() >= yOffset
 				&& e->pos().y() <= yOffset + st::cpIconSize) {
 				const auto &iconName = icons[idx];
+				if (iconName.isEmpty()) {
+					break;
+				}
+
 				if (settings->appIcon != iconName) {
 					wasSelected = settings->appIcon;
 					animation.start(
@@ -124,7 +144,8 @@ void IconPicker::mousePressEvent(QMouseEvent *e) {
 						0.0,
 						1.0,
 						200,
-						anim::easeOutCubic);
+						anim::easeOutCubic
+					);
 
 					settings->set_appIcon(iconName);
 					changed = true;