diff --git a/app/containers/MessageActions/index.js b/app/containers/MessageActions/index.js
index a6d2a9663..0c9c78a3e 100644
--- a/app/containers/MessageActions/index.js
+++ b/app/containers/MessageActions/index.js
@@ -296,7 +296,7 @@ const MessageActions = React.memo(forwardRef(({
 		// Create Discussion
 		options.push({
 			title: I18n.t('Start_a_Discussion'),
-			icon: 'chat',
+			icon: 'discussions',
 			onPress: () => handleCreateDiscussion(message)
 		});
 
@@ -371,7 +371,7 @@ const MessageActions = React.memo(forwardRef(({
 		if (allowDelete(message)) {
 			options.push({
 				title: I18n.t('Delete'),
-				icon: 'trash',
+				icon: 'delete',
 				danger: true,
 				onPress: () => handleDelete(message)
 			});
diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js
index e832edded..2d4a61944 100644
--- a/app/containers/MessageBox/index.js
+++ b/app/containers/MessageBox/index.js
@@ -144,7 +144,7 @@ class MessageBox extends Component {
 			},
 			{
 				title: I18n.t('Choose_file'),
-				icon: 'file',
+				icon: 'attach',
 				onPress: this.chooseFile
 			},
 			{
diff --git a/app/views/RoomMembersView/index.js b/app/views/RoomMembersView/index.js
index 8134e9183..cb6c7b7d4 100644
--- a/app/views/RoomMembersView/index.js
+++ b/app/views/RoomMembersView/index.js
@@ -146,7 +146,7 @@ class RoomMembersView extends React.Component {
 
 		showActionSheet({
 			options: [{
-				icon: userIsMuted ? 'volume' : 'volume-off',
+				icon: userIsMuted ? 'audio' : 'audio-disabled',
 				title: I18n.t(userIsMuted ? 'Unmute' : 'Mute'),
 				onPress: () => {
 					showConfirmationAlert({