diff --git a/indicator/deviceindicator.cpp b/indicator/deviceindicator.cpp
index 87737a54..32600d79 100644
--- a/indicator/deviceindicator.cpp
+++ b/indicator/deviceindicator.cpp
@@ -1,109 +1,120 @@
 /*
  * Copyright 2016 Aleix Pol Gonzalez <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "deviceindicator.h"
+#include <QFileDialog>
 #include <KLocalizedString>
 
 template <typename T, typename W>
 static void setWhenAvailable(const QDBusPendingReply<T> &pending, W func, QObject* parent)
 {
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pending, parent);
     QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                     parent, [func](QDBusPendingCallWatcher* watcher) {
                         watcher->deleteLater();
                         QDBusPendingReply<T> reply = *watcher;
                         func(reply.value());
                     });
 }
 
 class BatteryAction : public QAction
 {
 Q_OBJECT
 public:
     BatteryAction(DeviceDbusInterface* device)
         : QAction(nullptr)
         , m_batteryIface(new DeviceBatteryDbusInterface(device->id(), this))
     {
         setWhenAvailable(m_batteryIface->charge(), [this](int charge) { setCharge(charge); }, this);
         setWhenAvailable(m_batteryIface->isCharging(), [this](bool charging) { setCharging(charging); }, this);
 
         connect(m_batteryIface, SIGNAL(chargeChanged(int)), this, SLOT(setCharge(int)));
         connect(m_batteryIface, SIGNAL(stateChanged(bool)), this, SLOT(setCharging(bool)));
 
         update();
     }
 
     void update() {
         if (m_charge < 0)
             setText(i18n("No Battery"));
         else if (m_charging)
             setText(i18n("Battery: %1% (Charging)", m_charge));
         else
             setText(i18n("Battery: %1%", m_charge));
     }
 
 private Q_SLOTS:
     void setCharge(int charge) { m_charge = charge; update(); }
     void setCharging(bool charging) { m_charging = charging; update(); }
 
 private:
     DeviceBatteryDbusInterface* m_batteryIface;
     int m_charge = -1;
     bool m_charging = false;
 };
 
 
 DeviceIndicator::DeviceIndicator(DeviceDbusInterface* device)
     : QMenu(device->name(), nullptr)
     , m_device(device)
 {
     setIcon(QIcon::fromTheme(device->iconName()));
     setToolTip(device->type());
 
     connect(device, SIGNAL(nameChanged(QString)), this, SLOT(setText(QString)));
 
     addAction(new BatteryAction(device));
 
     auto browse = addAction(i18n("Browse device"));
     connect(browse, &QAction::triggered, device, [device](){
         SftpDbusInterface* sftpIface = new SftpDbusInterface(device->id(), device);
         sftpIface->startBrowsing();
         sftpIface->deleteLater();
     });
     setWhenAvailable(device->hasPlugin("kdeconnect_sftp"), [browse](bool available) { browse->setEnabled(available); }, this);
 
     auto findDevice = addAction(i18n("Find device"));
     connect(findDevice, &QAction::triggered, device, [device](){
         FindMyPhoneDeviceDbusInterface* iface = new FindMyPhoneDeviceDbusInterface(device->id(), device);
         iface->ring();
         iface->deleteLater();
     });
     setWhenAvailable(device->hasPlugin("kdeconnect_findmyphone"), [findDevice](bool available) { findDevice->setEnabled(available); }, this);
 
-//     addAction(i18n("Send file")); //TODO
+    auto sendFile = addAction(i18n("Send file"));
+    connect(sendFile, &QAction::triggered, device, [device, this](){
+        const QUrl url = QFileDialog::getOpenFileUrl(parentWidget(), i18n("Select file to send to '%1'", device->name()), QUrl::fromLocalFile(QDir::homePath()));
+        if (url.isEmpty())
+            return;
+
+        QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect"), "/modules/kdeconnect/devices/"+device->id()+"/share", QStringLiteral("org.kde.kdeconnect.device.share"), QStringLiteral("shareUrl"));
+        msg.setArguments(QVariantList() << url.toString());
+        QDBusConnection::sessionBus().call(msg);
+    });
+    setWhenAvailable(device->hasPlugin("kdeconnect_share"), [sendFile](bool available) { sendFile->setEnabled(available); }, this);
 
     addSeparator();
     auto unpair = addAction(i18n("Unpair"));
     connect(unpair, &QAction::triggered, device, [device](){
         device->unpair();
     });
 }
 
 #include "deviceindicator.moc"