diff --git a/Makefile.am b/Makefile.am
index 4ae748a99..b303e6d54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,6 @@ EXTRA_DIST = \
 		CMakeLists.txt \
 		autogen.sh \
 		BuildAll.bat \
-		BuildAllNice.bat \
 		build.sh \
 		ChangeLog.txt \
 		copying.lib \
diff --git a/src/Mod/Part/Gui/Makefile.am b/src/Mod/Part/Gui/Makefile.am
index 7329a30ab..4f9c63311 100644
--- a/src/Mod/Part/Gui/Makefile.am
+++ b/src/Mod/Part/Gui/Makefile.am
@@ -201,10 +201,10 @@ EXTRA_DIST = \
 		Resources/icons/Part_Import.svg \
 		Resources/icons/Part_Mirror.svg \
 		Resources/icons/Part_MirrorPNG.png \
-		Resources/icons/Part_RuledSurface.png \
+		Resources/icons/Part_RuledSurface.svg \
 		Resources/icons/Part_Shapebuilder.png \
 		Resources/icons/Part_Shapebuilder.svg \
-		Resources/icons/Part_ShapeInfo.png \
+		Resources/icons/Part_ShapeInfo.svg \
 		Resources/icons/Tree_Part.svg \
 		Resources/icons/preferences-part_design.svg \
 		Resources/icons/PartFeature.svg \
diff --git a/src/Mod/Sketcher/Gui/Resources/Makefile.am b/src/Mod/Sketcher/Gui/Resources/Makefile.am
index 18563dc20..e6dab8b7c 100644
--- a/src/Mod/Sketcher/Gui/Resources/Makefile.am
+++ b/src/Mod/Sketcher/Gui/Resources/Makefile.am
@@ -13,11 +13,10 @@ icons/Constraint_PointOnObject.svg \
 		icons/small/Constraint_Concentric_sm.xpm \
 		icons/small/Constraint_TangentToEnd_sm.xpm \
 		icons/small/Constraint_PointOnMidPoint_sm.xpm \
-		icons/small/Sketcher_ConstrainDistance_sm.xpm \
-		icons/small/Sketcher_ConstrainParallel_sm.xpm \
 		icons/small/Constraint_PointOnStart_sm.xpm \
 		icons/small/Constraint_Vertical_sm.xpm \
 		icons/small/Constraint_PointOnEnd_sm.xpm \
+		icons/small/Constraint_PointOnObject_sm.xpm \
 		icons/small/Constraint_PointToObject_sm.xpm \
 		icons/small/Constraint_InternalAngle_sm.xpm \
 		icons/small/Constraint_Radius_sm.xpm \