diff --git a/library/includes/functions.php b/library/includes/functions.php
index 4063aba03..2d6f242e3 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -2023,11 +2023,6 @@ function get_topic_icon ($topic, $is_unread = null)
 			$folder = $images['folder_locked'];
 			$folder_new = $images['folder_locked_new'];
 		}
-		else if ($topic['tracker_status'])
-		{
-			$folder = ($t_hot) ? $images['folder_dl_hot'] : $images['folder_dl'];
-			$folder_new = ($t_hot) ? $images['folder_dl_hot_new'] : $images['folder_dl_new'];
-		}
 
 		$folder_image = ($is_unread) ? $folder_new : $folder;
 	}
diff --git a/library/includes/torrent_show_dl_list.php b/library/includes/torrent_show_dl_list.php
index fff321de8..875d452a7 100644
--- a/library/includes/torrent_show_dl_list.php
+++ b/library/includes/torrent_show_dl_list.php
@@ -14,13 +14,13 @@ $template->assign_vars(array('DL_BUTTONS' => false));
 
 $count_mode = ($bb_cfg['bt_dl_list_only_count'] && !(@$_GET['dl'] === 'names'));
 
-$dl_topic = ($t_data['tracker_status'] && !($bb_cfg['bt_dl_list_only_1st_page'] && $start));
+$dl_topic = !($bb_cfg['bt_dl_list_only_1st_page'] && $start);
 $show_dl_list = ($dl_topic && ($bb_cfg['bt_show_dl_list'] || ($bb_cfg['allow_dl_list_names_mode'] && @$_GET['dl'] === 'names')));
 $show_dl_buttons = ($dl_topic && $bb_cfg['bt_show_dl_list_buttons']);
 
 // link to clear DL-List
 $template->assign_vars(array('S_DL_DELETE' => false));
-if ($is_auth['auth_mod'] && $t_data['tracker_status'])
+if ($is_auth['auth_mod'])
 {
 	$s_dl_delete = "<a href=\"dl_list.php?mode=dl_delete&amp;". POST_TOPIC_URL ."=$topic_id&amp;sid=". $userdata['session_id'] .'">'. $lang['DL_LIST_DEL'] .'</a>';
 	$template->assign_vars(array('S_DL_DELETE' => $s_dl_delete));
diff --git a/viewforum.php b/viewforum.php
index 1f74fef64..52b1cc326 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -485,7 +485,7 @@ foreach ($topic_rowset as $topic)
 		'ATTACH'           => $topic['attach_ext_id'],
 		'STATUS'           => $topic['topic_status'],
 		'TYPE'             => $topic['topic_type'],
-		'DL'               => ($topic['tracker_status'] && !$forum_data['allow_reg_tracker']),
+		'DL'               => !$forum_data['allow_reg_tracker'],
 		'POLL'             => $topic['topic_vote'],
 		'DL_CLASS'         => isset($topic['dl_status']) ? $dl_link_css[$topic['dl_status']] : '',
 
diff --git a/viewtopic.php b/viewtopic.php
index 54d50e466..c160811b4 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -527,12 +527,6 @@ $template->assign_vars(array(
 ));
 require(INC_DIR .'torrent_show_dl_list.php');
 
-if ($t_data['topic_attachment'])
-{
-	require(INC_DIR .'old_attachment.php');
-	init_display_post_attachments($t_data['topic_attachment']);
-}
-
 //
 // Update the topic view counter
 //
@@ -743,11 +737,6 @@ for($i = 0; $i < $total_posts; $i++)
 		'RG_SIG_ATTACH'      => $postrow[$i]['attach_rg_sig'],
 	));
 
-	if ($postrow[$i]['post_attachment'] && $is_auth['auth_download'] && function_exists('display_post_attachments'))
-	{
-		display_post_attachments($post_id, $postrow[$i]['post_attachment']);
-	}
-
 	if ($is_first_post && $t_data['attach_ext_id'])
 	{
 		if (IS_GUEST)