diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl
index dfab00113541ef815988638b0ca2452d75cb58f1..e6060e6aa219f28599f37e56adbb3099fa1bca45 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl
@@ -18,7 +18,7 @@
 
     <div class="crm-submit-buttons">
         <a class="add button" title="{ts}Add Aggregate Field{/ts}" href="{$addAggregateFieldUrl}">
-            <span><div class="icon add-icon ui-icon-circle-plus"></div>{ts}Add Aggregate Field{/ts}</span></a>
+            <i class='crm-i fa-plus-circle'></i> {ts}Add Aggregate Field{/ts}</a>
     </div>
 </div>
 {/crmScope}
\ No newline at end of file
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl
index 5cc3947dd84632a7298800dc674b16a958d8b676..06723ce7796fd683ff54a8de5db1784ab796d01a 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl
@@ -21,7 +21,7 @@
 
     <div class="crm-submit-buttons">
         <a class="add button" title="{ts}Add Field{/ts}" href="{$addFieldUrl}">
-            <span><div class="icon add-icon ui-icon-circle-plus"></div>{ts}Add Field{/ts}</span></a>
+            <i class='crm-i fa-plus-circle'></i> {ts}Add Field{/ts}</a>
     </div>
 </div>
 {/crmScope}
\ No newline at end of file
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl
index b818ab4a04ee497d31f7097adb17f28c22f1b3af..9d771a685a06a6bb42ef119b23fb7d1457854748 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl
@@ -27,7 +27,7 @@
 
         <div class="crm-submit-buttons">
             <a class="add button" title="{ts}Add Filter{/ts}" href="{$addFilterUrl}">
-                <span><div class="icon add-icon ui-icon-circle-plus"></div>{ts}Add Filter{/ts}</span></a>
+                <i class='crm-i fa-plus-circle'></i> {ts}Add Filter{/ts}</a>
         </div>
     </div>
 {/crmScope}
\ No newline at end of file
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl
index 34153305ef67b17b0c43828b4d70d3aac84d3315..b3f63976a61c48fabf6af607a81a788b5aca4975 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl
@@ -21,7 +21,7 @@
 
     <div class="crm-submit-buttons">
         <a class="add button" title="{ts}Add Output{/ts}" href="{$addOutputUrl}">
-            <span><div class="icon add-icon ui-icon-circle-plus"></div>{ts}Add Output{/ts}</span></a>
+            <i class='crm-i fa-plus-circle'></i> {ts}Add Output{/ts}</a>
     </div>
 </div>
 {/crmScope}
\ No newline at end of file
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl
index f21513a2de988b0e9e6679e89d6e9be2d1693c15..4e5c262a1f5a2c4222f622de49c685949d075287 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl
@@ -23,7 +23,7 @@
 
     <div class="crm-submit-buttons">
         <a class="add button" title="{ts}Add Data Source{/ts}" href="{$addDataSourceUrl}">
-            <span><div class="icon add-icon ui-icon-circle-plus"></div>{ts}Add Data Source{/ts}</span></a>
+            <i class='crm-i fa-plus-circle'></i> {ts}Add Data Source{/ts}</a>
     </div>
 </div>
 {/crmScope}
\ No newline at end of file