diff --git a/src/devices/udisks2lister.cpp b/src/devices/udisks2lister.cpp
index 147c30b7c..11de7d160 100644
--- a/src/devices/udisks2lister.cpp
+++ b/src/devices/udisks2lister.cpp
@@ -39,7 +39,12 @@ QStringList Udisks2Lister::DeviceUniqueIDs() {
 }
 
 QVariantList Udisks2Lister::DeviceIcons(const QString& id) {
-  return QVariantList();
+  QReadLocker locker(&device_data_lock_);
+  if (!device_data_.contains(id)) return QVariantList();
+  QString path = device_data_[id].mount_paths.at(0);
+  return QVariantList() << GuessIconForPath(path)
+                        << GuessIconForModel(DeviceManufacturer(id),
+                                             DeviceModel(id));
 }
 
 QString Udisks2Lister::DeviceManufacturer(const QString& id) {
@@ -91,7 +96,7 @@ QString Udisks2Lister::MakeFriendlyName(const QString& id) {
 QList<QUrl> Udisks2Lister::MakeDeviceUrls(const QString& id) {
   QReadLocker locker(&device_data_lock_);
   if (!device_data_.contains(id)) return QList<QUrl>();
-  return QList<QUrl>() << QUrl::fromLocalFile(
+  return QList<QUrl>() << MakeUrlFromLocalPath(
              device_data_[id].mount_paths.at(0));
 }