diff --git a/include/constants.php b/include/constants.php
index 1389c04f..450e74cd 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.19');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-07-23');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-07-24');
 defined('IN_TRACKER') || define('IN_TRACKER', true);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/public/usercp.php b/public/usercp.php
index 1e02fc44..3537aebf 100644
--- a/public/usercp.php
+++ b/public/usercp.php
@@ -948,36 +948,37 @@ tr_small($lang_usercp['row_karma_points'], $CURUSER['seedbonus']." [<a href=\"my
 tr_small($lang_usercp['row_written_comments'], $commentcount." [<a href=\"userhistory.php?action=viewcomments&id=".$CURUSER['id']."\" title=\"".$lang_usercp['link_view_comments']."\">".$lang_usercp['text_view']."</a>]", 1);
 
 //start seed box
-$seedBox = '';
-$columnOperator = nexus_trans('label.seed_box_record.operator');
-$columnBandwidth = nexus_trans('label.seed_box_record.bandwidth');
-$columnIPBegin = nexus_trans('label.seed_box_record.ip_begin');
-$columnIPEnd = nexus_trans('label.seed_box_record.ip_end');
-$columnIP = nexus_trans('label.seed_box_record.ip');
-$columnIPHelp = nexus_trans('label.seed_box_record.ip_help');
-$columnComment = nexus_trans('label.comment');
-$columnStatus = nexus_trans('label.seed_box_record.status');
-$res = \App\Models\SeedBoxRecord::query()->where('uid', $CURUSER['id'])->where('type', \App\Models\SeedBoxRecord::TYPE_USER)->get();
-if ($res->count() > 0)
-{
-    $seedBox .= "<table border='1' cellspacing='0' cellpadding='5' id='seed-box-table'><tr><td class='colhead'>ID</td><td class='colhead'>{$columnOperator}</td><td class='colhead'>{$columnBandwidth}</td><td class='colhead'>{$columnIP}</td><td class='colhead'>{$columnComment}</td><td class='colhead'>{$columnStatus}</td><td class='colhead'></td></tr>";
-    foreach ($res as $seedBoxRecord)
+if (get_setting('seed_box.enabled') == 'yes') {
+    $seedBox = '';
+    $columnOperator = nexus_trans('label.seed_box_record.operator');
+    $columnBandwidth = nexus_trans('label.seed_box_record.bandwidth');
+    $columnIPBegin = nexus_trans('label.seed_box_record.ip_begin');
+    $columnIPEnd = nexus_trans('label.seed_box_record.ip_end');
+    $columnIP = nexus_trans('label.seed_box_record.ip');
+    $columnIPHelp = nexus_trans('label.seed_box_record.ip_help');
+    $columnComment = nexus_trans('label.comment');
+    $columnStatus = nexus_trans('label.seed_box_record.status');
+    $res = \App\Models\SeedBoxRecord::query()->where('uid', $CURUSER['id'])->where('type', \App\Models\SeedBoxRecord::TYPE_USER)->get();
+    if ($res->count() > 0)
     {
-        $seedBox .= "<tr>";
-        $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->id);
-        $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->operator);
-        $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->bandwidth ?: '');
-        $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->ip ?: sprintf('%s ~ %s', $seedBoxRecord->ip_begin, $seedBoxRecord->ip_end));
-        $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->comment);
-        $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->statusText);
-        $seedBox .= sprintf('<td><img style="cursor: pointer" class="staff_delete remove-seed-box-btn" src="pic/trans.gif" alt="D" title="%s" data-id="%s"></td>', $lang_functions['text_delete'], $seedBoxRecord->id);
-        $seedBox .= "</tr>";
+        $seedBox .= "<table border='1' cellspacing='0' cellpadding='5' id='seed-box-table'><tr><td class='colhead'>ID</td><td class='colhead'>{$columnOperator}</td><td class='colhead'>{$columnBandwidth}</td><td class='colhead'>{$columnIP}</td><td class='colhead'>{$columnComment}</td><td class='colhead'>{$columnStatus}</td><td class='colhead'></td></tr>";
+        foreach ($res as $seedBoxRecord)
+        {
+            $seedBox .= "<tr>";
+            $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->id);
+            $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->operator);
+            $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->bandwidth ?: '');
+            $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->ip ?: sprintf('%s ~ %s', $seedBoxRecord->ip_begin, $seedBoxRecord->ip_end));
+            $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->comment);
+            $seedBox .= sprintf('<td>%s</td>', $seedBoxRecord->statusText);
+            $seedBox .= sprintf('<td><img style="cursor: pointer" class="staff_delete remove-seed-box-btn" src="pic/trans.gif" alt="D" title="%s" data-id="%s"></td>', $lang_functions['text_delete'], $seedBoxRecord->id);
+            $seedBox .= "</tr>";
+        }
+        $seedBox .= '</table>';
     }
-    $seedBox .= '</table>';
-}
-$seedBox .= sprintf('<div><input type="button" id="add-seed-box-btn" value="%s"/></div>', $lang_usercp['add_seed_box_btn']);
-tr_small($lang_usercp['row_seed_box'], $seedBox, 1);
-$seedBoxCss = <<<CSS
+    $seedBox .= sprintf('<div><input type="button" id="add-seed-box-btn" value="%s"/></div>', $lang_usercp['add_seed_box_btn']);
+    tr_small($lang_usercp['row_seed_box'], $seedBox, 1);
+    $seedBoxCss = <<<CSS
 .form-box {
 padding: 15px;
 }
@@ -998,7 +999,7 @@ padding: 4px;
 }
 CSS;
 
-$seedBoxForm = <<<FORM
+    $seedBoxForm = <<<FORM
 <div class="form-box">
 <form id="seed-box-form">
     <div class="form-control-row">
@@ -1028,7 +1029,7 @@ $seedBoxForm = <<<FORM
 </form>
 </div>
 FORM;
-$seedBoxJs = <<<JS
+    $seedBoxJs = <<<JS
 jQuery('#add-seed-box-btn').on('click', function () {
     layer.open({
         type: 1,
@@ -1063,8 +1064,9 @@ jQuery('#seed-box-table').on('click', '.remove-seed-box-btn', function () {
     })
 });
 JS;
-\Nexus\Nexus::js($seedBoxJs, 'footer', false);
-\Nexus\Nexus::css($seedBoxCss, 'footer', false);
+    \Nexus\Nexus::js($seedBoxJs, 'footer', false);
+    \Nexus\Nexus::css($seedBoxCss, 'footer', false);
+}
 //end seed box
 
 if ($forumposts)
diff --git a/public/viewpeerlist.php b/public/viewpeerlist.php
index ba3127e4..6c599a24 100644
--- a/public/viewpeerlist.php
+++ b/public/viewpeerlist.php
@@ -15,8 +15,8 @@ $seedBoxRep = new \App\Repositories\SeedBoxRepository();
 function get_location_column($e, $isStrongPrivacy, $canView): string
 {
     global $enablelocation_tweak, $seedBoxRep, $lang_functions, $lang_viewpeerlist;
+    $address = $ips = [];
     if ($enablelocation_tweak == 'yes') {
-        $address = $ips = [];
         if (!empty($e['ipv4'])) {
             list($loc_pub, $loc_mod) = get_ip_location($e['ipv4']);
             $seedBoxIcon = $seedBoxRep->renderIcon($e['ipv4'], $e['userid']);
@@ -33,7 +33,13 @@ function get_location_column($e, $isStrongPrivacy, $canView): string
         $addressStr = implode('<br/>', $address);
         $location = "<div title='" . $title . "'>" . $addressStr . "</div>";
     } else {
-        $location = implode(', ', array_filter([$e['ipv4'], $e['ipv6']]));
+        if (!empty($e['ipv4'])) {
+            $ips[] = $e['ipv4'] . $seedBoxRep->renderIcon($e['ipv4'], $e['userid']);
+        }
+        if (!empty($e['ipv6'])) {
+            $ips[] = $e['ipv6'] . $seedBoxRep->renderIcon($e['ipv6'], $e['userid']);
+        }
+        $location = '<div>'.implode('<br/>', $ips).'</div>';
     }
 
     if ($isStrongPrivacy) {
@@ -48,6 +54,18 @@ function get_location_column($e, $isStrongPrivacy, $canView): string
     return "<td class=rowfollow align=left width=1%><div style='display: flex;white-space: nowrap;align-items: center'>" . $result . "</div></td>\n";
 }
 
+function get_username_seed_box_icon($e): string
+{
+    global $seedBoxRep;
+    foreach (array_filter([$e['ipv4'], $e['ipv6']]) as $ip) {
+        $icon = $seedBoxRep->renderIcon($ip, $e['userid']);
+        if (!empty($icon)) {
+            return $icon;
+        }
+    }
+    return '';
+}
+
 
 if(isset($CURUSER))
 {
@@ -85,24 +103,32 @@ function dltable($name, $arr, $torrent)
 		$highlight = $CURUSER["id"] == $e['userid'] ? " bgcolor=#BBAF9B" : "";
 		$s .= "<tr$highlight>\n";
         $secs = max(1, ($e["la"] - $e["st"]));
+        $columnLocation = $usernameSeedBoxIcon = '';
 		if ($privacy == "strong" || ($torrent['anonymous'] == 'yes' && $e['userid'] == $torrent['owner'])) {
 			if (get_user_class() >= $viewanonymous_class || $e['userid'] == $CURUSER['id']) {
-                $s .= "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i><br />(" . get_username($e['userid']) . ")";
                 if ($showLocationColumn) {
-                    $s .= get_location_column($e, true, true);
+                    $columnLocation = get_location_column($e, true, true);
+                } else {
+                    $usernameSeedBoxIcon = get_username_seed_box_icon($e);
                 }
+                $columnUsername = "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i>".$usernameSeedBoxIcon."<br />(" . get_username($e['userid']) . ")</td>\n";
             } else {
-                $s .= "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i></a></td>\n";
                 if ($showLocationColumn) {
-                    $s .= get_location_column($e, true, false);
+                    $columnLocation = get_location_column($e, true, false);
+                } else {
+                    $usernameSeedBoxIcon = get_username_seed_box_icon($e);
                 }
+                $columnUsername = "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i>".$usernameSeedBoxIcon."</td>\n";
             }
 		} else {
-            $s .= "<td class=rowfollow align=left width=1%>" . get_username($e['userid']);
             if ($showLocationColumn) {
-                $s .= get_location_column($e, false, false);
+                $columnLocation = get_location_column($e, false, false);
+            } else {
+                $usernameSeedBoxIcon = get_username_seed_box_icon($e);
             }
+            $columnUsername = "<td class=rowfollow align=left width=1%>" . get_username($e['userid']).$usernameSeedBoxIcon."</td>\n";
         }
+		$s .= $columnUsername . $columnLocation;
 
 		$s .= "<td class=rowfollow align=center width=1%><nobr>" . ($e['connectable'] == "yes" ? $lang_viewpeerlist['text_yes'] : "<font color=red>".$lang_viewpeerlist['text_no']."</font>") . "</nobr></td>\n";
 		$s .= "<td class=rowfollow align=center width=1%><nobr>" . mksize($e["uploaded"]) . "</nobr></td>\n";