diff --git a/CASA-auth-token/yast2-casa-ats/src/Makefile.am b/CASA-auth-token/yast2-casa-ats/src/Makefile.am
index 99f91b04..dc79f4c6 100644
--- a/CASA-auth-token/yast2-casa-ats/src/Makefile.am
+++ b/CASA-auth-token/yast2-casa-ats/src/Makefile.am
@@ -2,9 +2,9 @@
 
 yncludedir = @yncludedir@/casa-ats
 
-theme22dir = @themedir@/NLD/icons/22x22/apps
-theme32dir = @themedir@/NLD/icons/32x32/apps
-theme48dir = @themedir@/NLD/icons/48x48/apps
+#theme22dir = @themedir@/NLD/icons/22x22/apps
+#theme32dir = @themedir@/NLD/icons/32x32/apps
+#theme48dir = @themedir@/NLD/icons/48x48/apps
 
 client_DATA =			\
 	casa-ats.ycp
@@ -18,12 +18,12 @@ ynclude_DATA =			\
 desktop_DATA =			\
 	casa-ats.desktop
 
-theme22_DATA =  \
-        icon/22x22/yast-casa-ats.png
-theme32_DATA = \
-        icon/32x32/yast-casa-ats.png
-theme48_DATA = \
-        icon/48x48/yast-casa-ats.png
+#theme22_DATA =  \
+#        icon/22x22/yast-casa-ats.png
+#theme32_DATA = \
+#        icon/32x32/yast-casa-ats.png
+#theme48_DATA = \
+#        icon/48x48/yast-casa-ats.png
 
 module_DATA =			\
 	CasaAts.ycp
@@ -33,6 +33,7 @@ casa-ats:
 	ln -sf . $@
 ycpchook = casa-ats
 
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(theme48_DATA) $(theme32_DATA) $(theme22_DATA) 
+#EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(theme48_DATA) $(theme32_DATA) $(theme22_DATA) 
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff --git a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in
index d0d4b55c..debbc780 100644
--- a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in
+++ b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in
@@ -27,9 +27,4 @@ Summary:	Configuration of casa-ats
 @clientdir@/*.ycp
 @moduledir@/CasaAts.*
 @desktopdir@/casa-ats.desktop
-%if %suse_version < 1030
-@themedir@/NLD/icons/22x22/apps/*.png
-@themedir@/NLD/icons/32x32/apps/*.png
-@themedir@/NLD/icons/48x48/apps/*.png
-%endif
 %doc @docdir@
diff --git a/yast2-CASA/src/CASA.desktop b/yast2-CASA/src/CASA.desktop
index b4f75ce7..c92006c3 100644
--- a/yast2-CASA/src/CASA.desktop
+++ b/yast2-CASA/src/CASA.desktop
@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 X-SuSE-YaST-SortKey=
 X-SuSE-YaST-AutoInstResource=CASA
 
-Icon=CASA
+Icon=yast-casa
 Exec=/sbin/yast2 CASA 
 
 Name=CASA
diff --git a/yast2-CASA/src/Makefile.am b/yast2-CASA/src/Makefile.am
index ca263fa9..370f6c21 100644
--- a/yast2-CASA/src/Makefile.am
+++ b/yast2-CASA/src/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for CASA/src
 
 yncludedir = @yncludedir@/CASA
-iconsdir = /usr/share/applications
-themedir = /usr/share/pixmaps
+#iconsdir = /usr/share/applications
+#themedir = /usr/share/pixmaps
 
 
 client_DATA =			\
@@ -22,14 +22,15 @@ desktop_DATA =			\
 module_DATA =			\
 	NovellCasa.ycp
 
-icons_DATA =			\
-	icons/install_casa_yast_icons
+#icons_DATA =			\
+#	icons/install_casa_yast_icons
 	
-theme_DATA =			\
-	icons/CASA_22.png	\
-	icons/CASA_32.png	\
-	icons/CASA_48.png
+#theme_DATA =			\
+#	icons/CASA_22.png	\
+#	icons/CASA_32.png	\
+#	icons/CASA_48.png
 
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA)
+#EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA)
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff --git a/yast2-CASA/yast2-CASA.spec.in b/yast2-CASA/yast2-CASA.spec.in
index fc8629e6..24674af1 100644
--- a/yast2-CASA/yast2-CASA.spec.in
+++ b/yast2-CASA/yast2-CASA.spec.in
@@ -43,35 +43,13 @@ system installation.
 @BUILD@
 
 @INSTALL@
-chmod 555 $RPM_BUILD_ROOT/usr/share/applications/install_casa_yast_icons
-
 
 @CLEAN@
 
-%post
-echo "yast2-CASA post install script"
-echo "installing the Novell CASA YaST icon files"
-/usr/share/applications/install_casa_yast_icons install rpm
-exit 0
-
-%preun
-if [ "$1" = 0 ]; then
-	echo "yast2-CASA pre uninstall script"
-	echo "removing the Novell CASA YaST icon files"
-	/usr/share/applications/install_casa_yast_icons uninstall rpm
-fi
-exit 0
-
-
 %files
 %defattr(-,root,root)
 %dir @yncludedir@/CASA
 /usr/share/applications/install_casa_yast_icons
-%if %suse_version < 1030
-/usr/share/pixmaps/CASA_22.png
-/usr/share/pixmaps/CASA_32.png
-/usr/share/pixmaps/CASA_48.png
-%endif
 @yncludedir@/CASA/*
 @clientdir@/CASA.ycp
 @clientdir@/CASA_*.ycp