diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
new file mode 100644
index 0000000..61ab0a8
--- /dev/null
+++ b/icons/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory( actions )
+add_subdirectory( app )
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..db3a124
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = actions app
diff --git a/icons/actions/CMakeLists.txt b/icons/actions/CMakeLists.txt
new file mode 100644
index 0000000..f79769c
--- /dev/null
+++ b/icons/actions/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/piklab/icons )
diff --git a/src/data/likeback/Makefile.am b/icons/actions/Makefile.am
similarity index 67%
rename from src/data/likeback/Makefile.am
rename to icons/actions/Makefile.am
index 1b17603..1bfd6a9 100644
--- a/src/data/likeback/Makefile.am
+++ b/icons/actions/Makefile.am
@@ -1,2 +1,2 @@
 piklabdir = $(kde_datadir)/piklab/icons
-piklab_ICON = AUTO
\ No newline at end of file
+piklab_ICON = AUTO
diff --git a/src/data/likeback/cr16-action-likeback_dislike.png b/icons/actions/cr16-action-likeback_dislike.png
similarity index 100%
rename from src/data/likeback/cr16-action-likeback_dislike.png
rename to icons/actions/cr16-action-likeback_dislike.png
diff --git a/src/data/likeback/cr16-action-likeback_like.png b/icons/actions/cr16-action-likeback_like.png
similarity index 100%
rename from src/data/likeback/cr16-action-likeback_like.png
rename to icons/actions/cr16-action-likeback_like.png
diff --git a/src/data/likeback/hi16-action-likeback_bug.png b/icons/actions/hi16-action-likeback_bug.png
similarity index 100%
rename from src/data/likeback/hi16-action-likeback_bug.png
rename to icons/actions/hi16-action-likeback_bug.png
diff --git a/src/data/hi16-action-piklab_addcurrentfile.png b/icons/actions/hi16-action-piklab_addcurrentfile.png
similarity index 100%
rename from src/data/hi16-action-piklab_addcurrentfile.png
rename to icons/actions/hi16-action-piklab_addcurrentfile.png
diff --git a/src/data/hi16-action-piklab_addfile.png b/icons/actions/hi16-action-piklab_addfile.png
similarity index 100%
rename from src/data/hi16-action-piklab_addfile.png
rename to icons/actions/hi16-action-piklab_addfile.png
diff --git a/src/data/hi16-action-piklab_blankcheck.png b/icons/actions/hi16-action-piklab_blankcheck.png
similarity index 100%
rename from src/data/hi16-action-piklab_blankcheck.png
rename to icons/actions/hi16-action-piklab_blankcheck.png
diff --git a/src/data/hi16-action-piklab_burnchip.png b/icons/actions/hi16-action-piklab_burnchip.png
similarity index 100%
rename from src/data/hi16-action-piklab_burnchip.png
rename to icons/actions/hi16-action-piklab_burnchip.png
diff --git a/src/data/hi16-action-piklab_chip.png b/icons/actions/hi16-action-piklab_chip.png
similarity index 100%
rename from src/data/hi16-action-piklab_chip.png
rename to icons/actions/hi16-action-piklab_chip.png
diff --git a/src/data/hi16-action-piklab_closeproject.png b/icons/actions/hi16-action-piklab_closeproject.png
similarity index 100%
rename from src/data/hi16-action-piklab_closeproject.png
rename to icons/actions/hi16-action-piklab_closeproject.png
diff --git a/src/data/hi16-action-piklab_compile.png b/icons/actions/hi16-action-piklab_compile.png
similarity index 100%
rename from src/data/hi16-action-piklab_compile.png
rename to icons/actions/hi16-action-piklab_compile.png
diff --git a/src/data/hi16-action-piklab_createproject.png b/icons/actions/hi16-action-piklab_createproject.png
similarity index 100%
rename from src/data/hi16-action-piklab_createproject.png
rename to icons/actions/hi16-action-piklab_createproject.png
diff --git a/src/data/hi16-action-piklab_decompile.png b/icons/actions/hi16-action-piklab_decompile.png
similarity index 100%
rename from src/data/hi16-action-piklab_decompile.png
rename to icons/actions/hi16-action-piklab_decompile.png
diff --git a/src/data/hi16-action-piklab_editproject.png b/icons/actions/hi16-action-piklab_editproject.png
similarity index 100%
rename from src/data/hi16-action-piklab_editproject.png
rename to icons/actions/hi16-action-piklab_editproject.png
diff --git a/src/data/hi16-action-piklab_erasechip.png b/icons/actions/hi16-action-piklab_erasechip.png
similarity index 100%
rename from src/data/hi16-action-piklab_erasechip.png
rename to icons/actions/hi16-action-piklab_erasechip.png
diff --git a/src/data/hi16-action-piklab_find_next.png b/icons/actions/hi16-action-piklab_find_next.png
similarity index 100%
rename from src/data/hi16-action-piklab_find_next.png
rename to icons/actions/hi16-action-piklab_find_next.png
diff --git a/src/data/hi16-action-piklab_find_previous.png b/icons/actions/hi16-action-piklab_find_previous.png
similarity index 100%
rename from src/data/hi16-action-piklab_find_previous.png
rename to icons/actions/hi16-action-piklab_find_previous.png
diff --git a/src/data/hi16-action-piklab_openproject.png b/icons/actions/hi16-action-piklab_openproject.png
similarity index 100%
rename from src/data/hi16-action-piklab_openproject.png
rename to icons/actions/hi16-action-piklab_openproject.png
diff --git a/src/data/hi16-action-piklab_readchip.png b/icons/actions/hi16-action-piklab_readchip.png
similarity index 100%
rename from src/data/hi16-action-piklab_readchip.png
rename to icons/actions/hi16-action-piklab_readchip.png
diff --git a/src/data/hi16-action-piklab_verifychip.png b/icons/actions/hi16-action-piklab_verifychip.png
similarity index 100%
rename from src/data/hi16-action-piklab_verifychip.png
rename to icons/actions/hi16-action-piklab_verifychip.png
diff --git a/src/data/hi22-action-piklab_addcurrentfile.png b/icons/actions/hi22-action-piklab_addcurrentfile.png
similarity index 100%
rename from src/data/hi22-action-piklab_addcurrentfile.png
rename to icons/actions/hi22-action-piklab_addcurrentfile.png
diff --git a/src/data/hi22-action-piklab_addfile.png b/icons/actions/hi22-action-piklab_addfile.png
similarity index 100%
rename from src/data/hi22-action-piklab_addfile.png
rename to icons/actions/hi22-action-piklab_addfile.png
diff --git a/src/data/hi22-action-piklab_blankcheck.png b/icons/actions/hi22-action-piklab_blankcheck.png
similarity index 100%
rename from src/data/hi22-action-piklab_blankcheck.png
rename to icons/actions/hi22-action-piklab_blankcheck.png
diff --git a/src/data/hi22-action-piklab_breakpoint_active.png b/icons/actions/hi22-action-piklab_breakpoint_active.png
similarity index 100%
rename from src/data/hi22-action-piklab_breakpoint_active.png
rename to icons/actions/hi22-action-piklab_breakpoint_active.png
diff --git a/src/data/hi22-action-piklab_breakpoint_disabled.png b/icons/actions/hi22-action-piklab_breakpoint_disabled.png
similarity index 100%
rename from src/data/hi22-action-piklab_breakpoint_disabled.png
rename to icons/actions/hi22-action-piklab_breakpoint_disabled.png
diff --git a/src/data/hi22-action-piklab_breakpoint_invalid.png b/icons/actions/hi22-action-piklab_breakpoint_invalid.png
similarity index 100%
rename from src/data/hi22-action-piklab_breakpoint_invalid.png
rename to icons/actions/hi22-action-piklab_breakpoint_invalid.png
diff --git a/src/data/hi22-action-piklab_breakpoint_reached.png b/icons/actions/hi22-action-piklab_breakpoint_reached.png
similarity index 100%
rename from src/data/hi22-action-piklab_breakpoint_reached.png
rename to icons/actions/hi22-action-piklab_breakpoint_reached.png
diff --git a/src/data/hi22-action-piklab_burnchip.png b/icons/actions/hi22-action-piklab_burnchip.png
similarity index 100%
rename from src/data/hi22-action-piklab_burnchip.png
rename to icons/actions/hi22-action-piklab_burnchip.png
diff --git a/src/data/hi22-action-piklab_chip.png b/icons/actions/hi22-action-piklab_chip.png
similarity index 100%
rename from src/data/hi22-action-piklab_chip.png
rename to icons/actions/hi22-action-piklab_chip.png
diff --git a/src/data/hi22-action-piklab_closeproject.png b/icons/actions/hi22-action-piklab_closeproject.png
similarity index 100%
rename from src/data/hi22-action-piklab_closeproject.png
rename to icons/actions/hi22-action-piklab_closeproject.png
diff --git a/src/data/hi22-action-piklab_compile.png b/icons/actions/hi22-action-piklab_compile.png
similarity index 100%
rename from src/data/hi22-action-piklab_compile.png
rename to icons/actions/hi22-action-piklab_compile.png
diff --git a/src/data/hi22-action-piklab_createproject.png b/icons/actions/hi22-action-piklab_createproject.png
similarity index 100%
rename from src/data/hi22-action-piklab_createproject.png
rename to icons/actions/hi22-action-piklab_createproject.png
diff --git a/src/data/hi22-action-piklab_debug_step.png b/icons/actions/hi22-action-piklab_debug_step.png
similarity index 100%
rename from src/data/hi22-action-piklab_debug_step.png
rename to icons/actions/hi22-action-piklab_debug_step.png
diff --git a/src/data/hi22-action-piklab_debug_stepin.png b/icons/actions/hi22-action-piklab_debug_stepin.png
similarity index 100%
rename from src/data/hi22-action-piklab_debug_stepin.png
rename to icons/actions/hi22-action-piklab_debug_stepin.png
diff --git a/src/data/hi22-action-piklab_debug_stepout.png b/icons/actions/hi22-action-piklab_debug_stepout.png
similarity index 100%
rename from src/data/hi22-action-piklab_debug_stepout.png
rename to icons/actions/hi22-action-piklab_debug_stepout.png
diff --git a/src/data/hi22-action-piklab_debug_stepover.png b/icons/actions/hi22-action-piklab_debug_stepover.png
similarity index 100%
rename from src/data/hi22-action-piklab_debug_stepover.png
rename to icons/actions/hi22-action-piklab_debug_stepover.png
diff --git a/src/data/hi22-action-piklab_debughalt.png b/icons/actions/hi22-action-piklab_debughalt.png
similarity index 100%
rename from src/data/hi22-action-piklab_debughalt.png
rename to icons/actions/hi22-action-piklab_debughalt.png
diff --git a/src/data/hi22-action-piklab_decompile.png b/icons/actions/hi22-action-piklab_decompile.png
similarity index 100%
rename from src/data/hi22-action-piklab_decompile.png
rename to icons/actions/hi22-action-piklab_decompile.png
diff --git a/src/data/hi22-action-piklab_editproject.png b/icons/actions/hi22-action-piklab_editproject.png
similarity index 100%
rename from src/data/hi22-action-piklab_editproject.png
rename to icons/actions/hi22-action-piklab_editproject.png
diff --git a/src/data/hi22-action-piklab_erasechip.png b/icons/actions/hi22-action-piklab_erasechip.png
similarity index 100%
rename from src/data/hi22-action-piklab_erasechip.png
rename to icons/actions/hi22-action-piklab_erasechip.png
diff --git a/src/data/hi22-action-piklab_find_next.png b/icons/actions/hi22-action-piklab_find_next.png
similarity index 100%
rename from src/data/hi22-action-piklab_find_next.png
rename to icons/actions/hi22-action-piklab_find_next.png
diff --git a/src/data/hi22-action-piklab_find_previous.png b/icons/actions/hi22-action-piklab_find_previous.png
similarity index 100%
rename from src/data/hi22-action-piklab_find_previous.png
rename to icons/actions/hi22-action-piklab_find_previous.png
diff --git a/src/data/hi22-action-piklab_openproject.png b/icons/actions/hi22-action-piklab_openproject.png
similarity index 100%
rename from src/data/hi22-action-piklab_openproject.png
rename to icons/actions/hi22-action-piklab_openproject.png
diff --git a/src/data/hi22-action-piklab_power.png b/icons/actions/hi22-action-piklab_power.png
similarity index 100%
rename from src/data/hi22-action-piklab_power.png
rename to icons/actions/hi22-action-piklab_power.png
diff --git a/src/data/hi22-action-piklab_program_counter.png b/icons/actions/hi22-action-piklab_program_counter.png
similarity index 100%
rename from src/data/hi22-action-piklab_program_counter.png
rename to icons/actions/hi22-action-piklab_program_counter.png
diff --git a/src/data/hi22-action-piklab_program_counter_disabled.png b/icons/actions/hi22-action-piklab_program_counter_disabled.png
similarity index 100%
rename from src/data/hi22-action-piklab_program_counter_disabled.png
rename to icons/actions/hi22-action-piklab_program_counter_disabled.png
diff --git a/src/data/hi22-action-piklab_readchip.png b/icons/actions/hi22-action-piklab_readchip.png
similarity index 100%
rename from src/data/hi22-action-piklab_readchip.png
rename to icons/actions/hi22-action-piklab_readchip.png
diff --git a/src/data/hi22-action-piklab_restart.png b/icons/actions/hi22-action-piklab_restart.png
similarity index 100%
rename from src/data/hi22-action-piklab_restart.png
rename to icons/actions/hi22-action-piklab_restart.png
diff --git a/src/data/hi22-action-piklab_run.png b/icons/actions/hi22-action-piklab_run.png
similarity index 100%
rename from src/data/hi22-action-piklab_run.png
rename to icons/actions/hi22-action-piklab_run.png
diff --git a/src/data/hi22-action-piklab_stop.png b/icons/actions/hi22-action-piklab_stop.png
similarity index 100%
rename from src/data/hi22-action-piklab_stop.png
rename to icons/actions/hi22-action-piklab_stop.png
diff --git a/src/data/hi22-action-piklab_verifychip.png b/icons/actions/hi22-action-piklab_verifychip.png
similarity index 100%
rename from src/data/hi22-action-piklab_verifychip.png
rename to icons/actions/hi22-action-piklab_verifychip.png
diff --git a/src/data/hi32-action-piklab_config_assembler.png b/icons/actions/hi32-action-piklab_config_assembler.png
similarity index 100%
rename from src/data/hi32-action-piklab_config_assembler.png
rename to icons/actions/hi32-action-piklab_config_assembler.png
diff --git a/src/data/hi32-action-piklab_config_disassembler.png b/icons/actions/hi32-action-piklab_config_disassembler.png
similarity index 100%
rename from src/data/hi32-action-piklab_config_disassembler.png
rename to icons/actions/hi32-action-piklab_config_disassembler.png
diff --git a/src/data/hi32-action-piklab_config_programmer.png b/icons/actions/hi32-action-piklab_config_programmer.png
similarity index 100%
rename from src/data/hi32-action-piklab_config_programmer.png
rename to icons/actions/hi32-action-piklab_config_programmer.png
diff --git a/icons/app/CMakeLists.txt b/icons/app/CMakeLists.txt
new file mode 100644
index 0000000..5cca3c6
--- /dev/null
+++ b/icons/app/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${ICON_INSTALL_DIR} )
diff --git a/icons/app/Makefile.am b/icons/app/Makefile.am
new file mode 100644
index 0000000..59bae53
--- /dev/null
+++ b/icons/app/Makefile.am
@@ -0,0 +1,2 @@
+piklabdir = $(kde_icondir)
+piklab_ICON = AUTO
diff --git a/src/data/app_data/hi16-app-piklab.png b/icons/app/hi16-app-piklab.png
similarity index 100%
rename from src/data/app_data/hi16-app-piklab.png
rename to icons/app/hi16-app-piklab.png
diff --git a/src/data/app_data/hi32-app-piklab.png b/icons/app/hi32-app-piklab.png
similarity index 100%
rename from src/data/app_data/hi32-app-piklab.png
rename to icons/app/hi32-app-piklab.png
diff --git a/src/data/app_data/hi32-mime-piklab_project.png b/icons/app/hi32-mime-piklab_project.png
similarity index 100%
rename from src/data/app_data/hi32-mime-piklab_project.png
rename to icons/app/hi32-mime-piklab_project.png
diff --git a/src/data/app_data/hi64-app-piklab.png b/icons/app/hi64-app-piklab.png
similarity index 100%
rename from src/data/app_data/hi64-app-piklab.png
rename to icons/app/hi64-app-piklab.png
diff --git a/src/data/Makefile.am b/src/data/Makefile.am
index a3469ec..c7fc1c3 100644
--- a/src/data/Makefile.am
+++ b/src/data/Makefile.am
@@ -1,8 +1,5 @@
 INCLUDES = $(all_includes)
-SUBDIRS = app_data likeback
-
-piklabdir = $(kde_datadir)/piklab/icons
-piklab_ICON = AUTO
+SUBDIRS = app_data
 
 syntaxkatedir = $(kde_datadir)/katepart/syntax
 syntaxkate_DATA = asm-pic.xml coff-pic.xml jal-pic.xml coff-c-pic.xml
diff --git a/src/data/app_data/Makefile.am b/src/data/app_data/Makefile.am
index 61959e6..c106a7c 100644
--- a/src/data/app_data/Makefile.am
+++ b/src/data/app_data/Makefile.am
@@ -3,7 +3,5 @@ xdg_apps_DATA = piklab.desktop
 rcdir   = $(kde_datadir)/piklab
 rc_DATA = piklabui.rc hexeditorpartui.rc
 
-KDE_ICON = AUTO
-
 mimedir   = $(kde_mimedir)/application
 mime_DATA = x-piklab.desktop
diff --git a/subdirs b/subdirs
index 0e67810..1ab0827 100644
--- a/subdirs
+++ b/subdirs
@@ -1,3 +1,4 @@
 doc
+icons
 po
 src