diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 77ee2de45..382bf5471 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -128,10 +128,6 @@
             android:label="@string/community_guidelines">
         </activity>
 
-        <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
-        <meta-data
-                android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
-                android:value="false"/>
         <activity
             android:name=".ui.activities.TaskFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
@@ -189,9 +185,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.activities.MainActivity" />
         </activity>
-        <activity android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name" />
         <activity android:name=".ui.activities.MaintenanceActivity"
                   android:screenOrientation="unspecified"
                   android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml
index b2a3cbd1a..28c1c4984 100644
--- a/Habitica/AndroidManifestTesting.xml
+++ b/Habitica/AndroidManifestTesting.xml
@@ -103,12 +103,6 @@
             tools:ignore="UnusedAttribute"
             android:label="@string/invite_users">
         </activity>
-        <activity android:name="com.facebook.FacebookActivity"
-            android:configChanges=
-                "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:label="@string/app_name" />
         <activity android:name=".ui.activities.MaintenanceActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index ff862e19d..a083d52e2 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -167,7 +167,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         resConfigs 'en', 'bg', 'de', 'en-rGB', 'es', 'fr', 'hr-rHR', 'in', 'it', 'iw', 'ja', 'ko', 'lt', 'nl', 'pl', 'pt-rBR', 'pt-rPT', 'ru', 'tr', 'zh', 'zh-rTW'
 
-        versionCode 3504
+        versionCode 3506
         versionName "3.6"
 
         targetSdkVersion 32
diff --git a/Habitica/res/layout/dialog_hatch_pet_button.xml b/Habitica/res/layout/dialog_hatch_pet_button.xml
index 3511c41c2..895be21a2 100644
--- a/Habitica/res/layout/dialog_hatch_pet_button.xml
+++ b/Habitica/res/layout/dialog_hatch_pet_button.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="wrap_content"
-    android:layout_height="60dp">
+    android:layout_height="60dp"
+    android:background="@drawable/button_background_primary"
+    android:gravity="center">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -10,7 +12,7 @@
         android:letterSpacing="0.02"
         android:fontFamily="@string/font_family_medium"
         android:text="@string/hatch"
-        android:textColor="?attr/colorAccent"
+        android:textColor="@color/white"
         android:layout_marginEnd="6dp"
         />
     <com.habitrpg.android.habitica.ui.views.CurrencyView
diff --git a/Habitica/res/xml/remote_config_defaults.xml b/Habitica/res/xml/remote_config_defaults.xml
index 1509d0db7..c3f238980 100644
--- a/Habitica/res/xml/remote_config_defaults.xml
+++ b/Habitica/res/xml/remote_config_defaults.xml
@@ -104,10 +104,6 @@
         <key>enableTeamBoards</key>
         <value>false</value>
     </entry>
-    <entry>
-        <key>hideFacebook</key>
-        <value>false</value>
-    </entry>
 
     <entry>
         <key>enableNewArmoire</key>
@@ -115,7 +111,7 @@
     </entry>
     <entry>
         <key>enableArmoireAds</key>
-        <value>true</value>
+        <value>false</value>
     </entry>
     <entry>
         <key>enableFaintAds</key>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
index afdb08fc2..81a2eda4e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
@@ -157,8 +157,4 @@ class AppConfigManager(contentRepository: ContentRepository?) {
     fun enableNewArmoire(): Boolean {
         return remoteConfig.getBoolean("enableNewArmoire")
     }
-
-    fun hideFacebook(): Boolean {
-        return remoteConfig.getBoolean("hideFacebook")
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 8b366e258..12ba5447e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -139,7 +139,7 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
         compositeSubscription.add(
             observable.subscribe(
                 { challenges ->
-                    if (challenges.size == 0) {
+                    if (challenges.isEmpty()) {
                         retrieveChallengesPage()
                     }
                     this.challenges = challenges
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
index 4e5403cd3..29f752bd2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import android.graphics.drawable.BitmapDrawable
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.LinearLayout
 import androidx.core.graphics.drawable.toBitmap
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogHatchPetButtonBinding
 import com.habitrpg.android.habitica.databinding.DialogPetSuggestHatchBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -20,7 +20,6 @@ import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.CurrencyView
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Observable
@@ -130,15 +129,11 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                 hatchPrice += getItemPrice(pet, potion, hasUnlockedPotion)
             }
 
-            addButton(R.string.close, true)
-
             if (hatchPrice > 0) {
-                val linearLayout = layoutInflater.inflate(R.layout.dialog_hatch_pet_button, null) as? LinearLayout ?: return
-
-                val priceView = linearLayout.findViewById<CurrencyView>(R.id.currencyView)
-                priceView?.value = hatchPrice.toDouble()
-                priceView?.currency = "gems"
-                addButton(linearLayout, true) { _, _ ->
+                val binding = DialogHatchPetButtonBinding.inflate(layoutInflater)
+                binding.currencyView.value = hatchPrice.toDouble()
+                binding.currencyView.currency = "gems"
+                addButton(binding.root, true) { _, _ ->
                     val activity = (getActivity() as? MainActivity) ?: return@addButton
                     val thisPotion = potion ?: return@addButton
                     val thisEgg = egg ?: return@addButton
@@ -160,6 +155,8 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                 }
             }
 
+            addButton(R.string.close, false)
+
             setTitle(R.string.unhatched_pet)
         }