diff --git a/disco/client.py b/disco/client.py
index ee2b091..c480af9 100644
--- a/disco/client.py
+++ b/disco/client.py
@@ -131,7 +131,7 @@ class Client(LoggingClass):
         payload = {
             'afk': afk,
             'since': since,
-            'status': status.value.lower(),
+            'status': status.lower(),
             'game': None,
         }
 
diff --git a/disco/types/guild.py b/disco/types/guild.py
index f49576a..d938a13 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -528,9 +528,9 @@ class Guild(SlottedModel, Permissible):
         if fmt is not None:
             return 'https://cdn.discordapp.com/icons/{}/{}.{}?size={}'.format(self.id, self.icon, fmt, size)
         if self.icon.startswith('a_'):
-            return 'https://cdn.discordapp.com/avatars/{}/{}.gif?size={}'.format(self.id, self.icon, size)
+            return 'https://cdn.discordapp.com/icons/{}/{}.gif?size={}'.format(self.id, self.icon, size)
         else:
-            return 'https://cdn.discordapp.com/avatars/{}/{}.webp?size={}'.format(self.id, self.icon, size)
+            return 'https://cdn.discordapp.com/icons/{}/{}.webp?size={}'.format(self.id, self.icon, size)
 
     def get_splash_url(self, fmt='webp', size=1024):
         if not self.splash: