diff --git a/docs/advanced-entity-analytics/analyze-risk-score-data.asciidoc b/docs/advanced-entity-analytics/analyze-risk-score-data.asciidoc
index 782cd94cd0..440ab5d164 100644
--- a/docs/advanced-entity-analytics/analyze-risk-score-data.asciidoc
+++ b/docs/advanced-entity-analytics/analyze-risk-score-data.asciidoc
@@ -18,7 +18,7 @@ TIP: We recommend that you prioritize <<alert-triaging, alert triaging>> to iden
 From the Entity Analytics dashboard, you can access entity key performance indicators (KPIs), risk scores, and levels. You can also click the number link in the **Alerts** column to investigate and analyze the alerts on the Alerts page.
 
 [role="screenshot"]
-image::images/ea-dashboard.png[Entity Analytics dashboard]
+image::dashboards/images/entity-dashboard.png[Entity Analytics dashboard] 
 
 [discrete]
 [[alert-triaging]]
diff --git a/docs/advanced-entity-analytics/images/ea-dashboard.png b/docs/advanced-entity-analytics/images/ea-dashboard.png
deleted file mode 100644
index 39181bd67d..0000000000
Binary files a/docs/advanced-entity-analytics/images/ea-dashboard.png and /dev/null differ
diff --git a/docs/advanced-entity-analytics/images/hosts-hr-data.png b/docs/advanced-entity-analytics/images/hosts-hr-data.png
index 5d08c5db4b..47965c68cf 100644
Binary files a/docs/advanced-entity-analytics/images/hosts-hr-data.png and b/docs/advanced-entity-analytics/images/hosts-hr-data.png differ
diff --git a/docs/dashboards/entity-dashboard.asciidoc b/docs/dashboards/entity-dashboard.asciidoc
index 3eedbebcaf..6afdcc6029 100644
--- a/docs/dashboards/entity-dashboard.asciidoc
+++ b/docs/dashboards/entity-dashboard.asciidoc
@@ -76,8 +76,6 @@ Interact with the table to filter data, view more details, and take action:
 
 For more information about user risk scores, click the *Learn more* link in the table, or refer to <<user-risk-score>>. 
 
-NOTE: The host risk and user risk score tables are not affected by the date and time range. 
-
 [[entity-anomalies]]
 [float]
 == Anomalies
diff --git a/docs/dashboards/images/entity-dashboard.png b/docs/dashboards/images/entity-dashboard.png
index 2eb8f3722b..e529976aac 100644
Binary files a/docs/dashboards/images/entity-dashboard.png and b/docs/dashboards/images/entity-dashboard.png differ
diff --git a/docs/dashboards/images/host-score-data.png b/docs/dashboards/images/host-score-data.png
index 387fffab52..1fb6446c5d 100644
Binary files a/docs/dashboards/images/host-score-data.png and b/docs/dashboards/images/host-score-data.png differ
diff --git a/docs/dashboards/images/user-score-data.png b/docs/dashboards/images/user-score-data.png
index b2e67dcddb..ec5edf06a0 100644
Binary files a/docs/dashboards/images/user-score-data.png and b/docs/dashboards/images/user-score-data.png differ
diff --git a/docs/experimental-features/host-risk-score.asciidoc b/docs/experimental-features/host-risk-score.asciidoc
index bcd8080630..dfd4a51f61 100644
--- a/docs/experimental-features/host-risk-score.asciidoc
+++ b/docs/experimental-features/host-risk-score.asciidoc
@@ -115,7 +115,7 @@ image::images/hrs-all-hosts.png[Host risk score on the Hosts page]
 The *Host risk* tab on the Hosts page:
 
 [role="screenshot"]
-image::images/hosts-by-risk-tab.png[Host risk score on the host details page]
+image::advanced-entity-analytics/images/hosts-hr-data.png[Host risk score on the Hosts page]
 
 The Overview section on the host details page:
 
diff --git a/docs/experimental-features/images/hosts-by-risk-tab.png b/docs/experimental-features/images/hosts-by-risk-tab.png
deleted file mode 100644
index 867031b585..0000000000
Binary files a/docs/experimental-features/images/hosts-by-risk-tab.png and /dev/null differ
diff --git a/docs/experimental-features/images/users-by-risk-details-page.png b/docs/experimental-features/images/users-by-risk-details-page.png
index 71439f6675..28c940deff 100644
Binary files a/docs/experimental-features/images/users-by-risk-details-page.png and b/docs/experimental-features/images/users-by-risk-details-page.png differ