diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
index 58e514387..88ea5ba96 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
@@ -23,7 +23,6 @@ import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.Color
import android.graphics.Typeface
-import android.graphics.drawable.LayerDrawable
import android.os.Bundle
import android.text.SpannableStringBuilder
import android.text.TextWatcher
@@ -345,21 +344,9 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
toolbarBackground.fillColor = ColorStateList.valueOf(Color.TRANSPARENT)
binding.accountToolbar.background = toolbarBackground
- // Provide a non-transparent background to the navigation and overflow icons to ensure
- // they remain visible over whatever the profile background image might be.
- val backgroundCircle = AppCompatResources.getDrawable(this, R.drawable.background_circle)!!
- backgroundCircle.alpha = 210 // Any lower than this and the backgrounds interfere
- binding.accountToolbar.navigationIcon = LayerDrawable(
- arrayOf(
- backgroundCircle,
- binding.accountToolbar.navigationIcon
- )
- )
- binding.accountToolbar.overflowIcon = LayerDrawable(
- arrayOf(
- backgroundCircle,
- binding.accountToolbar.overflowIcon
- )
+ binding.accountToolbar.setNavigationIcon(R.drawable.ic_arrow_back_with_background)
+ binding.accountToolbar.setOverflowIcon(
+ AppCompatResources.getDrawable(this, R.drawable.ic_more_with_background)
)
binding.accountHeaderInfoContainer.background = MaterialShapeDrawable.createWithElevationOverlay(this, appBarElevation)
diff --git a/app/src/main/res/drawable/background_circle.xml b/app/src/main/res/drawable/background_circle.xml
index e10c97565..923aaee68 100644
--- a/app/src/main/res/drawable/background_circle.xml
+++ b/app/src/main/res/drawable/background_circle.xml
@@ -1,5 +1,5 @@
-
+ android:shape="oval" >
+
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 000000000..89d18543f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_arrow_back_with_background.xml b/app/src/main/res/drawable/ic_arrow_back_with_background.xml
new file mode 100644
index 000000000..1a4d711f0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_with_background.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml
new file mode 100644
index 000000000..f84f9b3f1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_more_with_background.xml b/app/src/main/res/drawable/ic_more_with_background.xml
new file mode 100644
index 000000000..755b37298
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_with_background.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml
index 57f15799b..e47febfcb 100644
--- a/app/src/main/res/values-night/theme_colors.xml
+++ b/app/src/main/res/values-night/theme_colors.xml
@@ -28,6 +28,8 @@
@color/white
@color/tusky_grey_10
+ #CC444B5D
+
#00731B
#DF0000
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index 32f2727fd..a309873fb 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -28,6 +28,8 @@
@color/tusky_grey_20
@color/white
+ #CCEBEFF4
+
#CCFFD8
#FFC0C0