diff --git a/launcher/ui/dialogs/IconPickerDialog.cpp b/launcher/ui/dialogs/IconPickerDialog.cpp
index fcb645db4..55ff00f70 100644
--- a/launcher/ui/dialogs/IconPickerDialog.cpp
+++ b/launcher/ui/dialogs/IconPickerDialog.cpp
@@ -64,6 +64,7 @@ IconPickerDialog::IconPickerDialog(QWidget *parent)
     // NOTE: ResetRole forces the button to be on the left, while the OK/Cancel ones are on the right. We win.
     auto buttonAdd = ui->buttonBox->addButton(tr("Add Icon"), QDialogButtonBox::ResetRole);
     auto buttonRemove = ui->buttonBox->addButton(tr("Remove Icon"), QDialogButtonBox::ResetRole);
+    buttonRemove->setObjectName("buttonRemove");
 
     connect(buttonAdd, SIGNAL(clicked(bool)), SLOT(addNewIcon()));
     connect(buttonRemove, SIGNAL(clicked(bool)), SLOT(removeSelectedIcon()));
@@ -129,6 +130,8 @@ void IconPickerDialog::selectionChanged(QItemSelection selected, QItemSelection
     if (!key.isEmpty()) {
         selectedIconKey = key;
     }
+    auto buttonRemove = ui->buttonBox->findChild<QPushButton *>("buttonRemove");
+    buttonRemove->setEnabled(APPLICATION->icons()->iconFileExists(selectedIconKey));
 }
 
 int IconPickerDialog::execWithSelection(QString selection)