diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl
index e6060e6aa219f28599f37e56adbb3099fa1bca45..a72211da90befb796295da6e8fcd92edb86c3767 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/AggregateFields.tpl
@@ -9,8 +9,8 @@
         {foreach from=$aggregateFields item=field key=alias}
             <tr>
                 <td>{$field}</td>
-                <td>
-                    <a href="{crmURL p="civicrm/dataprocessor/form/aggregate_field" q="reset=1&action=delete&id=`$data_processor_id`&alias=`$alias`"}">{ts}Remove{/ts}</a>
+                <td class="right nowrap" style="width: 100px;">
+                    <a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/aggregate_field" q="reset=1&action=delete&id=`$data_processor_id`&alias=`$alias`"}">{ts}Remove{/ts}</a>
                 </td>
             </tr>
         {/foreach}
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl
index 06723ce7796fd683ff54a8de5db1784ab796d01a..e606629e4b0d9eca6c20f26545f8e5fc57f7f23b 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Fields.tpl
@@ -10,10 +10,13 @@
         {foreach from=$fields item=field}
             <tr>
                 <td>{$field.title} <br /><span class="description">{$field.name}</span></td>
-                <td style="width: 20%">{if ($field.weight && !is_numeric($field.weight))}{$field.weight}{/if}</td>
-                <td style="width: 20%">
-                    <a href="{crmURL p="civicrm/dataprocessor/form/field" q="reset=1&action=update&data_processor_id=`$field.data_processor_id`&id=`$field.id`"}">{ts}Edit{/ts}</a>
-                    <a href="{crmURL p="civicrm/dataprocessor/form/field" q="reset=1&action=delete&data_processor_id=`$field.data_processor_id`&id=`$field.id`"}">{ts}Remove{/ts}</a>
+                <td style="width: 60px">{if ($field.weight && !is_numeric($field.weight))}{$field.weight}{/if}</td>
+                <td class="right nowrap" style="width: 100px;">
+                        <span class="btn-slide crm-hover-button">{ts}Configure{/ts}
+                        <ul class="panel">
+                            <li><a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/field" q="reset=1&action=update&data_processor_id=`$field.data_processor_id`&id=`$field.id`"}">{ts}Edit{/ts}</a></li>
+                            <li><a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/field" q="reset=1&action=delete&data_processor_id=`$field.data_processor_id`&id=`$field.id`"}">{ts}Remove{/ts}</a></li>
+                        </ul>
                 </td>
             </tr>
         {/foreach}
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl
index 93188c8ee82b28cbba79431b93dfcea301909d04..7f0149afe37d040168f9f62904f854fc2fb7b8db 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Filters.tpl
@@ -20,8 +20,8 @@
                     <td>
                         {if ($filter.is_exposed)}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}
                     </td>
-                    <td style="width: 20%">{if ($filter.weight && !is_numeric($filter.weight))}{$filter.weight}{/if}</td>
-                    <td class="right nowrap">
+                    <td style="width: 60px">{if ($filter.weight && !is_numeric($filter.weight))}{$filter.weight}{/if}</td>
+                    <td class="right nowrap" style="width: 100px;">
                         <span class="btn-slide crm-hover-button">{ts}Configure{/ts}
                         <ul class="panel">
                             <li><a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/filter" q="reset=1&action=update&data_processor_id=`$filter.data_processor_id`&id=`$filter.id`"}">{ts}Type &amp; configuration{/ts}</a></li>
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl
index 216b7d9a9f858adb10edb6a09be5c11c8de2c5c6..7d3b259df5e5dd901d47df2d5e6ba35de681dadc 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Outputs.tpl
@@ -10,15 +10,17 @@
         {foreach from=$outputs item=output}
             <tr>
                 <td>{$output.type_name}</td>
-                <td style="width:20%"></td>
-                <td style="width:20%">
-                    <a href="{crmURL p="civicrm/dataprocessor/form/output" q="reset=1&action=update&data_processor_id=`$output.data_processor_id`&id=`$output.id`"}">{ts}Edit{/ts}</a>
-                    <a href="{crmURL p="civicrm/dataprocessor/form/output" q="reset=1&action=delete&data_processor_id=`$output.data_processor_id`&id=`$output.id`"}">{ts}Remove{/ts}</a>
-                    <br/>
-
-                    {if isset($output.navigation_url) }
-                        <a href="{$output.navigation_url}">{ts}Execute{/ts}</a>
-                    {/if}
+                <td style="width:60px;"></td>
+                <td class="right nowrap" style="width: 100px;">
+                        <span class="btn-slide crm-hover-button">{ts}Configure{/ts}
+                        <ul class="panel">
+                            <li><a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/output" q="reset=1&action=update&data_processor_id=`$output.data_processor_id`&id=`$output.id`"}">{ts}Edit{/ts}</a></li>
+                            <li><a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/output" q="reset=1&action=delete&data_processor_id=`$output.data_processor_id`&id=`$output.id`"}">{ts}Remove{/ts}</a></li>
+                            {if isset($output.navigation_url) }
+                                <li><a class="crm-hover-button" href="{$output.navigation_url}">{ts}Execute{/ts}</a></li>
+                            {/if}
+                        </ul>
+                        </span>
                 </td>
             </tr>
         {/foreach}
diff --git a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl
index 4e5c262a1f5a2c4222f622de49c685949d075287..236f89da6e94659722a0d29881f08e2e6d76da40 100644
--- a/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl
+++ b/templates/CRM/Dataprocessor/Form/DataProcessorBlocks/Sources.tpl
@@ -12,10 +12,14 @@
                 <td>{$source.title} <br />
                     <span class="description">{$source.type_name}</span>
                 </td>
-                <td style="width: 20%">{if ($source.weight && !is_numeric($source.weight))}{$source.weight}{/if}</td>
-                <td style="width: 20%">
-                    <a href="{crmURL p="civicrm/dataprocessor/form/source" q="reset=1&action=update&data_processor_id=`$source.data_processor_id`&id=`$source.id`"}">{ts}Edit{/ts}</a>
-                    <a href="{crmURL p="civicrm/dataprocessor/form/source" q="reset=1&action=delete&data_processor_id=`$source.data_processor_id`&id=`$source.id`"}">{ts}Remove{/ts}</a>
+                <td style="width: 60px;">{if ($source.weight && !is_numeric($source.weight))}{$source.weight}{/if}</td>
+                <td class="right nowrap" style="width: 100px;">
+                        <span class="btn-slide crm-hover-button">{ts}Configure{/ts}
+                        <ul class="panel">
+                            <li><a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/source" q="reset=1&action=update&data_processor_id=`$source.data_processor_id`&id=`$source.id`"}">{ts}Edit{/ts}</a></li>
+                            <li><a class="crm-hover-button" href="{crmURL p="civicrm/dataprocessor/form/source" q="reset=1&action=delete&data_processor_id=`$source.data_processor_id`&id=`$source.id`"}">{ts}Remove{/ts}</a></li>
+                        </ul>
+                        </span>
                 </td>
             </tr>
         {/foreach}