diff --git a/android/app/src/main/res/drawable-hdpi/ic_attach_file_black_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_attach_file_black_24dp.png
new file mode 100644
index 0000000..af04153
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_attach_file_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png
new file mode 100644
index 0000000..29dfa5d
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_insert_emoticon_black_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_insert_emoticon_black_24dp.png
new file mode 100644
index 0000000..3df3dbf
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_insert_emoticon_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_insert_emoticon_white_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_insert_emoticon_white_24dp.png
new file mode 100644
index 0000000..11d4e65
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_insert_emoticon_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_keyboard_black_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_keyboard_black_24dp.png
new file mode 100644
index 0000000..d14e9de
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_keyboard_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000..5352d4c
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_attach_file_black_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_attach_file_black_24dp.png
new file mode 100644
index 0000000..40d81af
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_attach_file_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_attach_file_white_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_attach_file_white_24dp.png
new file mode 100644
index 0000000..ac433ef
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_attach_file_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_insert_emoticon_black_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_insert_emoticon_black_24dp.png
new file mode 100644
index 0000000..a38069b
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_insert_emoticon_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_insert_emoticon_white_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_insert_emoticon_white_24dp.png
new file mode 100644
index 0000000..e6cc505
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_insert_emoticon_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_keyboard_black_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_keyboard_black_24dp.png
new file mode 100644
index 0000000..f84c6b3
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_keyboard_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000..e8c24c7
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_attach_file_black_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_attach_file_black_24dp.png
new file mode 100644
index 0000000..30ac6f9
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_attach_file_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_attach_file_white_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_attach_file_white_24dp.png
new file mode 100644
index 0000000..c3ff2bd
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_attach_file_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_insert_emoticon_black_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_insert_emoticon_black_24dp.png
new file mode 100644
index 0000000..abd5e97
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_insert_emoticon_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_insert_emoticon_white_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_insert_emoticon_white_24dp.png
new file mode 100644
index 0000000..c97abc4
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_insert_emoticon_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_keyboard_black_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_keyboard_black_24dp.png
new file mode 100644
index 0000000..752f007
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_keyboard_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000..2b6b9b4
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_attach_file_black_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_attach_file_black_24dp.png
new file mode 100644
index 0000000..d8e2bd9
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_attach_file_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_attach_file_white_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_attach_file_white_24dp.png
new file mode 100644
index 0000000..7091eca
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_attach_file_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_insert_emoticon_black_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_insert_emoticon_black_24dp.png
new file mode 100644
index 0000000..b38942b
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_insert_emoticon_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_insert_emoticon_white_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_insert_emoticon_white_24dp.png
new file mode 100644
index 0000000..4bfd751
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_insert_emoticon_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_keyboard_black_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_keyboard_black_24dp.png
new file mode 100644
index 0000000..daf2da7
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_keyboard_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000..9d0bed2
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_attach_file_black_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_attach_file_black_24dp.png
new file mode 100644
index 0000000..620226d
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_attach_file_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_attach_file_white_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_attach_file_white_24dp.png
new file mode 100644
index 0000000..771425c
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_attach_file_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_insert_emoticon_black_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_insert_emoticon_black_24dp.png
new file mode 100644
index 0000000..0b7d14a
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_insert_emoticon_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_insert_emoticon_white_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_insert_emoticon_white_24dp.png
new file mode 100644
index 0000000..319a13a
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_insert_emoticon_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png
new file mode 100644
index 0000000..ba4d5be
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000..f77d9d2
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png differ
diff --git a/app/components/Room/SendMessageField.js b/app/components/Room/SendMessageField.js
index 1cb7783..c259c96 100644
--- a/app/components/Room/SendMessageField.js
+++ b/app/components/Room/SendMessageField.js
@@ -14,7 +14,7 @@ export default class SendMessageField extends Component {
     this.handleChangeText = this.handleChangeText.bind(this)
 
     this.state = {
-      height: 56,
+      height: 46,
       value: ''
     }
   }
@@ -34,7 +34,7 @@ export default class SendMessageField extends Component {
   // }
 
   handleChangeSize(e) {
-    this.setState({height: e.nativeEvent.layout.height + 30})
+    this.setState({height: e.nativeEvent.layout.height})
   }
 
   handleChangeText(value) {
@@ -57,18 +57,19 @@ export default class SendMessageField extends Component {
       return
     }
     onSending()
-    this.setState({height: 56, value: ''})
+    this.setState({height: 46, value: ''})
   }
 
   render() {
     const {value, height} = this.state
+    const {emojis, onRightAddIconPress} = this.props
     return (
       <View style={s.container}>
         <View style={s.innerContainer}>
           <TextInput
             ref="textInput"
             multiline
-            style={[s.textInput, {height: height > 90 ? 90 : Math.max(56, height)}]}
+            style={[s.textInput, {height: height > 90 ? 90 : Math.max(46, height)}]}
             value={value}
             keyboardShouldPersistTaps={false}
             underlineColorAndroid="white"
@@ -81,14 +82,24 @@ export default class SendMessageField extends Component {
                {value}
              </Text>
         </View>
-        <Button
-          background="SelectableBackgroundBorderless"
-          onPress={() => this.sendMessage()}
-          style={s.button}>
-          <Image
-            source={require('image!ic_send_black_24dp')}
-            style={[s.sendIcon, {opacity: !value.trim() ? 0.2 : 1}]}/>
-        </Button>
+        <View style={s.rightButtons}>
+          <Button
+            background="SelectableBackgroundBorderless"
+            onPress={() => onRightAddIconPress()}
+            style={[s.button, s.left]}>
+            <Image
+              source={emojis ? require('image!ic_keyboard_black_24dp') : require('image!ic_insert_emoticon_black_24dp')}
+              style={s.sendIcon} />
+          </Button>
+          <Button
+            background="SelectableBackgroundBorderless"
+            onPress={() => this.sendMessage()}
+            style={s.button}>
+            <Image
+              source={require('image!ic_send_black_24dp')}
+              style={[s.sendIcon, {opacity: !value.trim() ? 0.4 : 0.8}]}/>
+          </Button>
+        </View>
       </View>
 
     )
@@ -98,5 +109,7 @@ export default class SendMessageField extends Component {
 SendMessageField.propTypes = {
   onSending: PropTypes.func,
   value: PropTypes.string,
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
+  emojis: PropTypes.bool,
+  onRightAddIconPress: PropTypes.func
 }
diff --git a/app/screens/Room.js b/app/screens/Room.js
index e7a2089..afd6880 100644
--- a/app/screens/Room.js
+++ b/app/screens/Room.js
@@ -1,5 +1,5 @@
 import React, {Component, PropTypes} from 'react';
-import {InteractionManager, ToastAndroid, Clipboard, Alert, ListView, View, Platform} from 'react-native';
+import {InteractionManager, ToastAndroid, Clipboard, Alert, ListView, View, Platform, Keyboard} from 'react-native';
 import Toolbar from '../components/Toolbar'
 import {connect} from 'react-redux'
 import DrawerLayout from 'react-native-drawer-layout'
@@ -84,11 +84,13 @@ class Room extends Component {
     this.onNavigateBack = this.onNavigateBack.bind(this)
     this.handleSharingRoom = this.handleSharingRoom.bind(this)
     this.handleSharingMessage = this.handleSharingMessage.bind(this)
+    this.handleToggleEmojis = this.handleToggleEmojis.bind(this)
 
     this.state = {
       textInputValue: '',
       editing: false,
-      editMessage: {}
+      editMessage: {},
+      showEmojiBar: false
     }
   }
 
@@ -466,6 +468,18 @@ class Room extends Component {
     })
   }
 
+  handleToggleEmojis() {
+    const {showEmojiBar} = this.state
+
+    if (!showEmojiBar) {
+      // TODO(terrysahaidak) waiting 0.36 to be released
+      Keyboard.dismiss()
+    } else {
+      this.refs.sendMessageField.focus()
+    }
+    this.setState({showEmojiBar: !showEmojiBar})
+  }
+
   leaveRoom() {
     const {dispatch, route: {roomId}} = this.props
     Alert.alert(
@@ -589,6 +603,8 @@ class Room extends Component {
     }
     return (
       <SendMessageField
+        emojis={this.state.showEmojiBar}
+        onRightAddIconPress={this.handleToggleEmojis}
         ref="sendMessageField"
         onSending={this.onSending.bind(this)}
         onChange={this.onTextFieldChange.bind(this)}
diff --git a/app/styles/screens/Room/SendMessageFieldStyles.js b/app/styles/screens/Room/SendMessageFieldStyles.js
index 5e6d976..45351b5 100644
--- a/app/styles/screens/Room/SendMessageFieldStyles.js
+++ b/app/styles/screens/Room/SendMessageFieldStyles.js
@@ -1,33 +1,52 @@
 import {StyleSheet} from 'react-native'
 
-const padding = 12
-const button = 35
+const padding = 16
+const button = 46
 const buttonMargin = 8
 
 const style = StyleSheet.create({
   container: {
     flexDirection: 'row',
     alignItems: 'center',
-    paddingHorizontal: padding,
+    paddingLeft: padding,
+    paddingRight: 4,
+    // marginVertical: 4,
     backgroundColor: 'white',
-    elevation: 8
+    elevation: 8,
+    borderTopWidth: 1,
+    borderTopColor: 'rgba(0, 0, 0, 0.1)'
   },
   innerContainer: {
     flex: 1
   },
   textInput: {
+    paddingVertical: 4,
     backgroundColor: 'white',
-    fontSize: 14
+    fontSize: 14,
+    textAlignVertical: 'center'
+  },
+  rightButtons: {
+    width: 90,
+    flexDirection: 'row',
+    justifyContent: 'space-around',
+    // backgroundColor: 'red'
   },
   button: {
+    // backgroundColor: 'gray',
     height: button,
-    margin: buttonMargin,
+    width: button,
+    // margin: buttonMargin,
     alignItems: 'center',
     justifyContent: 'center'
   },
+  left: {
+    // marginRight: 4,
+    // backgroundColor: 'pink',
+    opacity: 0.8
+  },
   sendIcon: {
-    width: 30,
-    height: 30
+    width: 32,
+    height: 32
   },
   hidden: {
     position: 'absolute',
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/Contents.json b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/Contents.json
new file mode 100644
index 0000000..6f2b341
--- /dev/null
+++ b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_attach_file.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_attach_file_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_attach_file_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file.png b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file.png
new file mode 100644
index 0000000..40d81af
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file_2x.png b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file_2x.png
new file mode 100644
index 0000000..30ac6f9
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file_2x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file_3x.png b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file_3x.png
new file mode 100644
index 0000000..d8e2bd9
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_attach_file_black_24dp.imageset/ic_attach_file_3x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/Contents.json b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/Contents.json
new file mode 100644
index 0000000..27078af
--- /dev/null
+++ b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_attach_file_white.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_attach_file_white_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_attach_file_white_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white.png b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white.png
new file mode 100644
index 0000000..ac433ef
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white_2x.png b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white_2x.png
new file mode 100644
index 0000000..c3ff2bd
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white_2x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white_3x.png b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white_3x.png
new file mode 100644
index 0000000..7091eca
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_attach_file_white_24dp.imageset/ic_attach_file_white_3x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/Contents.json b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/Contents.json
new file mode 100644
index 0000000..e07d30d
--- /dev/null
+++ b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_insert_emoticon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_insert_emoticon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_insert_emoticon_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon.png b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon.png
new file mode 100644
index 0000000..a38069b
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon_2x.png b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon_2x.png
new file mode 100644
index 0000000..abd5e97
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon_2x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon_3x.png b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon_3x.png
new file mode 100644
index 0000000..b38942b
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_black_24dp.imageset/ic_insert_emoticon_3x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/Contents.json b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/Contents.json
new file mode 100644
index 0000000..faecf29
--- /dev/null
+++ b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_insert_emoticon_white.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_insert_emoticon_white_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_insert_emoticon_white_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white.png b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white.png
new file mode 100644
index 0000000..e6cc505
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white_2x.png b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white_2x.png
new file mode 100644
index 0000000..c97abc4
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white_2x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white_3x.png b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white_3x.png
new file mode 100644
index 0000000..4bfd751
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_insert_emoticon_white_24dp.imageset/ic_insert_emoticon_white_3x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/Contents.json b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/Contents.json
new file mode 100644
index 0000000..3fef4a6
--- /dev/null
+++ b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_keyboard.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_keyboard_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_keyboard_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard.png b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard.png
new file mode 100644
index 0000000..f84c6b3
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard_2x.png b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard_2x.png
new file mode 100644
index 0000000..752f007
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard_2x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard_3x.png b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard_3x.png
new file mode 100644
index 0000000..daf2da7
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_keyboard_black_24dp.imageset/ic_keyboard_3x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/Contents.json b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/Contents.json
new file mode 100644
index 0000000..2f8e2b2
--- /dev/null
+++ b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_keyboard_white.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_keyboard_white_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_keyboard_white_3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white.png b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white.png
new file mode 100644
index 0000000..e8c24c7
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white_2x.png b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white_2x.png
new file mode 100644
index 0000000..2b6b9b4
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white_2x.png differ
diff --git a/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white_3x.png b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white_3x.png
new file mode 100644
index 0000000..9d0bed2
Binary files /dev/null and b/ios/gittermobile/Images.xcassets/ic_keyboard_white_24dp.imageset/ic_keyboard_white_3x.png differ