diff --git a/library/includes/functions.php b/library/includes/functions.php
index 4cf2f51d5..f73462a53 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1849,7 +1849,11 @@ function decode_text_match($txt)
  */
 function create_magnet(string $infohash, string $infohash_v2, string $auth_key, string $name): string
 {
-    global $bb_cfg, $images;
+    global $bb_cfg, $images, $lang;
+
+    if (!$bb_cfg['magnet_links_enabled']) {
+        return false;
+    }
 
     // Only for registered users
     if (IS_GUEST && $bb_cfg['bt_tor_browse_only_reg']) {
@@ -1869,7 +1873,7 @@ function create_magnet(string $infohash, string $infohash_v2, string $auth_key,
         $magnet .= 'xt=urn:btmh:1220' . bin2hex($infohash_v2);
     }
 
-    return '<a href="' . $magnet . '&tr=' . urlencode($bb_cfg['bt_announce_url'] . "?{$bb_cfg['passkey_key']}=$auth_key") . '&dn=' . urlencode($name) . '"><img src="' . $images['icon_magnet'] . '" width="12" height="12" border="0" /></a>';
+    return '<a title="' . $lang['MAGNET'] . '" href="' . $magnet . '&tr=' . urlencode($bb_cfg['bt_announce_url'] . "?{$bb_cfg['passkey_key']}=$auth_key") . '&dn=' . urlencode($name) . '"><img src="' . $images['icon_magnet'] . '" width="12" height="12" border="0" /></a>';
 }
 
 function set_die_append_msg($forum_id = null, $topic_id = null, $group_id = null)
diff --git a/library/language/source/main.php b/library/language/source/main.php
index 3a9e6e4fa..263e13c54 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1083,7 +1083,7 @@ $lang['RELEASING'] = 'Self';
 $lang['SEEDING'] = 'Seed';
 $lang['LEECHING'] = 'Leech';
 $lang['IS_REGISTERED'] = 'Registered';
-$lang['MAGNET'] = 'Magnet';
+$lang['MAGNET'] = 'Magnet-link';
 
 //torrent status mod
 $lang['TOR_STATUS'] = 'Status';
diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
index 1bd3b1e24..a6f3eb336 100644
--- a/styles/templates/default/tracker.tpl
+++ b/styles/templates/default/tracker.tpl
@@ -417,7 +417,7 @@ $(function(){
 	<!-- ENDIF -->
 	<td class="row4 small nowrap">
 		<u>{tor.TOR_SIZE_RAW}</u>
-		<!-- IF not tor.TOR_FROZEN --><a class="small tr-dl" title="{L_DOWNLOAD}" href="{DOWNLOAD_URL}{tor.ATTACH_ID}">{tor.TOR_SIZE}</a> <!-- IF MAGNET_LINKS --><span title="{L_MAGNET}">{tor.MAGNET}</span><!-- ENDIF --><!-- ELSE -->
+		<!-- IF not tor.TOR_FROZEN --><a class="small tr-dl" title="{L_DOWNLOAD}" href="{DOWNLOAD_URL}{tor.ATTACH_ID}">{tor.TOR_SIZE}</a> <!-- IF MAGNET_LINKS -->{tor.MAGNET}<!-- ENDIF --><!-- ELSE -->
 		{tor.TOR_SIZE}<!-- ENDIF -->
 	</td>
 	<td class="row4 seedmed" title="{tor.SEEDS_TITLE}"><b>{tor.SEEDS}</b></td>