diff --git a/kivio/plugins/kivioconnectortool/Makefile.am b/kivio/plugins/kivioconnectortool/Makefile.am
index 7d09a2129..6f5295c0a 100644
--- a/kivio/plugins/kivioconnectortool/Makefile.am
+++ b/kivio/plugins/kivioconnectortool/Makefile.am
@@ -38,4 +38,4 @@ kiviopics_DATA = kivio_connector_cursor1.png kivio_connector_cursor2.png
 kiviopicsdir = $(kde_datadir)/kivio/pics
 
 kivioicondir = $(kde_datadir)/kivio/icons
-kivioicon_ICON = AUTO
+kivioicon_ICON = kivio_connector
diff --git a/kpresenter/toolbar/action-alignobjs.svg b/kpresenter/toolbar/hisc-action-alignobjs.svg
similarity index 100%
rename from kpresenter/toolbar/action-alignobjs.svg
rename to kpresenter/toolbar/hisc-action-alignobjs.svg
diff --git a/kpresenter/toolbar/action-autoform.svg b/kpresenter/toolbar/hisc-action-autoform.svg
similarity index 100%
rename from kpresenter/toolbar/action-autoform.svg
rename to kpresenter/toolbar/hisc-action-autoform.svg
diff --git a/kpresenter/toolbar/action-circle.svg b/kpresenter/toolbar/hisc-action-circle.svg
similarity index 100%
rename from kpresenter/toolbar/action-circle.svg
rename to kpresenter/toolbar/hisc-action-circle.svg
diff --git a/kpresenter/toolbar/action-closed_cubicbeziercurve.svg b/kpresenter/toolbar/hisc-action-closed_cubicbeziercurve.svg
similarity index 100%
rename from kpresenter/toolbar/action-closed_cubicbeziercurve.svg
rename to kpresenter/toolbar/hisc-action-closed_cubicbeziercurve.svg
diff --git a/kpresenter/toolbar/action-closed_freehand.svg b/kpresenter/toolbar/hisc-action-closed_freehand.svg
similarity index 100%
rename from kpresenter/toolbar/action-closed_freehand.svg
rename to kpresenter/toolbar/hisc-action-closed_freehand.svg
diff --git a/kpresenter/toolbar/action-closed_polyline.svg b/kpresenter/toolbar/hisc-action-closed_polyline.svg
similarity index 100%
rename from kpresenter/toolbar/action-closed_polyline.svg
rename to kpresenter/toolbar/hisc-action-closed_polyline.svg
diff --git a/kpresenter/toolbar/action-closed_quadricbeziercurve.svg b/kpresenter/toolbar/hisc-action-closed_quadricbeziercurve.svg
similarity index 100%
rename from kpresenter/toolbar/action-closed_quadricbeziercurve.svg
rename to kpresenter/toolbar/hisc-action-closed_quadricbeziercurve.svg
diff --git a/kpresenter/toolbar/action-cubicbeziercurve.svg b/kpresenter/toolbar/hisc-action-cubicbeziercurve.svg
similarity index 100%
rename from kpresenter/toolbar/action-cubicbeziercurve.svg
rename to kpresenter/toolbar/hisc-action-cubicbeziercurve.svg
diff --git a/kpresenter/toolbar/action-effect.png.svg b/kpresenter/toolbar/hisc-action-effect.png.svg
similarity index 100%
rename from kpresenter/toolbar/action-effect.png.svg
rename to kpresenter/toolbar/hisc-action-effect.png.svg
diff --git a/kpresenter/toolbar/action-effect.svg b/kpresenter/toolbar/hisc-action-effect.svg
similarity index 100%
rename from kpresenter/toolbar/action-effect.svg
rename to kpresenter/toolbar/hisc-action-effect.svg
diff --git a/kpresenter/toolbar/action-freehand.svg b/kpresenter/toolbar/hisc-action-freehand.svg
similarity index 100%
rename from kpresenter/toolbar/action-freehand.svg
rename to kpresenter/toolbar/hisc-action-freehand.svg
diff --git a/kpresenter/toolbar/action-line.svg b/kpresenter/toolbar/hisc-action-line.svg
similarity index 100%
rename from kpresenter/toolbar/action-line.svg
rename to kpresenter/toolbar/hisc-action-line.svg
diff --git a/kpresenter/toolbar/action-penbrush.svg b/kpresenter/toolbar/hisc-action-penbrush.svg
similarity index 100%
rename from kpresenter/toolbar/action-penbrush.svg
rename to kpresenter/toolbar/hisc-action-penbrush.svg
diff --git a/kpresenter/toolbar/action-pie.svg b/kpresenter/toolbar/hisc-action-pie.svg
similarity index 100%
rename from kpresenter/toolbar/action-pie.svg
rename to kpresenter/toolbar/hisc-action-pie.svg
diff --git a/kpresenter/toolbar/action-polygon.svg b/kpresenter/toolbar/hisc-action-polygon.svg
similarity index 100%
rename from kpresenter/toolbar/action-polygon.svg
rename to kpresenter/toolbar/hisc-action-polygon.svg
diff --git a/kpresenter/toolbar/action-polyline.svg b/kpresenter/toolbar/hisc-action-polyline.svg
similarity index 100%
rename from kpresenter/toolbar/action-polyline.svg
rename to kpresenter/toolbar/hisc-action-polyline.svg
diff --git a/kpresenter/toolbar/action-quadricbeziercurve.svg b/kpresenter/toolbar/hisc-action-quadricbeziercurve.svg
similarity index 100%
rename from kpresenter/toolbar/action-quadricbeziercurve.svg
rename to kpresenter/toolbar/hisc-action-quadricbeziercurve.svg
diff --git a/kpresenter/toolbar/action-rectangle.svg b/kpresenter/toolbar/hisc-action-rectangle.svg
similarity index 100%
rename from kpresenter/toolbar/action-rectangle.svg
rename to kpresenter/toolbar/hisc-action-rectangle.svg
diff --git a/kpresenter/toolbar/action-slide_effect.svg b/kpresenter/toolbar/hisc-action-slide_effect.svg
similarity index 100%
rename from kpresenter/toolbar/action-slide_effect.svg
rename to kpresenter/toolbar/hisc-action-slide_effect.svg