diff --git a/data/icons.qrc b/data/icons.qrc
index f5c4dfb6d..eb488f7b2 100644
--- a/data/icons.qrc
+++ b/data/icons.qrc
@@ -95,6 +95,7 @@
         <file>icons/128x128/radio.png</file>
         <file>icons/128x128/somafm.png</file>
         <file>icons/128x128/radioparadise.png</file>
+        <file>icons/128x128/musicbrainz.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -191,6 +192,7 @@
         <file>icons/64x64/radio.png</file>
         <file>icons/64x64/somafm.png</file>
         <file>icons/64x64/radioparadise.png</file>
+        <file>icons/64x64/musicbrainz.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -291,6 +293,7 @@
         <file>icons/48x48/radio.png</file>
         <file>icons/48x48/somafm.png</file>
         <file>icons/48x48/radioparadise.png</file>
+        <file>icons/48x48/musicbrainz.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -391,6 +394,7 @@
         <file>icons/32x32/radio.png</file>
         <file>icons/32x32/somafm.png</file>
         <file>icons/32x32/radioparadise.png</file>
+        <file>icons/32x32/musicbrainz.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -491,5 +495,6 @@
         <file>icons/22x22/radio.png</file>
         <file>icons/22x22/somafm.png</file>
         <file>icons/22x22/radioparadise.png</file>
+        <file>icons/22x22/musicbrainz.png</file>
     </qresource>
 </RCC>
diff --git a/data/icons/128x128/musicbrainz.png b/data/icons/128x128/musicbrainz.png
new file mode 100644
index 000000000..19602c3dc
Binary files /dev/null and b/data/icons/128x128/musicbrainz.png differ
diff --git a/data/icons/22x22/musicbrainz.png b/data/icons/22x22/musicbrainz.png
new file mode 100644
index 000000000..a412c3ff0
Binary files /dev/null and b/data/icons/22x22/musicbrainz.png differ
diff --git a/data/icons/32x32/musicbrainz.png b/data/icons/32x32/musicbrainz.png
new file mode 100644
index 000000000..108b3f5ba
Binary files /dev/null and b/data/icons/32x32/musicbrainz.png differ
diff --git a/data/icons/48x48/musicbrainz.png b/data/icons/48x48/musicbrainz.png
new file mode 100644
index 000000000..fb26f6b03
Binary files /dev/null and b/data/icons/48x48/musicbrainz.png differ
diff --git a/data/icons/64x64/musicbrainz.png b/data/icons/64x64/musicbrainz.png
new file mode 100644
index 000000000..b3528af74
Binary files /dev/null and b/data/icons/64x64/musicbrainz.png differ
diff --git a/data/icons/full/musicbrainz.png b/data/icons/full/musicbrainz.png
new file mode 100644
index 000000000..ff98f1ff4
Binary files /dev/null and b/data/icons/full/musicbrainz.png differ
diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index c7c5ea44d..62639d542 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -462,6 +462,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
   ui_->action_import_data_from_last_fm->setIcon(IconLoader::Load("scrobble"));
   ui_->action_console->setIcon(IconLoader::Load("keyboard"));
   ui_->action_toggle_show_sidebar->setIcon(IconLoader::Load("view-choose"));
+  ui_->action_auto_complete_tags->setIcon(IconLoader::Load("musicbrainz"));
 
   // Scrobble
 
diff --git a/src/core/mainwindow.ui b/src/core/mainwindow.ui
index f9b1af2ab..37fb9ae5c 100644
--- a/src/core/mainwindow.ui
+++ b/src/core/mainwindow.ui
@@ -448,7 +448,7 @@
      <x>0</x>
      <y>0</y>
      <width>1131</width>
-     <height>24</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_music">
@@ -792,10 +792,6 @@
    </property>
   </action>
   <action name="action_auto_complete_tags">
-   <property name="icon">
-    <iconset resource="../../data/data.qrc">
-     <normaloff>:/pictures/musicbrainz.png</normaloff>:/pictures/musicbrainz.png</iconset>
-   </property>
    <property name="text">
     <string>Complete tags automatically...</string>
    </property>