diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1f4b3dbc..ebe30f446 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,5 @@ if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
-install(PROGRAMS org.kde.kdeconnect.nonplasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 install(FILES org.kde.kdeconnect.kcm.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/indicator/CMakeLists.txt b/indicator/CMakeLists.txt
index 811d3ad13..af77996fa 100644
--- a/indicator/CMakeLists.txt
+++ b/indicator/CMakeLists.txt
@@ -5,3 +5,4 @@ add_executable(kdeconnect-indicator main.cpp deviceindicator.cpp)
 target_link_libraries(kdeconnect-indicator Qt5::Widgets KF5::CoreAddons KF5::I18n KF5::Notifications KF5::KCMUtils kdeconnectinterfaces)
 
 install(TARGETS kdeconnect-indicator ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(PROGRAMS org.kde.kdeconnect.nonplasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop
similarity index 62%
rename from org.kde.kdeconnect.nonplasma.desktop
rename to indicator/org.kde.kdeconnect.nonplasma.desktop
index 1e30b106c..aa5465a90 100755
--- a/org.kde.kdeconnect.nonplasma.desktop
+++ b/indicator/org.kde.kdeconnect.nonplasma.desktop
@@ -1,35 +1,5 @@
 [Desktop Entry]
-Name=KDE Connect Monitor
-Name[ar]=مرقاب «كدي المتّصل»
-Name[ast]=Monitor de KDE Connect
-Name[ca]=Controlador del KDE Connect
-Name[ca@valencia]=Controlador del KDE Connect
-Name[cs]=Monitor KDE Connect
-Name[da]=KDE Connect-overvåger
-Name[de]=KDE-Connect-Monitor
-Name[el]=Εφαρμογή εποπτείας του KDE Connect
-Name[en_GB]=KDE Connect Monitor
-Name[es]=Monitor de KDE Connect
-Name[et]=KDE Connecti monitor
-Name[fi]=KDE Connect -valvonta
-Name[gl]=Monitor de KDE Connect
-Name[he]=מנטר KDE Connect
-Name[hu]=KDE Connect monitor
-Name[it]=Monitor di KDE Connect
-Name[ko]=KDE Connect 모니터
-Name[nl]=KDE-Connectmonitor
-Name[nn]=Overvak KDE Connect
-Name[pl]=Monitor KDE Connect
-Name[pt]=Monitor do KDE Connect
-Name[pt_BR]=Monitor do KDE Connect
-Name[ru]=Индикатор KDE Connect
-Name[sk]=Monitor KDE Connect
-Name[sv]=KDE-anslut övervakning
-Name[tr]=KDE Bağlantı İzleyicisi
-Name[uk]=Монітор KDE Connect
-Name[x-test]=xxKDE Connect Monitorxx
-Name[zh_CN]=KDE Connect 监视器
-Name[zh_TW]=KDE 連線監視器
+Name=KDE Connect Indicator
 Comment=Display information about your devices
 Comment[ar]=اعرض معلومات عن أجهزتك
 Comment[ast]=Amuesa información tocante a los tos preseos
@@ -61,8 +31,7 @@ Comment[uk]=Показати дані щодо ваших пристроїв
 Comment[x-test]=xxDisplay information about your devicesxx
 Comment[zh_CN]=显示您设备的信息
 Comment[zh_TW]=顯示關於您的裝置資訊
-Exec=plasmawindowed org.kde.kdeconnect --statusnotifier
-TryExec=plasmawindowed
+Exec=kdeconnect-indicator
 Icon=kdeconnect
 Type=Application
 Terminal=false