diff --git a/images/giphy_icon.png b/images/giphy_icon.png
new file mode 100644
index 00000000..ea99e834
Binary files /dev/null and b/images/giphy_icon.png differ
diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 9e4998d8..0b84e823 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -301,6 +301,7 @@ class MessageInputState extends State<MessageInput> {
                   enabled: _inputEnabled,
                   minLines: null,
                   maxLines: null,
+                  expands: true,
                   onSubmitted: (_) {
                     sendMessage();
                   },
@@ -513,6 +514,11 @@ class MessageInputState extends State<MessageInput> {
                   ...commands
                       .map(
                         (c) => ListTile(
+                          leading: c.name == 'giphy' ? CircleAvatar(
+                            backgroundColor: Colors.black,
+                            child: Image.asset('images/giphy_icon.png'),
+                            maxRadius: 12.0,
+                          ) : null,
                           title: Text.rich(
                             TextSpan(
                               text: '${c.name.capitalize()}',
diff --git a/pubspec.yaml b/pubspec.yaml
index edd19589..a9285b4c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,6 +32,8 @@ dependencies:
   clipboard: ^0.1.2+8
 
 flutter:
+  assets:
+    - images/giphy_icon.png
   fonts:
    - family: stream-icons
      fonts: