diff --git a/system/templates/admin.links.html.twig b/system/templates/admin.links.html.twig
index 986133c3..f1bc39be 100644
--- a/system/templates/admin.links.html.twig
+++ b/system/templates/admin.links.html.twig
@@ -1,5 +1,3 @@
-<br/><br/>
-
 <form action="{{ constant('ADMIN_URL') }}?p={{ page }}" method="post" style="float: left">
 	{{ csrf() }}
 	<input type="hidden" name="action" value="edit" />
diff --git a/system/templates/changelog.html.twig b/system/templates/changelog.html.twig
index d63a6a2a..4e2d584f 100644
--- a/system/templates/changelog.html.twig
+++ b/system/templates/changelog.html.twig
@@ -25,15 +25,7 @@
 			<td>{{ log.body|nl2br}}</td>
 			{% if canEdit  %}
 				<td>
-					<a href="{{ constant('ADMIN_URL') }}?p=changelog&action=edit&id={{ log.id }}" title="Edit in Admin Panel" target="_blank">
-						<img src="images/edit.png"/>Edit
-					</a>
-					<a href="{{ constant('ADMIN_URL') }}?p=changelog&action=delete&id={{ log.id }}" onclick="return confirm('Are you sure?');" title="Delete in Admin Panel" target="_blank">
-						<img src="images/del.png"/>Delete
-					</a>
-					<a href="{{ constant('ADMIN_URL') }}?p=changelog&action=hide&id={{ log.id }}"  title="{% if log.hidden != 1 %}Hide{% else %}Show{% endif %} in Admin Panel" target="_blank">
-						<img src="images/{{ (log.hidden != 1 ? 'success' : 'error') }}.png"/>{{ (log.hidden != 1) ? 'Hide' : 'Show' }}
-					</a>
+					{{ include('admin.links.html.twig', {page: 'changelog', id: log.id, hidden: log.hidden }) }}
 				</td>
 			{% endif %}
 		</tr>
diff --git a/templates/tibiacom/news.tickers.html.twig b/templates/tibiacom/news.tickers.html.twig
index 48e62a49..92b5e562 100644
--- a/templates/tibiacom/news.tickers.html.twig
+++ b/templates/tibiacom/news.tickers.html.twig
@@ -20,18 +20,9 @@
 						<div id="TickerEntry-{{ i }}-ShortText" class="NewsTickerShortText">{{ ticker.body_short|raw }}</div>
 						<div id="TickerEntry-{{ i }}-FullText" class="NewsTickerFullText">{{ ticker.body|raw }}
 							{% if canEdit %}
-							<a href="{{ constant('ADMIN_URL') }}?p=news&action=edit&id={{ ticker.id }}" title="Edit">
-								<img src="images/edit.png"/>
-								Edit
-							</a>
-							<a id="delete" href="{{ constant('ADMIN_URL') }}?p=news&action=delete&id={{ ticker.id }}" onclick="return confirm('Are you sure?');" title="Delete">
-								<img src="images/del.png"/>
-								Delete
-							</a>
-							<a href="{{ constant('ADMIN_URL') }}?p=news&action=hide&id={{ ticker.id }}" title="{% if ticker.hidden != 1 %}Hide{% else %}Show{% endif %}">
-								<img src="images/{% if ticker.hidden != 1 %}success{% else %}error{% endif %}.png"/>
-								{% if ticker.hidden != 1 %}Hide{% else %}Show{% endif %}
-							</a>
+								<table>
+									{{ include('admin.links.html.twig', {page: 'news', id: ticker.id, hidden: ticker.hidden }) }}
+								</table>
 							{% endif %}
 						</div>
 					</div>