diff --git a/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps.jsp b/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps.jsp
index 7708cf070362..2183452f3e24 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps.jsp
@@ -22,10 +22,10 @@
 <script type="text/javascript">
 
 
-
+ 	//Steps Drag handler
 	dragula([document.querySelectorAll('.wfStepInDrag'), document.getElementById('wfStepInDragContainer')], {
 		  moves: function (el, source, handle, sibling) {
-
+		
 			  return handle.classList.contains('handle'); 
 		  },
 		  accepts: function (el, target, source, sibling) {
@@ -58,30 +58,32 @@
 			colorMeNot();
 			stepAdmin.reorderStep(stepID, index);
 		 });
-	
-	
-		var arr = new Array(<%=steps.size()%>);
-		<%for(WorkflowStep step : steps){ %>
-			arr.push(document.getElementById("jsNode<%=step.getId()%>"));
-		<%}%>
-		
-		
-	  dragula(arr, {
-		  moves: function (el, source, handle, sibling) {
 
+
+	   //Actions Drag handler
+	  var primaryContainers = document.querySelectorAll('.wf-pimary-action-wrapper');
+	  var secondaryContainers = document.querySelectorAll('.wf-secondary-action-wrapper');
+	  var containers = [...primaryContainers, ...secondaryContainers];
+
+	  dragula(containers, {
+		  moves: function (el, source, handle, sibling) {
 			  return el.classList.contains('wf-action-wrapper'); 
 		  },
 		  accepts: function (el, target, source, sibling) {
-
-		    return true;
+			  return target.classList.contains('wf-pimary-action-wrapper') || 
+					 target.classList.contains('wf-secondary-action-wrapper');
 		  },
 		  revertOnSpill: true,    
 		  copy: true,                       // elements are moved by default, not copied
 		  copySortSource: true,             // elements in copy-source containers can be reordered
 		  
-		}).on('drop', function (ele) {
+		}).on('drop', function (ele, target, source) {
 			colorMeNot();
+			const isSecondary = target.classList.contains('wf-secondary-action-wrapper');
+			
 			actionAdmin.copyOrReorderAction(ele);
+			actionAdmin.saveActionPriority(ele, isSecondary);
+			
 		 });
 
 
@@ -113,6 +115,7 @@
 
     dojo.ready(function(){
         var schemeId = '<%=scheme.getId()%>';
+		
         var whoCanUseFilteringSelect = new dijit.form.FilteringSelect({
                 id: "whoCanUseSelect",
                 name: "whoCanUseSelect",
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps_filtered.jsp b/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps_filtered.jsp
index 2221753cc08b..a004646acdd0 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps_filtered.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps_filtered.jsp
@@ -10,9 +10,13 @@
 <%@page import="com.dotmarketing.util.UtilMethods"%>
 <%@page import="com.liferay.portal.language.LanguageUtil"%>
 <%@ page import="com.liferay.portal.model.User" %>
-<%@ page import="java.util.List" %>
+
 <%@page import="com.dotmarketing.util.Config"%>
 
+<%@page import="java.util.ArrayList"%>
+<%@page import="java.util.List"%>
+<%@page import="com.dotmarketing.util.json.JSONObject"%>
+
 
 <%
     final User systemUser = APILocator.getUserAPI().getSystemUser();
@@ -73,8 +77,26 @@
         mainAdmin.refresh();
     }
 
+    
 </script>
 
+
+<%
+    // Split actions into primary and secondary
+    List<WorkflowAction> primaryActions = new ArrayList<>();
+    List<WorkflowAction> secondaryActions = new ArrayList<>();
+    
+    for(WorkflowAction action : actions) {
+        String isSecondary = action.getMetadata() != null ? String.valueOf(action.getMetadata().get("secondary")) : "false";
+        if("true".equals(isSecondary)) {
+            secondaryActions.add(action);
+        } else {
+            primaryActions.add(action);
+        }
+    }
+
+%>
+
 <div class="list-wrapper wfStepInDrag" id="stepID<%=step.getId()%>" data-first="<%=isFirst%>">
     <div class="list-item"  onmouseout="colorMeNot()">
         <div class="wfStepTitle">
@@ -86,21 +108,63 @@
             </div>
             <div class="clear"></div>
         </div>
-        <div class="wfActionList" id="jsNode<%=step.getId()  %>"  data-wfstep-id="<%=step.getId()%>">
-            <%for(WorkflowAction action : actions) {
-                String subtype = action.getMetadata() != null ? String.valueOf(action.getMetadata().get("subtype")) : "";
-                boolean isSeparator = "SEPARATOR".equals(subtype);
-            %>
-            <div class="wf-action-wrapper x<%=action.getId()%>" data-wfaction-id="<%=action.getId()%>" onmouseover="colorMe('x<%=action.getId()%>')" onmouseout="colorMeNot('x<%=action.getId()%>')" >
-                <div class="handles"></div>
-                <div class="wf-action <%= isSeparator ? "showDefaultCursor" : "showPointer" %>"">
-                    <div class="pull-right showPointer" onclick="actionAdmin.deleteActionForStep(this, <%=stepIndex%>)"><span class="deleteIcon"></span></div>
-                    <div class="pull-left" <% if(!isSeparator) { %>onClick="actionAdmin.viewAction('<%=scheme.getId()%>', '<%=action.getId() %>');" <% } %>>
-                       <%=action.getName() %> <span style="color:#a6a6a6">&#8227; <%=(WorkflowAction.CURRENT_STEP.equals(action.getNextStep())) ?  WorkflowAction.CURRENT_STEP : wapi.findStep(action.getNextStep()).getName() %></span>
-                   </div>
-                </div>
+        <div class="wfActionList" id="jsNode<%=step.getId()%>" data-wfstep-id="<%=step.getId()%>">
+            <!-- primary actions -->
+            <div class="wf-action-wrapper-title">Primary</div>
+            <div class="wf-pimary-action-wrapper <%= primaryActions.size() == 0 ? "empty" : "" %>">
+                
+                <%for(WorkflowAction action : primaryActions) {  %>
+          
+                    <div class="wf-action-wrapper x<%=action.getId()%>" 
+                        data-wfaction-id="<%=action.getId()%>"
+                        data-wfaction='<%=new JSONObject(action)%>'
+                         onmouseover="colorMe('x<%=action.getId()%>')" 
+                         onmouseout="colorMeNot('x<%=action.getId()%>')" >
+                        <div class="handles"></div>
+                        <div class="wf-action showPointer">
+                            <div class="pull-right showPointer" onclick="actionAdmin.deleteActionForStep(this, <%=stepIndex%>)">
+                                <span class="deleteIcon"></span>
+                            </div>
+                            <div class="pull-left" onClick="actionAdmin.viewAction('<%=scheme.getId()%>', '<%=action.getId()%>');">
+                                <%=action.getName()%> 
+                                <span style="color:#a6a6a6">&#8227; 
+                                    <%=(WorkflowAction.CURRENT_STEP.equals(action.getNextStep())) ? 
+                                        WorkflowAction.CURRENT_STEP : 
+                                        wapi.findStep(action.getNextStep()).getName()%>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <%}%>
+            </div>
+            <!-- secondary actions -->
+            <div class="wf-action-wrapper-title">Secondary</div>
+            <div class="wf-secondary-action-wrapper <%= secondaryActions.size() == 0 ? "empty" : "" %>"">
+               
+                <%for(WorkflowAction action : secondaryActions) {  %>
+         
+                    <div class="wf-action-wrapper x<%=action.getId()%>" 
+                        data-wfaction='<%=new JSONObject(action)%>'
+                         onmouseover="colorMe('x<%=action.getId()%>')" 
+                         onmouseout="colorMeNot('x<%=action.getId()%>')" >
+                        <div class="handles"></div>
+                        <div class="wf-action showPointer">
+                            <div class="pull-right showPointer" onclick="actionAdmin.deleteActionForStep(this, <%=stepIndex%>)">
+                                <span class="deleteIcon"></span>
+                            </div>
+                            <div class="pull-left" onClick="actionAdmin.viewAction('<%=scheme.getId()%>', '<%=action.getId()%>');">
+                                <%=action.getName()%> 
+                                <span style="color:#a6a6a6">&#8227; 
+                                    <%=(WorkflowAction.CURRENT_STEP.equals(action.getNextStep())) ? 
+                                        WorkflowAction.CURRENT_STEP : 
+                                        wapi.findStep(action.getNextStep()).getName()%>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <%}%>
             </div>
-            <%} %>
+
         </div>
 
         <div class="btn-flat-wrapper">
@@ -111,17 +175,10 @@
             <%
                 }
             %>
-            <%
-                String newContentEditorEnabled = Config.getStringProperty("CONTENT_EDITOR2_ENABLED");
-                if (newContentEditorEnabled != null && newContentEditorEnabled.equalsIgnoreCase("true")) {
-            %>
-            <div class="btn-flat btn-primary showPointer" onclick="addSeparator('<%=scheme.getId()%>', '<%=step.getId()%>');">
-                <i class="fa fa-plus" aria-hidden="true"></i> Divider
-            </div>
-            <% } %>
             <div class="btn-flat btn-primary showPointer" onclick="actionAdmin.addOrAssociatedAction('<%=scheme.getId()%>', '<%=step.getId()%>', 'step-action-<%=step.getId()%>');">
                 <i class="fa fa-plus" aria-hidden="true"></i> Add
             </div>
+    
         </div>
     </div>
 </div>
@@ -145,3 +202,16 @@
 </div>
 
 
+<style>
+    .wf-action-wrapper-title {
+        font-weight: bold;
+        margin-bottom: 10px;
+        line-height: 42px;
+        text-align: center;
+        border-bottom: 1px solid #ccc;
+    }
+    .wf-secondary-action-wrapper.empty, .wf-pimary-action-wrapper.empty {
+        min-height: 42px;
+        background: var(--color-palette-primary-op-10);
+    }
+</style>
\ No newline at end of file
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/workflow_js.jsp b/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/workflow_js.jsp
index ab9a4a05ee01..4e085189282d 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/workflow_js.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/workflow_js.jsp
@@ -1140,6 +1140,48 @@ dojo.declare("dotcms.dijit.workflows.ActionAdmin", null, {
 	dojo.xhrPost(xhrArgs);
 
 	},
+
+	saveActionPriority : function(ele, isSecondary) {
+		const actionData = JSON.parse(ele.dataset.wfaction);
+
+		const updatedData = {
+			schemeId: actionData.schemeId,
+			actionName: actionData.name,
+			whoCanUse: actionData.showOn,
+			actionIcon: actionData.icon,
+			actionCommentable: actionData.commentable,
+			showOn: actionData.showOn,
+			actionNextStep: actionData.nextStep,
+			actionNextAssign: actionData.nextAssign,
+			actionCondition: actionData.condition,
+			actionAssignable: actionData.assignable,
+			actionRoleHierarchyForAssign: actionData.roleHierarchyForAssign,
+			metadata: isSecondary 
+				? {...actionData.metadata, secondary: true}
+				: (actionData.metadata ? Object.fromEntries(
+					Object.entries(actionData.metadata).filter(([key]) => key !== 'secondary')
+				) : {})
+		};
+
+
+		const xhrArgs = {   
+			url: "/api/v1/workflow/actions/" + actionData.id,
+			headers: {
+				"Content-Type": "application/json"
+			},
+			postData: dojo.toJson(updatedData),
+			handle: function (dataOrError, ioArgs) {
+				if (dojo.isString(dataOrError)) {
+					if (dataOrError.indexOf("FAILURE") === 0) {
+						showDotCMSSystemMessage(dataOrError, true);
+					}
+				}
+			}
+		};
+		
+		dojo.xhrPut(xhrArgs);
+	},
+
 	saveAction : function(schemeId) {
 
 		var myForm = dijit.byId("addEditAction");