diff --git a/usr/share/applications/lubuntu-logout.desktop b/usr/share/applications/lubuntu-logout.desktop
index 74de908..6e43f6f 100644
--- a/usr/share/applications/lubuntu-logout.desktop
+++ b/usr/share/applications/lubuntu-logout.desktop
@@ -3,5 +3,5 @@ Name=Shutdown
 Name[zh_TW]=關機
 Comment=Shutdown or Reboot
 Icon=system-shutdown-panel
-Exec=lubuntu-logout
+Exec=lxsession-default quit
 NoDisplay=true
diff --git a/usr/share/applications/lubuntu-screenlock.desktop b/usr/share/applications/lubuntu-screenlock.desktop
index 54f480a..a693bc3 100644
--- a/usr/share/applications/lubuntu-screenlock.desktop
+++ b/usr/share/applications/lubuntu-screenlock.desktop
@@ -3,5 +3,5 @@ Name=ScreenLock
 Name[zh_TW]=鎖住螢幕
 Comment=Lock your screen
 Icon=system-lock-screen
-Exec=xscreensaver-command -lock
+Exec=lxlock
 NoDisplay=true