diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
index b17888a9a..7ae186a32 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
@@ -327,7 +327,7 @@ public class ActionBar extends FrameLayout {
                     }
                 }
             }
-            if (NekoConfig.actionBarDecoration.Int() == 3 || !manualStart) {
+            if (NekoConfig.actionBarDecoration.Int() == 3) {
                 if (snowflakesEffect != null) {
                     snowflakesEffect = null;
                 }
@@ -342,6 +342,13 @@ public class ActionBar extends FrameLayout {
                 if (snowflakesEffect == null) {
                     snowflakesEffect = new SnowflakesEffect(0);
                 }
+            } else if (!manualStart) {
+                if (snowflakesEffect != null) {
+                    snowflakesEffect = null;
+                }
+                if (fireworksEffect != null) {
+                    fireworksEffect = null;
+                }
             }
             if (snowflakesEffect != null) {
                 snowflakesEffect.onDraw(this, canvas);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java
index 91f810306..23374aba6 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java
@@ -415,8 +415,8 @@ public class FilterTabsView extends FrameLayout {
                     android.graphics.Rect bounds = new android.graphics.Rect(0, 0, emoticonSize, emoticonSize);
                     icon = getResources().getDrawable(FolderIconHelper.getTabIcon(currentTab.emoticon)).mutate();
                     icon.setBounds(bounds);
+                    icon.setTint(textPaint.getColor());
                 }
-                icon.setTint(textPaint.getColor());
                 iconX = (int) ((getMeasuredWidth() - tabWidth) / 2f);
                 if (animateIconX) {
                     iconX = (int) (iconX * changeProgress + animateFromIconX * (1f - changeProgress));
@@ -441,7 +441,7 @@ public class FilterTabsView extends FrameLayout {
                         canvas.restore();
                         iconAnimateInDrawable.setAlpha(alpha);
                     }
-                } else {
+                } else if (icon != null) {
                     canvas.save();
                     canvas.translate(iconX, iconY);
                     icon.draw(canvas);