diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index a17b32253f..8b0ea603b1 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -80,14 +80,11 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
-<<<<<<< Updated upstream
-=======
-<<<<<<< Updated upstream
+
 import androidx.drawerlayout.widget.DrawerLayout;
-=======
+
 import androidx.core.content.ContextCompat;
->>>>>>> Stashed changes
->>>>>>> Stashed changes
+
 
 import android.util.TypedValue;
 import android.view.KeyEvent;
@@ -175,21 +172,19 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     toolbar = (Toolbar) findViewById(R.id.titlebar);
     setSupportActionBar(toolbar);
     getSupportActionBar().setTitle(null);
-<<<<<<< Updated upstream
+
     getSupportActionBar().setDisplayUseLogoEnabled(true);
     getSupportActionBar().setDisplayShowHomeEnabled(true);
     getSupportActionBar().setLogo(R.drawable.keyman_logo);
-=======
-<<<<<<< Updated upstream
+
     getSupportActionBar().setDisplayUseLogoEnabled(false);
     getSupportActionBar().setDisplayShowHomeEnabled(false);
-=======
+
     getSupportActionBar().setDisplayUseLogoEnabled(true);
     getSupportActionBar().setDisplayShowHomeEnabled(true);
     getSupportActionBar().setLogo(R.drawable.keyman_logo_mode);
 //    getSupportActionBar().setLogo(R.drawable.keyman_logo);
->>>>>>> Stashed changes
->>>>>>> Stashed changes
+
     getSupportActionBar().setDisplayShowTitleEnabled(false);
     getSupportActionBar().setBackgroundDrawable(getActionBarDrawable(this));
 
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/keyman_text.png b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/keyman_text.png
index 2f2891cfb8..48b555f559 100644
Binary files a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/keyman_text.png and b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/keyman_text.png differ
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml b/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml
index 9d467ae156..5cb427161f 100644
--- a/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml
+++ b/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml
@@ -10,7 +10,7 @@
         android:bottom="@dimen/product_logo_bottom"
         >
         <bitmap
-            android:src="@drawable/keyman_logo_splash"
+            android:src="@drawable/keyman_logo_splash_dark_mode"
             android:gravity="center"/>
     </item>
 
diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/keyman_logo_splash_dark_mode.png b/android/KMAPro/kMAPro/src/main/res/drawable/keyman_logo_splash_dark_mode.png
index f26f30c786..0ed8dd4e0d 100644
Binary files a/android/KMAPro/kMAPro/src/main/res/drawable/keyman_logo_splash_dark_mode.png and b/android/KMAPro/kMAPro/src/main/res/drawable/keyman_logo_splash_dark_mode.png differ
diff --git a/android/KMAPro/kMAPro/src/main/res/menu/main.xml b/android/KMAPro/kMAPro/src/main/res/menu/main.xml
index fcfaef95c9..7f26efbf81 100644
--- a/android/KMAPro/kMAPro/src/main/res/menu/main.xml
+++ b/android/KMAPro/kMAPro/src/main/res/menu/main.xml
@@ -24,20 +24,13 @@
         android:title="@string/action_overflow"
         android:icon="@drawable/ic_action_overflow_mode"
         >
+<!--        <item android:id="@+id/action_shared"-->
+<!--            app:showAsAction="always"-->
+<!--            android:title="@string/action_share"-->
+<!--            android:icon="@drawable/ic_light_action_share" />-->
 
-<<<<<<< Updated upstream
-        <menu>
-<<<<<<< Updated upstream
-=======
-                <item android:id="@+id/action_share"
-                    app:showAsAction="always"
-                    android:title="@string/action_share"
-                    android:icon="@drawable/ic_light_action_share" />
-=======
         <menu
             >
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 
             <item
                 android:id="@+id/action_text_size"
diff --git a/android/KMAPro/kMAPro/src/main/res/values-night/colors.xml b/android/KMAPro/kMAPro/src/main/res/values-night/colors.xml
index 1134de7f9e..d60fdca70a 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-night/colors.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-night/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="yellow_background">#171717</color>
+    <color name="yellow_background">#131313</color>
 
     <color name="iconColor">#FFFFFF</color>
     <color name="toolbarColor">@color/ms_black</color>