(cherry picked from commit ee26d6dffd8c77115683ea242c3ab729c70f7ea6) # Conflicts: # app/src/main/res/drawable/ic_tachi.xml # presentation-core/src/main/res/values/colors.xml
(cherry picked from commit 4054f2a6a0b627ec87a18519da3e169f41413ca4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/res/layout/reader_activity.xml