diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index bd0da08399..39aad96df5 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -485,7 +485,7 @@ local  en = {
       manufacturer_filter = "Manufacturer: %{manufacturer}",
       member_filter = "Member: %{member}",
       view = "View",
-      change_pool = "Change Pool",
+      change_pool = "Switch Pool",
       new_pool = "New Pool",
       change_member_pool = "Change Member Pool",
       select_new_pool = "Select a new pool from the dropdown below to assign member \"%{member}\" to:",
diff --git a/scripts/lua/admin/host_pools.lua b/scripts/lua/admin/host_pools.lua
index 9696c3aca3..a7c2c99c14 100644
--- a/scripts/lua/admin/host_pools.lua
+++ b/scripts/lua/admin/host_pools.lua
@@ -287,7 +287,14 @@ local no_pools = (#available_pools <= 1)
 local ifstats = interface.getStats()
 local is_bridge_iface = (ifstats["bridge.device_a"] ~= nil) and (ifstats["bridge.device_b"] ~= nil)
 if is_bridge_iface and selected_pool.id ~= host_pools_utils.DEFAULT_POOL_ID then
-  print("<a href='/lua/if_stats.lua?ifid=") print(ifId.."") print("&page=filtering&pool="..(selected_pool.id).."#protocols' title='Manage Traffic Policies'><i class='fa fa-cog' aria-hidden='true'></i></a>")
+  print("<a href='"..ntop.getHttpPrefix().."/lua/if_stats.lua?ifid=") print(ifId.."") print("&page=filtering&pool="..(selected_pool.id).."#protocols' title='Manage Traffic Policies'><i class='fa fa-cog' aria-hidden='true'></i></a>")
+end
+
+if selected_pool.id ~= host_pools_utils.DEFAULT_POOL_ID then
+    local poolstats_rrd = host_pools_utils.getRRDBase(ifstats.id, selected_pool.id)
+    if ntop.getCache("ntopng.prefs.host_pools_rrd_creation") == "1" and ntop.exists(poolstats_rrd) then
+      print("&nbsp; <a href='"..ntop.getHttpPrefix().."/lua/pool_details.lua?pool="..selected_pool.id.."&page=historical' title='Chart'><i class='fa fa-area-chart'></i></a>")
+    end
 end
 
 print('</td>\n')
diff --git a/scripts/lua/get_grouped_hosts_data.lua b/scripts/lua/get_grouped_hosts_data.lua
index cbfac11b91..337bb18ed5 100644
--- a/scripts/lua/get_grouped_hosts_data.lua
+++ b/scripts/lua/get_grouped_hosts_data.lua
@@ -157,7 +157,7 @@ function print_single_group(value)
       print(pool_name..'</A> " , ')
       print('"column_chart": "')
 
-      if ntop.exists(poolstats_rrd) or isBridgeInterface(ifstats) --[[ Need to show the icon to go into the quotas page ]] then
+      if (ntop.getCache("ntopng.prefs.host_pools_rrd_creation") == "1" and ntop.exists(poolstats_rrd)) then
          print('<A HREF='..ntop.getHttpPrefix()..'/lua/pool_details.lua?pool='..value["id"]..'&page=historical><i class=\'fa fa-area-chart fa-lg\'></i></A>')
       else
          print('')
diff --git a/scripts/lua/if_stats.lua b/scripts/lua/if_stats.lua
index 8ff679d1fd..0783e2b523 100644
--- a/scripts/lua/if_stats.lua
+++ b/scripts/lua/if_stats.lua
@@ -1521,6 +1521,11 @@ print('</select>')
 
 if selected_pool.id ~= host_pools_utils.DEFAULT_POOL_ID then
   print(' <A HREF="'..  ntop.getHttpPrefix()..'/lua/if_stats.lua?ifid='..ifid..'&page=pools&pool=') print(selected_pool.id) print('#manage" title="Edit Host Pool"><i class="fa fa-cog" aria-hidden="true"></i></A>')
+
+  local poolstats_rrd = host_pools_utils.getRRDBase(ifstats.id, selected_pool.id)
+  if ntop.getCache("ntopng.prefs.host_pools_rrd_creation") == "1" and ntop.exists(poolstats_rrd) then
+    print("&nbsp; <a href='"..ntop.getHttpPrefix().."/lua/pool_details.lua?pool="..selected_pool.id.."&page=historical' title='Chart'><i class='fa fa-area-chart'></i></a>")
+  end
 end
 
 print[[<form id="l7ProtosForm" onsubmit="return checkShapedProtosFormCallback();" method="post">