diff --git a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
index 6a1ed0076..b4e2bbf64 100644
--- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
@@ -21,7 +21,7 @@
   <password type="toolButton" class="ss_sprite button_toolbar ss_textfield_key" onclick="fieldsAdd('password')" buttonType="class">
     <en>Password</en>
   </password>
-  <suggest type="toolButton" class="ss_sprite button_toolbar ss_textfield_rename" onclick="fieldsAdd('suggest')" buttonType="class">
+  <suggest type="toolButton" class="ss_sprite button_toolbar ss_lightbulb" onclick="fieldsAdd('suggest')" buttonType="class">
     <en>Suggest</en>
   </suggest>
   <textarea type="toolButton" class="ss_sprite button_toolbar ss_textarea" onclick="fieldsAdd('textarea')" buttonType="class">
@@ -70,7 +70,7 @@
   </radiogroup>
   <!--.-->
   <separator7 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
-  <date type="toolButton" class="ss_sprite button_toolbar ss_calendar" onclick="fieldsAdd('date')" buttonType="class">
+  <date type="toolButton" class="ss_sprite button_toolbar ss_date" onclick="fieldsAdd('date')" buttonType="class">
     <en>Date</en>
   </date>
   <hidden type="toolButton" class="ss_sprite button_toolbar ss_hidden" onclick="fieldsAdd('hidden')" buttonType="class">
diff --git a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
index e6d251710..e413b8782 100644
--- a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
@@ -39,7 +39,7 @@
   </checkbox>-->
   <!--.-->
   <separator7 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
-  <date type="toolButton" class="ss_sprite button_toolbar ss_calendar" onclick="fieldsAdd('date')" buttonType="class">
+  <date type="toolButton" class="ss_sprite button_toolbar ss_date" onclick="fieldsAdd('date')" buttonType="class">
     <en>Date</en>
   </date>
   <hidden type="toolButton" class="ss_sprite button_toolbar ss_hidden" onclick="fieldsAdd('hidden')" buttonType="class">
diff --git a/workflow/public_html/images/icons_silk/sprites.png b/workflow/public_html/images/icons_silk/sprites.png
index 037f4fb13..574a2442f 100644
Binary files a/workflow/public_html/images/icons_silk/sprites.png and b/workflow/public_html/images/icons_silk/sprites.png differ