diff --git a/images/fe_icons/editablememberlistfield.png b/images/editablememberlistfield.png
similarity index 100%
rename from images/fe_icons/editablememberlistfield.png
rename to images/editablememberlistfield.png
diff --git a/images/fe_icons/editablepasswordfield.png b/images/editablepasswordfield.png
similarity index 100%
rename from images/fe_icons/editablepasswordfield.png
rename to images/editablepasswordfield.png
diff --git a/images/fe_icons/editableradiofield.png b/images/editableradiofield.png
similarity index 100%
rename from images/fe_icons/editableradiofield.png
rename to images/editableradiofield.png
diff --git a/images/fe_icons/editabletextfield.png b/images/editabletextfield.png
similarity index 100%
rename from images/fe_icons/editabletextfield.png
rename to images/editabletextfield.png
diff --git a/templates/EditableFormField.ss b/templates/EditableFormField.ss
index 06194a6..168597a 100755
--- a/templates/EditableFormField.ss
+++ b/templates/EditableFormField.ss
@@ -6,7 +6,7 @@
 			<img class="handle" src="sapphire/images/drag.gif" alt="<% _t('DRAG', 'Drag to rearrange order of fields') %>" />
 		<% end_if %>
 		
-		<img class="icon" src="userforms/images/fe_icons/{$ClassName.LowerCase}.png" alt="$ClassName" title="$singular_name" />
+		<img class="icon" src="userforms/images/{$ClassName.LowerCase}.png" alt="$ClassName" title="$singular_name" />
 		
 		$TitleField