diff --git a/resource/icons/rqt_icons/actions/22/list-add.png b/resource/icons/rqt_icons/actions/22/list-add.png
new file mode 100644
index 0000000..2acdd8f
Binary files /dev/null and b/resource/icons/rqt_icons/actions/22/list-add.png differ
diff --git a/resource/icons/rqt_icons/index.theme b/resource/icons/rqt_icons/index.theme
new file mode 100644
index 0000000..3c784d6
--- /dev/null
+++ b/resource/icons/rqt_icons/index.theme
@@ -0,0 +1,11 @@
+[Icon Theme]
+Name=rqt_icons
+
+Comment=Default Qt icons
+
+Directories=actions/22
+
+[actions/22]
+Size=22
+Context=Actions
+Type=Fixed
diff --git a/setup.py b/setup.py
index 0860177..9f50dd3 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,11 @@
             ['resource/' + package_name]),
         ('share/' + package_name + '/resource',
             ['resource/messages.ui']),
+        ('share/' + package_name + '/resource/icons/rqt_icons/actions/22',
+            ['resource/icons/rqt_icons/actions/22/list-add.png',
+             ]),
+        ('share/' + package_name + '/resource/icons/rqt_icons',
+            ['resource/icons/rqt_icons/index.theme']),
         ('share/' + package_name, ['package.xml']),
         ('share/' + package_name, ['plugin.xml']),
     ],
diff --git a/src/rqt_msg/messages_widget.py b/src/rqt_msg/messages_widget.py
index f48211a..8c02777 100644
--- a/src/rqt_msg/messages_widget.py
+++ b/src/rqt_msg/messages_widget.py
@@ -85,6 +85,12 @@ def __init__(self, mode=message_helpers.MSG_MODE,
         self.setObjectName(ui_filename)
         self._mode = mode
 
+        icon_paths = QIcon.themeSearchPaths()
+        icon_paths.append(os.path.join(
+            package_path, 'share', pkg_name, 'resource', 'icons', 'rqt_icons'))
+        QIcon.setThemeSearchPaths(icon_paths)
+        QIcon.setThemeName('rqt_icons')
+
         self._add_button.setIcon(QIcon.fromTheme('list-add'))
         self._add_button.clicked.connect(self._add_message)
         self._refresh_packages(mode)