diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 636263e0a..1dcf264c0 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -59,7 +59,7 @@ dependencies {
 	implementation 'me.grishka.litex:dynamicanimation:1.1.0-alpha03'
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2'
+	implementation 'me.grishka.appkit:appkit:1.2.1'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
index a20a0864d..78f091022 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -597,8 +597,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 		@Override
 		public ImageLoaderRequest getImageRequest(int position, int image){
-			if(position>=displayItems.size()) // TODO fix this in the image loader, these crashes are driving me crazy
-				return null;
 			return displayItems.get(position).getImageRequest(image);
 		}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
index ab9adfea5..e9538f58e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
@@ -84,7 +84,7 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 		list.setClipToPadding(false);
 		dividerPaint.setStyle(Paint.Style.STROKE);
 		dividerPaint.setStrokeWidth(V.dp(1));
-		dividerPaint.setColor(getResources().getColor(R.color.gray_200)); // TODO themes
+		dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), R.attr.colorPollVoted));
 		list.addItemDecoration(new RecyclerView.ItemDecoration(){
 			@Override
 			public void onDrawOver(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java
index 2154b2fb1..368672bc2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java
@@ -375,8 +375,6 @@ public class ComposeAutocompleteViewController{
 
 		@Override
 		public ImageLoaderRequest getImageRequest(int position, int image){
-			if(position>=emojis.size())
-				return null;
 			return emojis.get(position).request;
 		}
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
index 50f6d4bc8..3f4a118bb 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
@@ -8,7 +8,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
 import android.net.Uri;
-import android.os.PowerManager;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;