diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 0111ad1..9c48ccd 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -27,4 +27,10 @@ function create() {
     echo "Create"
     builder_create
     cp $INST_DIR/CLIENT_DATA/opsi-${PN}.ini $INST_DIR/CLIENT_DATA/Imagine.ini
+    mkdir $INST_DIR/CLIENT_DATA/X86/Icons
+    mkdir $INST_DIR/CLIENT_DATA/X86_64/Icons
+    find $INST_DIR/CLIENT_DATA/ALL/ -type f -iname '*.ico' -exec cp -v {} $INST_DIR/CLIENT_DATA/X86/Icons \;
+    find $INST_DIR/CLIENT_DATA/ALL/ -type f -iname '*.ico' -exec cp -v {} $INST_DIR/CLIENT_DATA/X86_64/Icons \;
+
+    rm -rf $INST_DIR/CLIENT_DATA/ALL/
 }