diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 467dba126e..a935670fb6 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -308,13 +308,14 @@ end
 if tup.getconfig('NO_FASM') ~= 'full' then
 tup.append_table(img_files, {
  {"KERNEL.MNT", "../kernel/trunk/kernel.mnt"},
- {"@MENU", PROGS .. "/system/menu/trunk/menu"},
- {"@VOLUME", PROGS .. "/media/volume/volume"},
- {"@TASKBAR", PROGS .. "/system/taskbar/trunk/TASKBAR"},
  {"@DOCKY", PROGS .. "/system/docky/trunk/docky"},
- {"@OPEN", PROGS .. "/system/open/open"},
+ {"@ICON", PROGS .. "/system/icon_new/icon"},
+ {"@MENU", PROGS .. "/system/menu/trunk/menu"},
  {"@NOTIFY", PROGS .. "/system/notify3/notify"},
+ {"@OPEN", PROGS .. "/system/open/open"},
+ {"@TASKBAR", PROGS .. "/system/taskbar/trunk/TASKBAR"},
  {"@SS", PROGS .. "/system/ss/trunk/@ss"},
+ {"@VOLUME", PROGS .. "/media/volume/volume"},
  {"ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"},
  {"CALC", PROGS .. "/other/calc/trunk/calc"},
  {"CALENDAR", PROGS .. "/system/calendar/trunk/calendar"},
@@ -330,7 +331,6 @@ tup.append_table(img_files, {
  {"FSPEED", PROGS .. "/fs/fspeed/fspeed"},
  {"GMON", PROGS .. "/system/gmon/gmon"},
  {"HDD_INFO", PROGS .. "/system/hdd_info/trunk/hdd_info"},
- {"@ICON", PROGS .. "/system/icon_new/@icon"},
  {"CROPFLAT", PROGS .. "/system/cropflat/cropflat"},
  {"KBD", PROGS .. "/system/kbd/trunk/kbd"},
  {"KPACK", PROGS .. "/other/kpack/trunk/kpack"},
diff --git a/programs/system/icon_new/Tupfile.lua b/programs/system/icon_new/Tupfile.lua
index 1883f19df2..c47a3460c9 100644
--- a/programs/system/icon_new/Tupfile.lua
+++ b/programs/system/icon_new/Tupfile.lua
@@ -1,3 +1,3 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
-tup.rule({"icon.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "@icon")
+tup.rule({"icon.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "icon")