diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js
index cf139624..8bd71f70 100644
--- a/app/containers/MessageBox/index.js
+++ b/app/containers/MessageBox/index.js
@@ -129,7 +129,7 @@ class MessageBox extends Component {
 		this.options = [
 			{
 				title: I18n.t('Take_a_photo'),
-				icon: 'image',
+				icon: 'camera-photo',
 				onPress: this.takePhoto
 			},
 			{
@@ -139,7 +139,7 @@ class MessageBox extends Component {
 			},
 			{
 				title: I18n.t('Choose_from_library'),
-				icon: 'share',
+				icon: 'image',
 				onPress: this.chooseFromLibrary
 			},
 			{
diff --git a/app/views/ShareListView/index.js b/app/views/ShareListView/index.js
index c40bd184..250498e4 100644
--- a/app/views/ShareListView/index.js
+++ b/app/views/ShareListView/index.js
@@ -169,7 +169,7 @@ class ShareListView extends React.Component {
 					? null
 					: (
 						<CustomHeaderButtons>
-							<Item title='search' iconName='magnifier' onPress={this.initSearch} />
+							<Item title='search' iconName='search' onPress={this.initSearch} />
 						</CustomHeaderButtons>
 					)
 			)