diff --git a/admin/pages/accounts.php b/admin/pages/accounts.php
index 759b9361..550ea670 100644
--- a/admin/pages/accounts.php
+++ b/admin/pages/accounts.php
@@ -10,7 +10,7 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Account editor';
-$admin_base = BASE_URL . 'admin/?p=accounts';
+$admin_base = ADMIN_URL . '?p=accounts';
 $use_datatable = true;
 
 if ($config['account_country'])
diff --git a/admin/pages/phpinfo.php b/admin/pages/phpinfo.php
index bc747a2d..43942bfd 100644
--- a/admin/pages/phpinfo.php
+++ b/admin/pages/phpinfo.php
@@ -16,4 +16,4 @@ if (!function_exists('phpinfo')) { ?>
 	<?php return;
 }
 ?>
-<iframe src="<?php echo BASE_URL; ?>admin/tools/phpinfo.php" width="1024" height="550"></iframe>
+<iframe src="<?php echo ADMIN_URL; ?>tools/phpinfo.php" width="1024" height="550"></iframe>
diff --git a/admin/pages/players.php b/admin/pages/players.php
index d9a5dece..b32d5445 100644
--- a/admin/pages/players.php
+++ b/admin/pages/players.php
@@ -10,7 +10,7 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Player editor';
-$player_base = BASE_URL . 'admin/?p=players';
+$player_base = ADMIN_URL . '?p=players';
 
 $use_datatable = true;
 require_once LIBS . 'forum.php';
diff --git a/system/pages/news.php b/system/pages/news.php
index 92d2e7ab..db04092d 100644
--- a/system/pages/news.php
+++ b/system/pages/news.php
@@ -182,13 +182,13 @@ if(!$news_cached)
 			$admin_options = '';
 			if($canEdit)
 			{
-				$admin_options = '<br/><br/><a target="_blank" rel="noopener noreferrer" href="/admin/?p=news&action=edit&id=' . $news['id'] . '" title="Edit">
+				$admin_options = '<br/><br/><a target="_blank" rel="noopener noreferrer" href="' . ADMIN_URL . '?p=news&action=edit&id=' . $news['id'] . '" title="Edit">
 					<img src="images/edit.png"/>Edit
 				</a>
-				<a id="delete" target="_blank" rel="noopener noreferrer" href="/admin/?p=news&action=delete&id=' . $news['id'] . '" onclick="return confirm(\'Are you sure?\');" title="Delete">
+				<a id="delete" target="_blank" rel="noopener noreferrer" href="' . ADMIN_URL . '?p=news&action=delete&id=' . $news['id'] . '" onclick="return confirm(\'Are you sure?\');" title="Delete">
 					<img src="images/del.png"/>Delete
 				</a>
-				<a target="_blank" rel="noopener noreferrer" href="/admin/?p=news&action=hide&id=' . $news['id'] . '" title="' . ($news['hidden'] != 1 ? 'Hide' : 'Show') . '">
+				<a target="_blank" rel="noopener noreferrer" href="' . ADMIN_URL . '?p=news&action=hide&id=' . $news['id'] . '" title="' . ($news['hidden'] != 1 ? 'Hide' : 'Show') . '">
 					<img src="images/' . ($news['hidden'] != 1 ? 'success' : 'error') . '.png"/>
 					' . ($news['hidden'] != 1 ? 'Hide' : 'Show') . '
 				</a>';
diff --git a/system/templates/admin.pages.links.html.twig b/system/templates/admin.pages.links.html.twig
index 135055c0..d8529e3e 100644
--- a/system/templates/admin.pages.links.html.twig
+++ b/system/templates/admin.pages.links.html.twig
@@ -1,14 +1,14 @@
 <div style="text-align: right;">
-	<a href="admin/?p=pages&action=edit&id={{ page.id }}" title="Edit in Admin Panel" target="_blank">
+	<a href="?p=pages&action=edit&id={{ page.id }}" title="Edit in Admin Panel" target="_blank">
 		<img src="images/edit.png"/>Edit
 	</a>
-	<a id="delete" href="admin/?p=pages&action=delete&id={{ page.id }}" onclick="return confirm('Are you sure?');"
+	<a id="delete" href="?p=pages&action=delete&id={{ page.id }}" onclick="return confirm('Are you sure?');"
 	   title="Delete in Admin Panel" target="_blank">
 		<img src="images/del.png"/>Delete
 	</a>
-	<a href="admin/?p=pages&action=hide&id={{ page.id }}"
+	<a href="?p=pages&action=hide&id={{ page.id }}"
 	   title="{% if page.hidden != 1 %}Hide{% else %}Show{% endif %} in Admin Panel" target="_blank">
 		<img src="images/{% if page.hidden != 1 %}success{% else %}error{% endif %}.png"/>{% if page.hidden != 1 %}Hide{% else %}Show{% endif %}
 	</a>
 	<br/>
-</div>
\ No newline at end of file
+</div>
diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig
index aad31aa8..6eed98ec 100644
--- a/system/templates/characters.html.twig
+++ b/system/templates/characters.html.twig
@@ -11,7 +11,7 @@
 	<td>
         {{ hook(constant('HOOK_CHARACTERS_BEFORE_INFORMATIONS')) }}
 		{% if canEdit %}
-			<a href="admin/?p=players&id={{ player.getId() }}" title="Edit in Admin Panel" target="_blank">
+			<a href="{{ constant('ADMIN_URL') }}?p=players&id={{ player.getId() }}" title="Edit in Admin Panel" target="_blank">
 				<img src="images/edit.png"/>Edit
 			</a>
 		{% endif %}
@@ -418,7 +418,7 @@
 		{% endif %}
 		{{ hook(constant('HOOK_CHARACTERS_AFTER_CHARACTERS')) }}
 		{% if canEdit %}
-			<a href="admin/?p=players&id={{ player.getId() }}" title="Edit in Admin Panel" target="_blank">
+			<a href="{{ constant('ADMIN_URL') }}?p=players&id={{ player.getId() }}" title="Edit in Admin Panel" target="_blank">
 				<img src="images/edit.png"/>Edit
 			</a>
 		{% endif %}
diff --git a/system/templates/tinymce.html.twig b/system/templates/tinymce.html.twig
index adc1e3c9..02ad29bb 100644
--- a/system/templates/tinymce.html.twig
+++ b/system/templates/tinymce.html.twig
@@ -11,7 +11,7 @@
 			toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | emoticons link | alignleft aligncenter alignright alignjustify  | numlist bullist outdent indent  | removeformat code',
 			resize: 'both',
 			image_advtab: true,
-			images_upload_url: '{{ constant('BASE_URL') }}admin/tools/upload_image.php',
+			images_upload_url: '{{ constant('ADMIN_URL') }}tools/upload_image.php',
 			images_upload_credentials: true,
 
 			relative_urls: true,
diff --git a/templates/tibiacom/news.featured_article.html.twig b/templates/tibiacom/news.featured_article.html.twig
index ad82dcaf..fa704814 100644
--- a/templates/tibiacom/news.featured_article.html.twig
+++ b/templates/tibiacom/news.featured_article.html.twig
@@ -20,13 +20,13 @@
 						<b>
 							<p>{{ article.title|raw }}
 								{% if canEdit %}
-									<a href="/admin/?p=news&action=edit&id={{ article.id }}" title="Edit">
+									<a href="{{ constant('ADMIN_URL') }}?p=news&action=edit&id={{ article.id }}" title="Edit">
 										<img src="images/edit.png"/>Edit
 									</a>
-									<a id="delete" href="/admin/?p=news&action=delete&id={{ article.id }}" onclick="return confirm('Are you sure?');" title="Delete">
+									<a id="delete" href="{{ constant('ADMIN_URL') }}?p=news&action=delete&id={{ article.id }}" onclick="return confirm('Are you sure?');" title="Delete">
 										<img src="images/del.png"/>Delete
 									</a>
-									<a href="/admin/?p=news&action=hide&id={{ article.id }}" title="{% if article.hidden != 1 %}Hide{% else %}Show{% endif %}">
+									<a href="{{ constant('ADMIN_URL') }}?p=news&action=hide&id={{ article.id }}" title="{% if article.hidden != 1 %}Hide{% else %}Show{% endif %}">
 										<img src="images/{% if article.hidden != 1 %}success{% else %}error{% endif %}.png"/>
 										{% if article.hidden != 1 %}Hide{% else %}Show{% endif %}
 									</a>
@@ -42,4 +42,4 @@
 	<div class="Border_1" style="background-image:url({{ template_path }}/images/content/border-1.gif);"></div>
 	<div class="CornerWrapper-b"><div class="Corner-bl" style="background-image:url({{ template_path }}/images/content/corner-bl.gif);"></div></div>
 	<div class="CornerWrapper-b"><div class="Corner-br" style="background-image:url({{ template_path }}/images/content/corner-br.gif);"></div></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/tibiacom/news.tickers.html.twig b/templates/tibiacom/news.tickers.html.twig
index c0cf1cdf..48e62a49 100644
--- a/templates/tibiacom/news.tickers.html.twig
+++ b/templates/tibiacom/news.tickers.html.twig
@@ -20,15 +20,15 @@
 						<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="admin/?p=news&action=edit&id={{ ticker.id }}" title="Edit">
+							<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="admin/?p=news&action=delete&id={{ ticker.id }}" onclick="return confirm('Are you sure?');" title="Delete">
+							<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="admin/?p=news&action=hide&id={{ ticker.id }}" title="{% if ticker.hidden != 1 %}Hide{% else %}Show{% endif %}">
+							<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>