diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
index 17936a3..1f1bcd3 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
@@ -93,7 +93,15 @@
 		%= 			t td => (class => 'sme-border') => $allow
 		%= 			t td => (class => 'sme-border') => $cmmnt
 					<td class='sme-border'>
-						<a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"><%=l('REMOVE') %></button></a>
+						%my $remove_text = l('REMOVE');  # Localized text
+						%my $csrf_token = "TOKEN";  # CSRF token for security
+						%my $actionRemove = qq{
+						%	<button type='button' class='sme-remove-button' title='$remove_text' 
+						%		onclick="window.location.href='portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto'">
+						%		$remove_text
+						%	</button>
+						%};
+					<%= $c->render_to_string(inline => $actionRemove) %>
 					</td>
 			</tr>
          %       }
@@ -104,5 +112,4 @@
 	</table>
 	%= hidden_field 'trt' => $pf_datas->{trt}
  
-</div>
-
+</div>
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep
index 2e5efe1..5fc1767 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep
@@ -57,7 +57,18 @@
             %= t td => (class => 'sme-border') => $printer->prop('Location')
             %= t td => (class => 'sme-border') => $address
             %= t td => (class => 'sme-border') => $remoteName
-	    <td class='sme-border'><a href="printers2?CsrfDef=TOKEN&trt=DEL&printer=<%= $printer->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"><%=l('REMOVE') %></button></a></td>
+			<td class='sme-border'>
+				%my $remove_text = l('REMOVE');  # Localized text
+				%my $csrf_token = "TOKEN";  # CSRF token for security
+				%my $printer_name = $printer->key;
+				%my $actionRemove = qq{
+				%	<button type='button' class='sme-remove-button' title='$remove_text' 
+				%		onclick="window.location.href='printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name'">
+				%		$remove_text
+				%	</button>
+				%};
+			<%= $c->render_to_string(inline => $actionRemove) %>
+			</td>
     	</tr>
     %    }
     	</tbody>
@@ -66,4 +77,4 @@
 	</p>
 
 
-</div>
+</div>
\ No newline at end of file