diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/revolt/activities/InviteActivity.kt
index 26d2045b..c40a6f95 100644
--- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt
+++ b/app/src/main/java/chat/revolt/activities/InviteActivity.kt
@@ -181,7 +181,7 @@ fun InviteScreen(
                         contentAlignment = Alignment.Center
                     ) {
                         GlideImage(
-                            model = "$REVOLT_FILES/banners/${invite?.serverBanner?.id}",
+                            model = "$REVOLT_FILES/banners/${invite?.serverBanner?.id}/${invite?.serverBanner?.filename}",
                             contentScale = ContentScale.Crop,
                             contentDescription = null,
                             modifier = Modifier
@@ -206,7 +206,7 @@ fun InviteScreen(
                         ) {
                             if (invite?.serverIcon != null) {
                                 RemoteImage(
-                                    url = "$REVOLT_FILES/icons/${invite.serverIcon.id}?max_side=256",
+                                    url = "$REVOLT_FILES/icons/${invite.serverIcon.id}/${invite.serverIcon.filename}",
                                     description = viewModel.inviteResult?.value?.serverName
                                         ?: stringResource(id = R.string.unknown),
                                     modifier = Modifier
diff --git a/app/src/main/java/chat/revolt/activities/MainActivity.kt b/app/src/main/java/chat/revolt/activities/MainActivity.kt
index 54e2ab33..f00f5c27 100644
--- a/app/src/main/java/chat/revolt/activities/MainActivity.kt
+++ b/app/src/main/java/chat/revolt/activities/MainActivity.kt
@@ -205,7 +205,6 @@ class MainActivityViewModel @Inject constructor(
 
                 try {
                     Log.d("MainActivity", "Onboarding state is complete, logging in")
-                    throw Exception("Test")
                     RevoltAPI.loginAs(token)
                     RevoltAPI.setSessionId(id)
                     startWithDestination("chat")
diff --git a/app/src/main/java/chat/revolt/api/internals/ResourceLocations.kt b/app/src/main/java/chat/revolt/api/internals/ResourceLocations.kt
index e2ab87b9..1f399cba 100644
--- a/app/src/main/java/chat/revolt/api/internals/ResourceLocations.kt
+++ b/app/src/main/java/chat/revolt/api/internals/ResourceLocations.kt
@@ -7,7 +7,7 @@ import chat.revolt.api.schemas.User
 object ResourceLocations {
     fun userAvatarUrl(user: User?): String {
         if (user?.avatar != null) {
-            return "$REVOLT_FILES/avatars/${user.avatar.id}/user.png?max_side=256"
+            return "$REVOLT_FILES/avatars/${user.avatar.id}"
         }
         return "/users/${(user?.id ?: "").ifBlank { "0".repeat(26) }}/default_avatar".api()
     }
diff --git a/app/src/main/java/chat/revolt/api/routes/microservices/autumn/Autumn.kt b/app/src/main/java/chat/revolt/api/routes/microservices/autumn/Autumn.kt
index 54f9e18c..d00810c4 100644
--- a/app/src/main/java/chat/revolt/api/routes/microservices/autumn/Autumn.kt
+++ b/app/src/main/java/chat/revolt/api/routes/microservices/autumn/Autumn.kt
@@ -1,6 +1,7 @@
 package chat.revolt.api.routes.microservices.autumn
 
 import chat.revolt.api.REVOLT_FILES
+import chat.revolt.api.RevoltAPI
 import chat.revolt.api.RevoltHttp
 import chat.revolt.api.RevoltJson
 import chat.revolt.api.schemas.AutumnError
@@ -8,6 +9,7 @@ import chat.revolt.api.schemas.AutumnId
 import io.ktor.client.plugins.onUpload
 import io.ktor.client.request.forms.MultiPartFormDataContent
 import io.ktor.client.request.forms.formData
+import io.ktor.client.request.header
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.bodyAsText
@@ -50,6 +52,7 @@ suspend fun uploadToAutumn(
                 }
             )
         )
+        header(RevoltAPI.TOKEN_HEADER_NAME, RevoltAPI.sessionToken)
         onUpload { bytesSentTotal, contentLength ->
             contentLength?.let { onProgress(bytesSentTotal, it) }
         }
diff --git a/app/src/main/java/chat/revolt/components/chat/MemberListItem.kt b/app/src/main/java/chat/revolt/components/chat/MemberListItem.kt
index e767fea8..6389c593 100644
--- a/app/src/main/java/chat/revolt/components/chat/MemberListItem.kt
+++ b/app/src/main/java/chat/revolt/components/chat/MemberListItem.kt
@@ -74,7 +74,7 @@ fun MemberListItem(
                     ?: user?.id
                     ?: userId,
                 avatar = user?.avatar,
-                rawUrl = member?.avatar?.let { "$REVOLT_FILES/avatars/${it.id}?max_side=256" },
+                rawUrl = member?.avatar?.let { "$REVOLT_FILES/avatars/${it.id}" },
                 userId = userId,
                 presence = presenceFromStatus(
                     user?.status?.presence,
diff --git a/app/src/main/java/chat/revolt/components/chat/Message.kt b/app/src/main/java/chat/revolt/components/chat/Message.kt
index 388dfdaf..09ada4c1 100644
--- a/app/src/main/java/chat/revolt/components/chat/Message.kt
+++ b/app/src/main/java/chat/revolt/components/chat/Message.kt
@@ -132,7 +132,7 @@ fun authorAvatarUrl(message: MessageSchema): String? {
     val member = message.author?.let { RevoltAPI.members.getMember(serverId, it) }
         ?: return null
 
-    return member.avatar?.let { "$REVOLT_FILES/avatars/${it.id}?max_side=256" }
+    return member.avatar?.let { "$REVOLT_FILES/avatars/${it.id}" }
 }
 
 fun viewUrlInBrowser(ctx: android.content.Context, url: String) {
diff --git a/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt b/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt
index dda3cef1..61045feb 100644
--- a/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt
+++ b/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt
@@ -255,7 +255,7 @@ fun NativeMessageField(
                                         userId = item.user.id ?: "",
                                         avatar = item.user.avatar,
                                         rawUrl = item.member?.avatar?.id?.let {
-                                            "$REVOLT_FILES/avatars/$it?max_side=64"
+                                            "$REVOLT_FILES/avatars/$it"
                                         },
                                         size = SuggestionChipDefaults.IconSize,
                                     )
@@ -317,7 +317,7 @@ fun NativeMessageField(
                                         )
                                     } else {
                                         RemoteImage(
-                                            url = "$REVOLT_FILES/emojis/${item.custom?.id}/emoji.gif",
+                                            url = "$REVOLT_FILES/emojis/${item.custom?.id}",
                                             description = null,
                                             contentScale = ContentScale.Fit,
                                             modifier = Modifier
diff --git a/app/src/main/java/chat/revolt/components/chat/Reaction.kt b/app/src/main/java/chat/revolt/components/chat/Reaction.kt
index ad997f12..bf5354ec 100644
--- a/app/src/main/java/chat/revolt/components/chat/Reaction.kt
+++ b/app/src/main/java/chat/revolt/components/chat/Reaction.kt
@@ -74,7 +74,7 @@ fun Reaction(
         CompositionLocalProvider(LocalContentColor provides foreground) {
             if (emoji.isUlid()) {
                 RemoteImage(
-                    url = "$REVOLT_FILES/emojis/${emoji}/emoji.gif",
+                    url = "$REVOLT_FILES/emojis/${emoji}",
                     description = null,
                     modifier = Modifier.size(16.dp)
                 )
diff --git a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt
index 9d0c6a24..e6873efc 100644
--- a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt
+++ b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt
@@ -404,7 +404,7 @@ fun EmojiPicker(
                             )
                         } else {
                             RemoteImage(
-                                url = "$REVOLT_FILES/icons/${server.icon.id}/icon.gif?max_side=64",
+                                url = "$REVOLT_FILES/icons/${server.icon.id}",
                                 description = server.name,
                                 modifier = Modifier
                                     .clip(CircleShape)
@@ -621,7 +621,7 @@ fun ColumnScope.PickerItem(
                 verticalArrangement = Arrangement.Center
             ) {
                 RemoteImage(
-                    url = "$REVOLT_FILES/emojis/${item.emote.id}/emoji.gif",
+                    url = "$REVOLT_FILES/emojis/${item.emote.id}",
                     description = item.emote.name,
                     contentScale = ContentScale.Fit,
                     modifier = Modifier
diff --git a/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt b/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt
index d79716bc..1a8ab1c5 100644
--- a/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt
+++ b/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt
@@ -101,7 +101,7 @@ fun UserAvatar(
     ) {
         if (avatar != null) {
             RemoteImage(
-                url = rawUrl ?: "$REVOLT_FILES/avatars/${avatar.id}/user.png?max_side=256",
+                url = rawUrl ?: "$REVOLT_FILES/avatars/${avatar.id}",
                 contentScale = ContentScale.Crop,
                 description = stringResource(id = R.string.avatar_alt, username),
                 modifier = Modifier
@@ -164,7 +164,7 @@ fun GroupIcon(
     ) {
         if (icon?.id != null) {
             RemoteImage(
-                url = rawUrl ?: "$REVOLT_FILES/icons/${icon.id}/group.png",
+                url = rawUrl ?: "$REVOLT_FILES/icons/${icon.id}",
                 contentScale = ContentScale.Crop,
                 description = stringResource(id = R.string.avatar_alt, name),
                 modifier = Modifier
diff --git a/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt b/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt
index a207a909..9d556260 100644
--- a/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt
+++ b/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt
@@ -434,7 +434,7 @@ fun MarkdownText(textNode: AstNode, modifier: Modifier = Modifier) {
                 } else {
                     with(LocalDensity.current) {
                         RemoteImage(
-                            url = "$REVOLT_FILES/emojis/${id}/emoji.gif",
+                            url = "$REVOLT_FILES/emojis/${id}",
                             description = emote.name,
                             contentScale = ContentScale.Fit,
                             modifier = Modifier
diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt b/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt
index 0021a73e..f5e70c22 100644
--- a/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt
+++ b/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt
@@ -66,7 +66,7 @@ fun ChannelSheetHeader(
         ) {
             if (channelIcon != null) {
                 RemoteImage(
-                    url = "$REVOLT_FILES/icons/${channelIcon.id ?: ""}?max_side=48",
+                    url = "$REVOLT_FILES/icons/${channelIcon.id ?: ""}",
                     description = null, // decorative
                     contentScale = ContentScale.Crop,
                     height = 48,
diff --git a/app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt b/app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt
index 398f0fc0..a4366d31 100644
--- a/app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt
+++ b/app/src/main/java/chat/revolt/components/screens/chat/TypingIndicator.kt
@@ -43,7 +43,7 @@ fun StackedUserAvatars(users: List<String>, amount: Int = 3, serverId: String?)
                 userId = userId,
                 username = user?.let { User.resolveDefaultName(it) }
                     ?: stringResource(id = R.string.unknown),
-                rawUrl = maybeMember?.avatar?.let { "$REVOLT_FILES/avatars/${it.id}?max_side=256" },
+                rawUrl = maybeMember?.avatar?.let { "$REVOLT_FILES/avatars/${it.id}" },
                 size = 16.dp,
                 modifier = Modifier
                     .offset(
diff --git a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt
index 9e5d39ac..fbde101f 100644
--- a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt
+++ b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt
@@ -338,7 +338,7 @@ fun ChannelSideDrawer(
                                 }
                             }) {
                         val icon = serverInList.icon?.id?.let { iconId ->
-                            "$REVOLT_FILES/icons/$iconId/server.png?max_side=256"
+                            "$REVOLT_FILES/icons/$iconId"
                         }
                         if (icon != null) {
                             RemoteImage(
diff --git a/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt b/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt
index d6d44e5d..d50d136a 100644
--- a/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt
+++ b/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt
@@ -51,7 +51,7 @@ fun ServerOverview(server: Server) {
             )
 
             RemoteImage(
-                url = "$REVOLT_FILES/banners/${it.id}",
+                url = "$REVOLT_FILES/banners/${it.id}/${it.filename}",
                 description = null,
                 modifier = Modifier
                     .height(166.dp)
@@ -80,7 +80,7 @@ fun ServerOverview(server: Server) {
         ) {
             server.icon?.let {
                 RemoteImage(
-                    url = "$REVOLT_FILES/icons/${it.id}/server.png?max_side=256",
+                    url = "$REVOLT_FILES/icons/${it.id}",
                     description = null,
                     modifier = Modifier
                         .clip(CircleShape)
diff --git a/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt b/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
index 8ef00d70..f2046920 100644
--- a/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
+++ b/app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
@@ -116,7 +116,7 @@ fun RawUserOverview(
         if (background != null) {
             RemoteImage(
                 url = backgroundUrl
-                    ?: "$REVOLT_FILES/backgrounds/${if (background is AutumnResource) background.id else null}",
+                    ?: "$REVOLT_FILES/backgrounds/${if (background is AutumnResource) background.id else null}/${if (background is AutumnResource) background.filename else background}",
                 description = null,
                 modifier = Modifier
                     .height(128.dp)
diff --git a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt b/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt
index 332a2adf..27b88c62 100644
--- a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt
+++ b/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt
@@ -675,7 +675,7 @@ private fun JBMText(node: ASTNode, modifier: Modifier) {
                 } else {
                     with(LocalDensity.current) {
                         RemoteImage(
-                            url = "$REVOLT_FILES/emojis/${id}/emoji.gif",
+                            url = "$REVOLT_FILES/emojis/${id}",
                             description = emote.name,
                             contentScale = ContentScale.Fit,
                             modifier = Modifier
diff --git a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt
index 70c0aeca..972aef11 100644
--- a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt
@@ -105,7 +105,7 @@ fun ReactionInfoSheet(messageId: String, emoji: String, onDismiss: () -> Unit) {
                             if (emoji.isUlid()) {
                                 Row(verticalAlignment = Alignment.CenterVertically) {
                                     RemoteImage(
-                                        url = "$REVOLT_FILES/emojis/${emoji}/emoji.gif",
+                                        url = "$REVOLT_FILES/emojis/${emoji}",
                                         description = null,
                                         modifier = Modifier.size(16.dp)
                                     )
@@ -214,7 +214,7 @@ fun ReactionInfoSheet(messageId: String, emoji: String, onDismiss: () -> Unit) {
                         if (current.isUlid()) {
                             val cached = extendedEmojiInfo.find { it.id == current }
                             RemoteImage(
-                                url = "$REVOLT_FILES/emojis/$current/emoji.gif",
+                                url = "$REVOLT_FILES/emojis/$current",
                                 description = cached?.name,
                                 contentScale = ContentScale.Fit,
                                 modifier = Modifier