diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
index 18f8b3012..ca8d824af 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
@@ -20,6 +20,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.EditNote
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -171,16 +172,18 @@ fun ChannelHeader(baseChannel: Channel, account: Account, accountStateViewModel:
                     }
                 }
 
-                channel?.let { NoteCopyButton(it) }
+                Row(modifier = Modifier.height(35.dp).padding(bottom = 3.dp)) {
+                    channel?.let { NoteCopyButton(it) }
 
-                channel?.let {
-                    if (channel.creator == account.userProfile()) {
-                        EditButton(account, it)
-                    } else {
-                        if (account.followingChannels.contains(channel.idHex)) {
-                            LeaveButton(account,channel, navController)
+                    channel?.let {
+                        if (channel.creator == account.userProfile()) {
+                            EditButton(account, it)
                         } else {
-                            JoinButton(account,channel, navController)
+                            if (account.followingChannels.contains(channel.idHex)) {
+                                LeaveButton(account, channel, navController)
+                            } else {
+                                JoinButton(account, channel, navController)
+                            }
                         }
                     }
                 }
@@ -202,7 +205,7 @@ private fun NoteCopyButton(
     val clipboardManager = LocalClipboardManager.current
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { clipboardManager.setText(AnnotatedString(note.id.toNote())) },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -228,7 +231,7 @@ private fun EditButton(account: Account, channel: Channel) {
         NewChannelView({ wantsToPost = false }, account = account, channel)
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { wantsToPost = true },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -236,7 +239,11 @@ private fun EditButton(account: Account, channel: Channel) {
                 backgroundColor = MaterialTheme.colors.primary
             )
     ) {
-        Text(text = "Edit", color = Color.White)
+        Icon(
+            tint = Color.White,
+            imageVector = Icons.Default.EditNote,
+            contentDescription = "Edits the Channel Metadata"
+        )
     }
 }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
index 3d3c47831..11d6d6d6a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.material.TabRow
 import androidx.compose.material.TabRowDefaults
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.EditNote
 import androidx.compose.material.icons.filled.Password
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.Composable
@@ -151,26 +152,28 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
 
                             Spacer(Modifier.weight(1f))
 
-                            MessageButton(user, navController)
+                            Row(modifier = Modifier.height(35.dp).padding(bottom = 3.dp)) {
+                                MessageButton(user, navController)
 
-                            if (accountUser == user && account.isWriteable()) {
-                                NSecCopyButton(account)
-                            }
+                                if (accountUser == user && account.isWriteable()) {
+                                    NSecCopyButton(account)
+                                }
 
-                            NPubCopyButton(user)
+                                NPubCopyButton(user)
 
-                            if (accountUser == user) {
-                                EditButton(account)
-                            } else {
-                                if (account?.isAcceptable(user) == false) {
-                                    ShowUserButton {
-                                        account.showUser(user.pubkeyHex)
-                                        LocalPreferences(ctx).saveToEncryptedStorage(account)
-                                    }
-                                } else if (accountUser.isFollowing(user)) {
-                                    UnfollowButton { account.unfollow(user) }
+                                if (accountUser == user) {
+                                    EditButton(account)
                                 } else {
-                                    FollowButton { account.follow(user) }
+                                    if (account?.isAcceptable(user) == false) {
+                                        ShowUserButton {
+                                            account.showUser(user.pubkeyHex)
+                                            LocalPreferences(ctx).saveToEncryptedStorage(account)
+                                        }
+                                    } else if (accountUser.isFollowing(user)) {
+                                        UnfollowButton { account.unfollow(user) }
+                                    } else {
+                                        FollowButton { account.follow(user) }
+                                    }
                                 }
                             }
                         }
@@ -291,7 +294,7 @@ private fun NSecCopyButton(
     val clipboardManager = LocalClipboardManager.current
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { account.loggedIn.privKey?.let { clipboardManager.setText(AnnotatedString(it.toNsec())) } },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -314,7 +317,7 @@ private fun NPubCopyButton(
     val clipboardManager = LocalClipboardManager.current
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { clipboardManager.setText(AnnotatedString(user.pubkey.toNpub())) },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -333,7 +336,7 @@ private fun NPubCopyButton(
 @Composable
 private fun MessageButton(user: User, navController: NavController) {
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { navController.navigate("Room/${user.pubkeyHex}") },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -360,7 +363,7 @@ private fun EditButton(account: Account) {
         NewUserMetadataView({ wantsToEdit = false }, account)
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { wantsToEdit = true },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -368,7 +371,11 @@ private fun EditButton(account: Account) {
                 backgroundColor = MaterialTheme.colors.primary
             )
     ) {
-        Text(text = "Edit", color = Color.White)
+        Icon(
+            tint = Color.White,
+            imageVector = Icons.Default.EditNote,
+            contentDescription = "Edits the User's Metadata"
+        )
     }
 }