diff --git a/mobile/hotspot/CMakeLists.txt b/mobile/hotspot/CMakeLists.txt
--- a/mobile/hotspot/CMakeLists.txt
+++ b/mobile/hotspot/CMakeLists.txt
@@ -1,14 +1,12 @@
-project (kcm_mobile_hotspot)
-
 set (hotspotsettings_SRCS hotspotsettings.cpp)
 
 add_library(kcm_mobile_hotspot MODULE ${hotspotsettings_SRCS})
 
 target_link_libraries(kcm_mobile_hotspot
     Qt5::Quick
     Qt5::Qml
     KF5::I18n
-    KF5::Plasma
+    KF5::CoreAddons
     KF5::QuickAddons
 )
 
diff --git a/mobile/hotspot/hotspotsettings.h b/mobile/hotspot/hotspotsettings.h
--- a/mobile/hotspot/hotspotsettings.h
+++ b/mobile/hotspot/hotspotsettings.h
@@ -29,7 +29,7 @@
     Q_OBJECT
 public:
     HotspotSettings(QObject *parent, const QVariantList &args);
-    virtual ~HotspotSettings();
+    virtual ~HotspotSettings() override;
 };
 
 #endif // HOTSPOTSETTINGS_H
diff --git a/mobile/hotspot/hotspotsettings.cpp b/mobile/hotspot/hotspotsettings.cpp
--- a/mobile/hotspot/hotspotsettings.cpp
+++ b/mobile/hotspot/hotspotsettings.cpp
@@ -27,7 +27,7 @@
 
 HotspotSettings::HotspotSettings(QObject* parent, const QVariantList& args) : KQuickAddons::ConfigModule(parent, args)
 {
-    KAboutData* about = new KAboutData("kcm_mobile_hotspot", i18n("Hotspots"),
+    KAboutData* about = new KAboutData("kcm_mobile_hotspot", i18n("Hotspot"),
                                        "0.1", QString(), KAboutLicense::LGPL);
     about->addAuthor(i18n("Tobias Fella"), QString(), "fella@posteo.de");
     setAboutData(about);
diff --git a/mobile/hotspot/package/contents/ui/main.qml b/mobile/hotspot/package/contents/ui/main.qml
--- a/mobile/hotspot/package/contents/ui/main.qml
+++ b/mobile/hotspot/package/contents/ui/main.qml
@@ -25,9 +25,6 @@
 import org.kde.kcm 1.2
 
 SimpleKCM {
-    id: main
-
-    title: i18n("Hotspot")
 
     PlasmaNM.Handler {
         id: handler
@@ -39,10 +36,10 @@
 
     Kirigami.FormLayout {
         Controls.Switch {
-            id: enabled
+            id: hotspotToggle
             Kirigami.FormData.label: i18n("Enabled:")
             onToggled: {
-                if (enabled.checked) {
+                if (hotspotToggle.checked) {
                     handler.createHotspot()
                 } else {
                     handler.stopHotspot()
@@ -67,7 +64,7 @@
             onClicked: {
                 configuration.hotspotName = hotspotName.text
                 configuration.hotspotPassword = hotspotPassword.text
-                if (enabled.checked) {
+                if (hotspotToggle.checked) {
                     handler.stopHotspot()
                     handler.createHotspot()
                 }
diff --git a/mobile/hotspot/package/metadata.desktop b/mobile/hotspot/package/metadata.desktop
--- a/mobile/hotspot/package/metadata.desktop
+++ b/mobile/hotspot/package/metadata.desktop
@@ -3,7 +3,7 @@
 Comment=Wi-Fi Hotspots
 Encoding=UTF-8
 Type=Service
-Icon=network-wireless-symbolic
+Icon=network-wireless-hotspot
 X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_mobile_hotspot
 X-KDE-PluginInfo-Author=Tobias Fella