diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b60f4cf1..c12a83cf3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ set(QT_MIN_VERSION "5.6.0")
set(KF5_MIN_VERSION "5.26.0")
find_package(ECM 1.8.0 REQUIRED NO_MODULE)
+
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
@@ -107,3 +108,5 @@ plasma_install_package(build/shell/release org.kde.latte.shell shells shell)
add_subdirectory(corona)
+add_subdirectory(icons)
+
diff --git a/corona/latte-dock.desktop b/corona/latte-dock.desktop
index 7c25878f6..55966283f 100644
--- a/corona/latte-dock.desktop
+++ b/corona/latte-dock.desktop
@@ -1,16 +1,13 @@
[Desktop Entry]
-Name=Latte Dock
-Comment=Latte Dock Application
+Name=Latte
+Comment=Dock for the masses
+
+Categories=Utility;
+GenericName=Dock
Exec=latte-dock %u
-Hidden=true
-Icon=plasma
+Icon=latte-dock
InitialPreference=1
-Path=
StartupNotify=true
Terminal=false
-TerminalOptions=
Type=Application
-X-DBUS-ServiceName=
-X-DBUS-StartupType=unique
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+
diff --git a/icons/16-apps-latte-dock.svg b/icons/16-apps-latte-dock.svg
new file mode 100644
index 000000000..8ad540e3f
--- /dev/null
+++ b/icons/16-apps-latte-dock.svg
@@ -0,0 +1,228 @@
+
+
+
+
diff --git a/icons/22-apps-latte-dock.svg b/icons/22-apps-latte-dock.svg
new file mode 100644
index 000000000..845383ed1
--- /dev/null
+++ b/icons/22-apps-latte-dock.svg
@@ -0,0 +1,229 @@
+
+
+
+
diff --git a/icons/24-apps-latte-dock.svg b/icons/24-apps-latte-dock.svg
new file mode 100644
index 000000000..5e6e59885
--- /dev/null
+++ b/icons/24-apps-latte-dock.svg
@@ -0,0 +1,226 @@
+
+
+
+
diff --git a/icons/32-apps-latte-dock.svg b/icons/32-apps-latte-dock.svg
new file mode 100644
index 000000000..0987d968f
--- /dev/null
+++ b/icons/32-apps-latte-dock.svg
@@ -0,0 +1,216 @@
+
+
+
+
diff --git a/icons/48-apps-latte-dock.svg b/icons/48-apps-latte-dock.svg
new file mode 100644
index 000000000..421c8d442
--- /dev/null
+++ b/icons/48-apps-latte-dock.svg
@@ -0,0 +1,217 @@
+
+
+
+
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
new file mode 100644
index 000000000..f85262234
--- /dev/null
+++ b/icons/CMakeLists.txt
@@ -0,0 +1,11 @@
+include(ECMInstallIcons)
+
+ecm_install_icons(ICONS
+ 16-apps-latte-dock.svg
+ 22-apps-latte-dock.svg
+ 24-apps-latte-dock.svg
+ 32-apps-latte-dock.svg
+ 48-apps-latte-dock.svg
+ sc-apps-latte-dock.svg
+THEME hicolor
+DESTINATION ${ICON_INSTALL_DIR} )
diff --git a/icons/sc-apps-latte-dock.svg b/icons/sc-apps-latte-dock.svg
new file mode 100644
index 000000000..421c8d442
--- /dev/null
+++ b/icons/sc-apps-latte-dock.svg
@@ -0,0 +1,217 @@
+
+
+
+
diff --git a/plasmoid.metadata.desktop.template b/plasmoid.metadata.desktop.template
index 3357cb7bb..488229db9 100644
--- a/plasmoid.metadata.desktop.template
+++ b/plasmoid.metadata.desktop.template
@@ -4,7 +4,7 @@ _Comment=Switch between running applications
Type=Service
-Icon=preferences-system-windows
+Icon=latte-dock
X-KDE-ServiceTypes=Plasma/Applet
X-Plasma-API=declarativeappletscript
X-Plasma-MainScript=ui/main.qml
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index b963b87c1..6e83c22eb 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -10,7 +10,7 @@ Comment[zh_TW]=在執行中的應用程式間切換
Type=Service
-Icon=preferences-system-windows
+Icon=latte-dock
X-KDE-ServiceTypes=Plasma/Applet
X-Plasma-API=declarativeappletscript
X-Plasma-MainScript=ui/main.qml