diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bbdddaec9..48c907885 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -217,6 +217,20 @@
             </intent-filter>
         </activity-alias>
 
+        <activity-alias
+            android:name=".activities.MainActivity.Mastalab"
+            android:enabled="false"
+            android:icon="@mipmap/ic_launcher_mastalab"
+            android:roundIcon="@mipmap/ic_launcher_mastalab_round"
+            android:targetActivity=".activities.MainActivity">
+            <meta-data android:name="icon" android:value="mastalab" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity-alias>
+
+
         <activity
             android:name="app.fedilab.android.activities.MastodonRegisterActivity"
             android:windowSoftInputMode="stateAlwaysHidden"
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index bac84773c..e7a68dfdd 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -203,7 +203,8 @@ public abstract class BaseMainActivity extends BaseActivity
         FEDIVERSE,
         HERO,
         ATOM,
-        BRAINCRASH
+        BRAINCRASH,
+        MASTALAB
     }
     public static iconLauncher mLauncher = iconLauncher.BUBBLES;
 
diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
index e7c3dde05..555184498 100644
--- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
@@ -113,6 +113,7 @@ import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.BRAIN
 import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.BUBBLES;
 import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.FEDIVERSE;
 import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.HERO;
+import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.MASTALAB;
 import static app.fedilab.android.fragments.ContentSettingsFragment.type.ADMIN;
 import static app.fedilab.android.fragments.ContentSettingsFragment.type.COMPOSE;
 import static app.fedilab.android.fragments.ContentSettingsFragment.type.INTERFACE;
@@ -2534,6 +2535,16 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
                 icon_selector_dialog.dismiss();
             });
 
+            icon_selector.findViewById(R.id.icon_mastalab).setOnClickListener(v1 -> {
+                hideAllIcons(context);
+                setIcon(context,"Mastalab");
+                SharedPreferences.Editor editor2 = sharedpreferences.edit();
+                editor2.putString(Helper.LOGO_LAUNCHER, "mastalab");
+                editor2.apply();
+                BaseMainActivity.mLauncher = MASTALAB;
+                icon_selector_dialog.dismiss();
+            });
+
         });
 
         return rootView;
@@ -2559,6 +2570,10 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         context.getPackageManager().setComponentEnabledSetting(
                 new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity.BrainCrash"),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP);
+
+        context.getPackageManager().setComponentEnabledSetting(
+                new ComponentName(context.getPackageName(),"app.fedilab.android.activities.MainActivity.Mastalab"),
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP);
     }
 
     private void setIcon(Context context, String iconName) {
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 8e5a8a923..377f5e787 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1762,6 +1762,8 @@ public class Helper {
                 return R.drawable.ic_plain_atom;
             case "braincrash":
                 return R.drawable.ic_plain_crash;
+            case "mastalab":
+                return R.drawable.ic_plain_mastalab;
             default:
                 return R.drawable.ic_plain_bubbles;
         }
@@ -1781,6 +1783,8 @@ public class Helper {
                 return R.drawable.fedilab_logo_atom;
             case "braincrash":
                 return R.drawable.fedilab_logo_crash;
+            case "mastalab":
+                return R.drawable.fedilab_logo_mastalab;
             default:
                 return R.drawable.fedilab_logo_bubbles;
         }
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_plain_mastalab.xml b/app/src/main/res/drawable-anydpi-v24/ic_plain_mastalab.xml
new file mode 100644
index 000000000..c52a9be70
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_plain_mastalab.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="217.39131"
+    android:viewportHeight="217.39131">
+    <group
+        android:translateX="8.695652"
+        android:translateY="8.695652">
+        <path
+            android:fillColor="#c5ab63"
+            android:pathData="m181.304,39.789c-5.267,3.372 -8.631,4.265 -15.516,4.95 0.33,4.524 2.395,9.648 -3.712,14.794 -2.541,2.141 -10.425,1.862 -18.937,-0.964 -8.222,-2.73 -17.437,-7.326 -21.71,-9.69 -5.599,-3.096 -17.625,-4.824 -26.007,-4.573 -7.235,0.217 -26.705,0.917 -36.945,15.177 -10.24,14.26 -7.848,28.444 -7.871,31.518 -6.96,5.665 -24.179,25.226 -28.653,36.934 -4.474,11.709 -8.899,24.463 -6.949,37.316 1.682,11.084 7.38,16.636 16.849,23.322 9.469,6.686 33.512,11.576 62.255,11.423 28.744,-0.153 50.133,-7.908 58.28,-18.309 -10.585,-32.392 -24.102,-58.636 -16.5,-75.525 6.766,-15.033 16.841,-11.471 35.019,-24.271 16.637,-11.715 17.381,-29.274 10.397,-42.099z" />
+        <path
+            android:fillColor="#0a9ee6"
+            android:pathData="M154.69,25.012m-11.308,0a11.308,11.308 0,1 1,22.617 0a11.308,11.308 0,1 1,-22.617 0" />
+        <path
+            android:fillColor="#0a9ee6"
+            android:pathData="M171.89,7.236m-7.236,0a7.236,7.236 0,1 1,14.472 0a7.236,7.236 0,1 1,-14.472 0" />
+        <path
+            android:fillColor="#0a9ee6"
+            android:pathData="M175.955,31.449m-5.856,0a5.856,5.856 0,1 1,11.711 0a5.856,5.856 0,1 1,-11.711 0" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_plain_mastalab.png b/app/src/main/res/drawable-hdpi/ic_plain_mastalab.png
new file mode 100644
index 000000000..9d4697417
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_plain_mastalab.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_plain_mastalab.png b/app/src/main/res/drawable-mdpi/ic_plain_mastalab.png
new file mode 100644
index 000000000..8cb5dbde5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_plain_mastalab.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_plain_mastalab.png b/app/src/main/res/drawable-xhdpi/ic_plain_mastalab.png
new file mode 100644
index 000000000..fe4aedbd8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_plain_mastalab.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_plain_mastalab.png b/app/src/main/res/drawable-xxhdpi/ic_plain_mastalab.png
new file mode 100644
index 000000000..f31bfb2a9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_plain_mastalab.png differ
diff --git a/app/src/main/res/drawable/fedilab_logo_mastalab.xml b/app/src/main/res/drawable/fedilab_logo_mastalab.xml
new file mode 100644
index 000000000..27fb889aa
--- /dev/null
+++ b/app/src/main/res/drawable/fedilab_logo_mastalab.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="200"
+    android:viewportHeight="200">
+    <path
+        android:fillColor="#c5ab63"
+        android:pathData="m181.304,39.789c-5.267,3.372 -8.631,4.265 -15.516,4.95 0.33,4.524 2.395,9.648 -3.712,14.794 -2.541,2.141 -10.425,1.862 -18.937,-0.964 -8.222,-2.73 -17.437,-7.326 -21.71,-9.69 -5.599,-3.096 -17.625,-4.824 -26.007,-4.573 -7.235,0.217 -26.705,0.917 -36.945,15.177 -10.24,14.26 -7.848,28.444 -7.871,31.518 -6.96,5.665 -24.179,25.226 -28.653,36.934 -4.474,11.709 -8.899,24.463 -6.949,37.316 1.682,11.084 7.38,16.636 16.849,23.322 9.469,6.686 33.512,11.576 62.255,11.423 28.744,-0.153 50.133,-7.908 58.28,-18.309 -10.585,-32.392 -24.102,-58.636 -16.5,-75.525 6.766,-15.033 16.841,-11.471 35.019,-24.271 16.637,-11.715 17.381,-29.274 10.397,-42.099z" />
+    <path
+        android:fillColor="#0a9ee6"
+        android:pathData="M154.69,25.012m-11.308,0a11.308,11.308 0,1 1,22.617 0a11.308,11.308 0,1 1,-22.617 0" />
+    <path
+        android:fillColor="#0a9ee6"
+        android:pathData="M171.89,7.236m-7.236,0a7.236,7.236 0,1 1,14.472 0a7.236,7.236 0,1 1,-14.472 0" />
+    <path
+        android:fillColor="#0a9ee6"
+        android:pathData="M175.955,31.449m-5.856,0a5.856,5.856 0,1 1,11.711 0a5.856,5.856 0,1 1,-11.711 0" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_mastalab_foreground.xml b/app/src/main/res/drawable/ic_launcher_mastalab_foreground.xml
new file mode 100644
index 000000000..dc1764e54
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_mastalab_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="517.1717"
+    android:viewportHeight="517.1717">
+    <group
+        android:translateX="2.5858586"
+        android:translateY="2.5858586">
+        <path
+            android:fillAlpha="0.19672002"
+            android:fillColor="#FF000000"
+            android:pathData="M339.418,136.372 L326.506,148.59 512,339.305v-25.494z" />
+        <path
+            android:fillAlpha="0.19607999"
+            android:fillColor="#FF000000"
+            android:pathData="M343.014,167.117 L512,340.461V512H301.695L149.102,355.406c43.295,-87.069 65.323,-115.744 100.505,-124.307 35.178,-8.558 85.337,-14.379 83.991,-24.358l-31.855,-32.89 19.746,-19.527 19.745,20.301z" />
+        <path
+            android:fillColor="#c5ab63"
+            android:pathData="m344.593,182.538c-6.47,4.143 -10.602,5.239 -19.061,6.081 0.405,5.558 2.943,11.852 -4.561,18.174 -3.121,2.63 -12.807,2.287 -23.263,-1.184 -10.1,-3.353 -21.42,-9 -26.669,-11.903 -6.878,-3.803 -21.651,-5.926 -31.948,-5.617 -8.887,0.267 -32.805,1.126 -45.384,18.644 -12.579,17.517 -9.641,34.941 -9.669,38.718 -8.55,6.959 -29.702,30.988 -35.198,45.371 -5.496,14.383 -10.932,30.051 -8.536,45.84 2.066,13.617 9.066,20.436 20.698,28.649 11.632,8.214 41.167,14.22 76.477,14.032 35.31,-0.188 61.585,-9.715 71.593,-22.492 -13.003,-39.792 -29.608,-72.031 -20.269,-92.778 8.312,-18.468 20.687,-14.091 43.019,-29.815 20.437,-14.391 21.352,-35.961 12.771,-51.716z" />
+        <path
+            android:fillColor="#0a9ee6"
+            android:pathData="M311.899,164.385m-13.892,0a13.892,13.892 0,1 1,27.783 0a13.892,13.892 0,1 1,-27.783 0" />
+        <path
+            android:fillColor="#0a9ee6"
+            android:pathData="M333.028,142.548m-8.889,0a8.889,8.889 0,1 1,17.778 0a8.889,8.889 0,1 1,-17.778 0" />
+        <path
+            android:fillColor="#0a9ee6"
+            android:pathData="M338.021,172.293m-7.193,0a7.193,7.193 0,1 1,14.387 0a7.193,7.193 0,1 1,-14.387 0" />
+    </group>
+</vector>
diff --git a/app/src/main/res/layout/dialog_icon_selector.xml b/app/src/main/res/layout/dialog_icon_selector.xml
index 07acc1252..8bdeb925c 100644
--- a/app/src/main/res/layout/dialog_icon_selector.xml
+++ b/app/src/main/res/layout/dialog_icon_selector.xml
@@ -109,4 +109,26 @@
             android:text="BrainCrash" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/icon_mastalab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="10dp"
+            android:src="@mipmap/ic_launcher_mastalab" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Mastalab" />
+    </LinearLayout>
+
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mastalab.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mastalab.xml
new file mode 100644
index 000000000..0c1231b9d
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mastalab.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_mastalab_background" />
+    <foreground android:drawable="@drawable/ic_launcher_mastalab_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mastalab_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mastalab_round.xml
new file mode 100644
index 000000000..0c1231b9d
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_mastalab_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_mastalab_background" />
+    <foreground android:drawable="@drawable/ic_launcher_mastalab_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_mastalab.png b/app/src/main/res/mipmap-hdpi/ic_launcher_mastalab.png
new file mode 100644
index 000000000..23435d512
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_mastalab.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_mastalab_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_mastalab_round.png
new file mode 100644
index 000000000..d105f2c80
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_mastalab_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_mastalab.png b/app/src/main/res/mipmap-mdpi/ic_launcher_mastalab.png
new file mode 100644
index 000000000..47eaef203
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_mastalab.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_mastalab_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_mastalab_round.png
new file mode 100644
index 000000000..061676e97
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_mastalab_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_mastalab.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_mastalab.png
new file mode 100644
index 000000000..684512bc8
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_mastalab.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_mastalab_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_mastalab_round.png
new file mode 100644
index 000000000..d15884288
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_mastalab_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_mastalab.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mastalab.png
new file mode 100644
index 000000000..01fa6a960
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mastalab.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_mastalab_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mastalab_round.png
new file mode 100644
index 000000000..11078c7b1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_mastalab_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mastalab.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mastalab.png
new file mode 100644
index 000000000..e4359945c
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mastalab.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mastalab_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mastalab_round.png
new file mode 100644
index 000000000..0152187c0
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mastalab_round.png differ
diff --git a/app/src/main/res/values/ic_launcher_mastalab_background.xml b/app/src/main/res/values/ic_launcher_mastalab_background.xml
new file mode 100644
index 000000000..6ae7a0dda
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_mastalab_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_mastalab_background">#434958</color>
+</resources>
\ No newline at end of file