diff --git a/content/influxdb/v2.0/account-management/data-usage.md b/content/influxdb/v2.0/account-management/data-usage.md
index 87dd38ebf..399b36942 100644
--- a/content/influxdb/v2.0/account-management/data-usage.md
+++ b/content/influxdb/v2.0/account-management/data-usage.md
@@ -29,7 +29,7 @@ Find data usage information for the time frame specified in the drop-down at the
 - **Rate Limits over the specified time period:** A list of rate limit events over
   the specified time period.
 
-{{< img-hd src="/img/2-0-cloud-usage.png" />}}
+{{< img-hd src="/img/influxdb/2-0-cloud-usage.png" />}}
 
 ## Exceeded rate limits
 
diff --git a/content/influxdb/v2.0/example.md b/content/influxdb/v2.0/example.md
index 6e83f1909..2d2a02f4e 100644
--- a/content/influxdb/v2.0/example.md
+++ b/content/influxdb/v2.0/example.md
@@ -61,7 +61,7 @@ WHERE time > now() - 15m
 ### h3 This is a header3
 This is a paragraph. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc rutrum, metus id scelerisque euismod, erat ante suscipit nibh, ac congue enim risus id est. Etiam tristique nisi et tristique auctor. Morbi eu bibendum erat. Sed ullamcorper, dui id lobortis efficitur, mauris odio pharetra neque, vel tempor odio dolor blandit justo.
 
-![Test image](http://docs.influxdata.com/img/chronograf/v1.7/alerts-conditions.png)
+![Test image](http://docs.influxdata.com/img/chronograf/1-6-alerts-conditions.png)
 
 {{< img-hd src="/img/test-image-2.png" alt="Test Image" />}}
 
diff --git a/content/influxdb/v2.0/query-data/execute-queries.md b/content/influxdb/v2.0/query-data/execute-queries.md
index 7bc163189..99ed461dc 100644
--- a/content/influxdb/v2.0/query-data/execute-queries.md
+++ b/content/influxdb/v2.0/query-data/execute-queries.md
@@ -23,7 +23,7 @@ This guide covers the different options:
 ## Data Explorer
 Queries can be built, executed, and visualized in InfluxDB UI's Data Explorer.
 
-![Data Explorer with Flux](/img/data-explorer-beta-8.png)
+![Data Explorer with Flux](/img/influxdb/2-0-data-explorer.png)
 
 ## Influx REPL
 The [`influx repl` command](/v2.0/reference/cli/influx/repl) starts an interactive
diff --git a/content/influxdb/v2.0/query-data/flux/group-data.md b/content/influxdb/v2.0/query-data/flux/group-data.md
index 5904475e4..c154ea09c 100644
--- a/content/influxdb/v2.0/query-data/flux/group-data.md
+++ b/content/influxdb/v2.0/query-data/flux/group-data.md
@@ -164,7 +164,7 @@ Table: keys: [_start, _stop, _field, _measurement, cpu]
 
 **Note that the group key is output with each table: `Table: keys: <group-key>`.**
 
-![Group example data set](/img/grouping-data-set.png)
+![Group example data set](/img/flux/grouping-data-set.png)
 
 ### Group by CPU
 Group the `dataSet` stream by the `cpu` column.
@@ -253,7 +253,7 @@ Table: keys: [cpu]
 
 The visualization remains the same.
 
-![Group by CPU](/img/grouping-data-set.png)
+![Group by CPU](/img/flux/grouping-data-set.png)
 
 ### Group by time
 Grouping data by the `_time` column is a good illustration of how grouping changes the structure of your data.
@@ -378,7 +378,7 @@ Table: keys: [_time]
 Because each timestamp is structured as a separate table, when visualized, all
 points that share the same timestamp appear connected.
 
-![Group by time](/img/grouping-by-time.png)
+![Group by time](/img/flux/grouping-by-time.png)
 
 {{% note %}}
 With some further processing, you could calculate the average CPU usage across all CPUs per point
@@ -670,7 +670,7 @@ Table: keys: [_time, cpu]
 
 When visualized, tables appear as individual, unconnected points.
 
-![Group by CPU and time](/img/grouping-by-cpu-time.png)
+![Group by CPU and time](/img/flux/grouping-by-cpu-time.png)
 
 Grouping by `cpu` and `_time` is a good illustration of how grouping works.
 
diff --git a/content/influxdb/v2.0/query-data/flux/histograms.md b/content/influxdb/v2.0/query-data/flux/histograms.md
index 2682db59f..c9dcd8b0d 100644
--- a/content/influxdb/v2.0/query-data/flux/histograms.md
+++ b/content/influxdb/v2.0/query-data/flux/histograms.md
@@ -76,7 +76,7 @@ logarithmicBins(start: 1.0, factor: 2.0, count: 10, infinity: true)
 The [Histogram visualization type](/v2.0/visualize-data/visualization-types/histogram/)
 automatically converts query results into a binned and segmented histogram.
 
-{{< img-hd src="/img/2-0-visualizations-histogram-example.png" alt="Histogram visualization" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-histogram-example.png" alt="Histogram visualization" />}}
 
 Use the [Histogram visualization controls](/v2.0/visualize-data/visualization-types/histogram/#histogram-controls)
 to specify the number of bins and define groups in bins.
@@ -190,4 +190,4 @@ from(bucket: "example-bucket")
 In the Histogram visualization options, select `_time` as the **X Column**
 and `severity` as the **Group By** option:
 
-{{< img-hd src="/img/2-0-visualizations-histogram-errors.png" alt="Logs by severity histogram" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-histogram-errors.png" alt="Logs by severity histogram" />}}
diff --git a/content/influxdb/v2.0/query-data/flux/sql.md b/content/influxdb/v2.0/query-data/flux/sql.md
index 8e91357fb..a15c0c6d3 100644
--- a/content/influxdb/v2.0/query-data/flux/sql.md
+++ b/content/influxdb/v2.0/query-data/flux/sql.md
@@ -184,7 +184,7 @@ sql.from(
 
 Use the variable to manipulate queries in your dashboards.
 
-{{< img-hd src="/img/2-0-sql-dashboard-variable.png" alt="Dashboard variable from SQL query results" />}}
+{{< img-hd src="/img/influxdb/2-0-sql-dashboard-variable.png" alt="Dashboard variable from SQL query results" />}}
 
 ---
 
diff --git a/content/influxdb/v2.0/query-data/flux/window-aggregate.md b/content/influxdb/v2.0/query-data/flux/window-aggregate.md
index 6acb098a1..bdd7f8933 100644
--- a/content/influxdb/v2.0/query-data/flux/window-aggregate.md
+++ b/content/influxdb/v2.0/query-data/flux/window-aggregate.md
@@ -187,7 +187,7 @@ Table: keys: [_start, _stop, _field, _measurement]
 
 When visualized in the InfluxDB UI, each window table is displayed in a different color.
 
-![Windowed data](/img/simple-windowed-data.png)
+![Windowed data](/img/flux/simple-windowed-data.png)
 
 ## Aggregate data
 [Aggregate functions](/v2.0/reference/flux/stdlib/built-in/transformations/aggregates) take the values
@@ -249,7 +249,7 @@ Table: keys: [_start, _stop, _field, _measurement]
 Because each data point is contained in its own table, when visualized,
 they appear as single, unconnected points.
 
-![Aggregated windowed data](/img/simple-windowed-aggregate-data.png)
+![Aggregated windowed data](/img/flux/simple-windowed-aggregate-data.png)
 
 ### Recreate the time column
 **Notice the `_time` column is not in the [aggregated output tables](#mean-output-tables).**
@@ -343,7 +343,7 @@ Table: keys: [_start, _stop, _field, _measurement]
 
 With the aggregate values in a single table, data points in the visualization are connected.
 
-![Unwindowed aggregate data](/img/simple-unwindowed-data.png)
+![Unwindowed aggregate data](/img/flux/simple-unwindowed-data.png)
 
 ## Summing up
 You have now created a Flux query that windows and aggregates data.
diff --git a/content/influxdb/v2.0/query-data/get-started/transform-data.md b/content/influxdb/v2.0/query-data/get-started/transform-data.md
index 7e8bdd48b..4470693e0 100644
--- a/content/influxdb/v2.0/query-data/get-started/transform-data.md
+++ b/content/influxdb/v2.0/query-data/get-started/transform-data.md
@@ -83,7 +83,7 @@ from(bucket:"example-bucket")
 As data is gathered into windows of time, each window is output as its own table.
 When visualized, each table is assigned a unique color.
 
-![Windowed data tables](/img/flux-windowed-data.png)
+![Windowed data tables](/img/flux/windowed-data.png)
 
 ## Aggregate windowed data
 Flux aggregate functions take the `_value`s in each table and aggregate them in some way.
@@ -104,7 +104,7 @@ from(bucket:"example-bucket")
 As rows in each window are aggregated, their output table contains only a single row with the aggregate value.
 Windowed tables are all still separate and, when visualized, will appear as single, unconnected points.
 
-![Windowed aggregate data](/img/flux-windowed-aggregates.png)
+![Windowed aggregate data](/img/flux/windowed-aggregates.png)
 
 ## Add times to your aggregates
 As values are aggregated, the resulting tables do not have a `_time` column because
@@ -150,7 +150,7 @@ from(bucket:"example-bucket")
 
 Once ungrouped and combined into a single table, the aggregate data points will appear connected in your visualization.
 
-![Unwindowed aggregate data](/img/flux-windowed-aggregates-ungrouped.png)
+![Unwindowed aggregate data](/img/flux/windowed-aggregates-ungrouped.png)
 
 ## Helper functions
 This may seem like a lot of coding just to build a query that aggregates data, however going through the
diff --git a/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md b/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md
index 13cd138a6..a179889e5 100644
--- a/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md
+++ b/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md
@@ -33,13 +33,13 @@ For details on using the Data Explorer, see [Explore metrics](/v2.0/visualize-da
 
 Click the timezone dropdown to select a timezone to use for the dashboard. Select either the local time (default) or UTC.
 
-{{< img-hd src="/img/2-0-controls-timezone.png" alt="Select timezone" />}}
+{{< img-hd src="/img/influxdb/2-0-controls-timezone.png" alt="Select timezone" />}}
 
 ### Select auto-refresh interval
 
 Select how frequently to refresh the dashboard's data. By default, refreshing is paused.
 
-{{< img-hd src="/img/2-0-controls-refresh-interval.png" alt="Select refresh interval" />}}
+{{< img-hd src="/img/influxdb/2-0-controls-refresh-interval.png" alt="Select refresh interval" />}}
 
 ### Manually refresh dashboard
 
@@ -49,7 +49,7 @@ Click the refresh button (**{{< icon "refresh" >}}**) to manually refresh the da
 
 1. Select from the time range options in the dropdown menu.
 
-    {{< img-hd src="/img/2-0-controls-time-range.png" alt="Select time range" />}}
+    {{< img-hd src="/img/influxdb/2-0-controls-time-range.png" alt="Select time range" />}}
 
 2. Select **Custom Time Range** to enter a custom time range with precision up to nanoseconds.
 The default time range is 5 minutes.
@@ -67,4 +67,4 @@ Click the fullscreen icon (**{{< icon "fullscreen" >}}**) to enter presentation
 ### Toggle dark mode and light mode
 Click the moon or sun icons to toggle your dashboard between **dark mode** and **light mode.**
 
-{{< img-hd src="/img/2-0-controls-dark-light-mode.png" alt="Dark & light mode"/>}}
+{{< img-hd src="/img/influxdb/2-0-controls-dark-light-mode.png" alt="Dark & light mode"/>}}
diff --git a/content/influxdb/v2.0/visualize-data/explore-metrics.md b/content/influxdb/v2.0/visualize-data/explore-metrics.md
index 075d4dab5..ab93d827c 100644
--- a/content/influxdb/v2.0/visualize-data/explore-metrics.md
+++ b/content/influxdb/v2.0/visualize-data/explore-metrics.md
@@ -51,7 +51,7 @@ See [Get started with Flux](/v2.0/query-data/get-started) to learn more about Fl
 
 - Select an available [visualization types](/v2.0/visualize-data/visualization-types/) from the dropdown menu in the upper-left:
 
-    {{< img-hd src="/img/2-0-visualizations-dropdown.png" title="Visualization dropdown" />}}
+    {{< img-hd src="/img/influxdb/2-0-visualizations-dropdown.png" title="Visualization dropdown" />}}
 
 ## Control your dashboard cell
 
@@ -62,7 +62,7 @@ To open the cell editor overlay, click the gear icon in the upper right of a cel
 
 Toggle the **View Raw Data** {{< icon "toggle" >}} option to see your data in table format instead of a graph. Use this option when data can't be visualized using a visualization type.
 
- {{< img-hd src="/img/beta-8-raw-data.png" alt="View raw data" />}}
+ {{< img-hd src="/img/influxdb/2-0-controls-view-raw-data.png" alt="View raw data" />}}
 
 ### Save as CSV
 
@@ -72,7 +72,7 @@ Click the CSV icon to save the cells contents as a CSV file.
 
 Select how frequently to refresh the dashboard's data. By default, refreshing is paused.
 
-{{< img-hd src="/img/beta-8-interval-dropdown.png" alt="Select refresh interval" />}}
+{{< img-hd src="/img/influxdb-influxdb/2-0-controls-refresh-interval.png" alt="Select refresh interval" />}}
 
 ### Manually refresh dashboard
 
@@ -82,7 +82,7 @@ Click the refresh button ({{< icon "refresh" >}}) to manually refresh the dashbo
 
 1. Select from the time range options in the dropdown menu.
 
-    {{< img-hd src="/img/2-0-controls-time-range.png" alt="Select time range" />}}
+    {{< img-hd src="/img/influxdb/2-0-controls-time-range.png" alt="Select time range" />}}
 
 2. Select **Custom Time Range** to enter a custom time range with precision up to nanoseconds.
 The default time range is 5m.
diff --git a/content/influxdb/v2.0/visualize-data/other-tools/grafana.md b/content/influxdb/v2.0/visualize-data/other-tools/grafana.md
index 4e1760ab4..4fa9d2d4c 100644
--- a/content/influxdb/v2.0/visualize-data/other-tools/grafana.md
+++ b/content/influxdb/v2.0/visualize-data/other-tools/grafana.md
@@ -61,7 +61,7 @@ configure your InfluxDB connection:
     - **Default Bucket**: The default [bucket](/v2.0/organizations/buckets/) to use in Flux queries.
     - **Min time interval**: The [Grafana minimum time interval](https://grafana.com/docs/grafana/latest/features/datasources/influxdb/#min-time-interval).
 
-    {{< img-hd src="/img/2-0-visualize-grafana.png" />}}
+    {{< img-hd src="/img/influxdb/2-0-visualize-grafana.png" />}}
 
 2. Click **Save & Test**. Grafana attempts to connect to the InfluxDB 2.0 datasource
    and returns the results of the test.
@@ -100,7 +100,7 @@ configure your InfluxDB connection:
     - **HTTP Method**: Select **GET**.
     - **Min time interval**: The [Grafana minimum time interval](https://grafana.com/docs/grafana/latest/features/datasources/influxdb/#min-time-interval).
 
-    {{< img-hd src="/img/2-0-visualize-grafana-influxql.png" />}}
+    {{< img-hd src="/img/influxdb/2-0-visualize-grafana-influxql.png" />}}
 
 5. Click **Save & Test**. Grafana attempts to connect to the InfluxDB 2.0 datasource
    and returns the results of the test.
diff --git a/content/influxdb/v2.0/visualize-data/templates/create-template.md b/content/influxdb/v2.0/visualize-data/templates/create-template.md
index 484c0b729..b74369eab 100644
--- a/content/influxdb/v2.0/visualize-data/templates/create-template.md
+++ b/content/influxdb/v2.0/visualize-data/templates/create-template.md
@@ -35,7 +35,7 @@ Only [user templates](/v2.0/visualize-data/templates/#dashboard-template-types)
 
 3. Select **User Templates**.
 
-    {{< img-hd src="/img/2-0-templates-type-select.png" alt="Select User Templates" />}}
+    {{< img-hd src="/img/influxdb/2-0-templates-type-select.png" alt="Select User Templates" />}}
 
 4. Hover over the template you want to clone and click **{{< icon "clone" >}}**.
 5. Click **Clone** to confirm. The cloned template appears in your list.
diff --git a/content/influxdb/v2.0/visualize-data/templates/use-template.md b/content/influxdb/v2.0/visualize-data/templates/use-template.md
index d03f172a7..f71d77809 100644
--- a/content/influxdb/v2.0/visualize-data/templates/use-template.md
+++ b/content/influxdb/v2.0/visualize-data/templates/use-template.md
@@ -20,7 +20,7 @@ To create a new dashboard from an InfluxDB dashboard template:
 
 3. Select the [template type](/v2.0/visualize-data/templates/#dashboard-template-types).
 
-    {{< img-hd src="/img/2-0-templates-type-select.png" alt="Select User Templates" />}}
+    {{< img-hd src="/img/influxdb/2-0-templates-type-select.png" alt="Select User Templates" />}}
 
 4. Hover over the template you want to use and click **Create**.
    A notification appears confirming the dashboard was created.
diff --git a/content/influxdb/v2.0/visualize-data/templates/view-template.md b/content/influxdb/v2.0/visualize-data/templates/view-template.md
index d757959e3..fb400bd8d 100644
--- a/content/influxdb/v2.0/visualize-data/templates/view-template.md
+++ b/content/influxdb/v2.0/visualize-data/templates/view-template.md
@@ -20,7 +20,7 @@ To view templates in the InfluxDB userface (UI):
 
 3. Select templates to view:
 
-    {{< img-hd src="/img/2-0-templates-type-select.png" alt="Select User Templates" />}}
+    {{< img-hd src="/img/influxdb/2-0-templates-type-select.png" alt="Select User Templates" />}}
 
     - **Static Templates:** templates included with InfluxDB.
       For more information, see [Static templates](#static-templates) below.
diff --git a/content/influxdb/v2.0/visualize-data/variables/_index.md b/content/influxdb/v2.0/visualize-data/variables/_index.md
index 2b646b877..9b4fcc052 100644
--- a/content/influxdb/v2.0/visualize-data/variables/_index.md
+++ b/content/influxdb/v2.0/visualize-data/variables/_index.md
@@ -33,7 +33,7 @@ from(bucket: v.bucket)
 When building Flux queries for dashboard cells, view available dashboard variables
 in the **Variables** tab next to the Functions tab.
 
-{{< img-hd src="/img/2-0-variables-data-explorer-view.png" />}}
+{{< img-hd src="/img/influxdb/2-0-variables-data-explorer-view.png" />}}
 
 Click a variable name to add it to your query and select a value from the **Value** dropdown.
 
diff --git a/content/influxdb/v2.0/visualize-data/variables/view-variables.md b/content/influxdb/v2.0/visualize-data/variables/view-variables.md
index ab0c02c39..98f923304 100644
--- a/content/influxdb/v2.0/visualize-data/variables/view-variables.md
+++ b/content/influxdb/v2.0/visualize-data/variables/view-variables.md
@@ -30,4 +30,4 @@ View a list of dashboard variables in the InfluxDB user interface (UI) from an o
 2. Switch to **Script Editor**.
 3. Click the **Variables** tab to the right of the script editor.
 
-  {{< img-hd src="/img/2-0-variables-data-explorer-view.png" />}}
+  {{< img-hd src="/img/influxdb/2-0-variables-data-explorer-view.png" />}}
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/gauge.md b/content/influxdb/v2.0/visualize-data/visualization-types/gauge.md
index 241a00093..3c70333c5 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/gauge.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/gauge.md
@@ -1,7 +1,7 @@
 ---
 title: Gauge visualization
 list_title: Gauge
-list_image: /img/2-0-visualizations-gauge-example.png
+list_image: /img/influxdb/2-0-visualizations-gauge-example.png
 description: >
   The Gauge view displays the single value most recent value for a time series in a gauge view.
 weight: 206
@@ -15,7 +15,7 @@ menu:
 
 The **Gauge** visualization displays the most recent value for a time series in a gauge.
 
-{{< img-hd src="/img/2-0-visualizations-gauge-example-8.png" alt="Gauge example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-gauge-example-8.png" alt="Gauge example" />}}
 
 Select the **Gauge** option from the visualization dropdown in the upper right.
 
@@ -66,4 +66,4 @@ from(bucket: "example-bucket")
 ```
 
 ###### Visualization options for pressure gauge
-{{< img-hd src="/img/2-0-visualizations-gauge-pressure-8.png" alt="Pressure guage example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-gauge-pressure-8.png" alt="Pressure guage example" />}}
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/graph-single-stat.md b/content/influxdb/v2.0/visualize-data/visualization-types/graph-single-stat.md
index 8064ec2d8..7c10d31a4 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/graph-single-stat.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/graph-single-stat.md
@@ -1,7 +1,7 @@
 ---
 title: Graph + Single Stat visualization
 list_title: Graph + Single Stat
-list_image: /img/2-0-visualizations-line-graph-single-stat-example.png
+list_image: /img/influxdb/2-0-visualizations-line-graph-single-stat-example.png
 description: >
   The Graph + Single Stat view displays the specified time series in a line graph
   and overlays the single most recent value as a large numeric value.
@@ -20,7 +20,7 @@ related:
 The **Graph + Single Stat** view displays the specified time series in a line graph
 and overlays the single most recent value as a large numeric value.
 
-{{< img-hd src="/img/2-0-visualizations-line-graph-single-stat-example-8.png" alt="Line Graph + Single Stat example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-line-graph-single-stat-example-8.png" alt="Line Graph + Single Stat example" />}}
 
 Select the **Graph + Single Stat** option from the visualization dropdown in the upper right.
 
@@ -95,4 +95,4 @@ from(bucket: "example-bucket")
   )
 ```
 ###### Memory allocations visualization
-{{< img-hd src="/img/2-0-visualizations-graph-single-stat-mem-8.png" alt="Graph + Single Stat Memory Usage Example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-graph-single-stat-mem-8.png" alt="Graph + Single Stat Memory Usage Example" />}}
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/graph.md b/content/influxdb/v2.0/visualize-data/visualization-types/graph.md
index e77730c4b..6c76dc5d6 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/graph.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/graph.md
@@ -1,7 +1,7 @@
 ---
 title: Graph visualization
 list_title: Graph
-list_image: /img/2-0-visualizations-line-graph-example.png
+list_image: /img/influxdb/2-0-visualizations-line-graph-example.png
 description: >
   The Graph view lets you select from multiple graph types such as line graphs and bar graphs *(Coming)*.
 weight: 201
@@ -16,7 +16,7 @@ menu:
 The Graph visualization provides several types of graphs, each configured through
 the [Graph controls](#graph-controls).
 
-{{< img-hd src="/img/2-0-visualizations-line-graph-example-8.png" alt="Line Graph example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-line-graph-example-8.png" alt="Line Graph example" />}}
 
 Select the **Graph** option from the visualization dropdown in the upper right.
 
@@ -61,13 +61,13 @@ the visualization dropdown.
 ## Graph Examples
 
 ##### Graph with linear interpolation
-{{< img-hd src="/img/2-0-visualizations-line-graph-example-8.png" alt="Line Graph example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-line-graph-example-8.png" alt="Line Graph example" />}}
 
 ##### Graph with smooth interpolation
-{{< img-hd src="/img/2-0-visualizations-line-graph-smooth-example-8.png" alt="Step-Plot Graph example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-line-graph-smooth-example-8.png" alt="Step-Plot Graph example" />}}
 
 ##### Graph with step interpolation
-{{< img-hd src="/img/2-0-visualizations-line-graph-step-example-8.png" alt="Step-Plot Graph example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-line-graph-step-example-8.png" alt="Step-Plot Graph example" />}}
 
 <!-- ##### Stacked Graph example
 {{< img-hd src="/img/2-0-visualizations-stacked-graph-example.png" alt="Stacked Graph example" />}} -->
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/heatmap.md b/content/influxdb/v2.0/visualize-data/visualization-types/heatmap.md
index 7606580d3..5a32e2866 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/heatmap.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/heatmap.md
@@ -1,7 +1,7 @@
 ---
 title: Heatmap visualization
 list_title: Heatmap
-list_image: /img/2-0-visualizations-heatmap-example.png
+list_image: /img/influxdb/2-0-visualizations-heatmap-example.png
 description: >
   A Heatmap displays the distribution of data on an x and y axes where color
   represents different concentrations of data points.
@@ -19,7 +19,7 @@ related:
 A **Heatmap** displays the distribution of data on an x and y axes where color
 represents different concentrations of data points.
 
-{{< img-hd src="/img/2-0-visualizations-heatmap-example.png" alt="Heatmap example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-heatmap-example.png" alt="Heatmap example" />}}
 
 Select the **Heatmap** option from the visualization dropdown in the upper right.
 
@@ -98,7 +98,7 @@ and `_value_mem` is selected as the [Y Column](#data).
 The domain for each axis is also customized to account for the scale difference
 between column values.
 
-{{< img-hd src="/img/2-0-visualizations-heatmap-correlation.png" alt="Heatmap correlation example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-heatmap-correlation.png" alt="Heatmap correlation example" />}}
 
 
 ## Important notes
@@ -110,7 +110,7 @@ However, in certain cases, heatmaps provide better visibility into point density
 
 For example, the dashboard cells below visualize the same query results:
 
-{{< img-hd src="/img/2-0-visualizations-heatmap-vs-scatter.png" alt="Heatmap vs Scatter plot" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-heatmap-vs-scatter.png" alt="Heatmap vs Scatter plot" />}}
 
 The heatmap indicates isolated high point density, which isn't visible in the scatter plot.
 In the scatter plot visualization, points that share the same X and Y coordinates
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/histogram.md b/content/influxdb/v2.0/visualize-data/visualization-types/histogram.md
index 56493428c..393b69289 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/histogram.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/histogram.md
@@ -1,7 +1,7 @@
 ---
 title: Histogram visualization
 list_title: Histogram
-list_image: /img/2-0-visualizations-histogram-example.png
+list_image: /img/influxdb/2-0-visualizations-histogram-example.png
 description: >
   A histogram is a way to view the distribution of data.
   The y-axis is dedicated to count, and the x-axis is divided into bins.
@@ -17,7 +17,7 @@ menu:
 A histogram is a way to view the distribution of data.
 The y-axis is dedicated to count, and the X-axis is divided into bins.
 
-{{< img-hd src="/img/2-0-visualizations-histogram-example.png" alt="Histogram example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-histogram-example.png" alt="Histogram example" />}}
 
 Select the **Histogram** option from the visualization dropdown in the upper right.
 
@@ -79,4 +79,4 @@ from(bucket: "example-bucket")
 In the Histogram visualization options, select `_time` as the [X Column](#data)
 and `severity` as the [Group By](#data) option:
 
-{{< img-hd src="/img/2-0-visualizations-histogram-errors.png" alt="Errors histogram" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-histogram-errors.png" alt="Errors histogram" />}}
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/scatter.md b/content/influxdb/v2.0/visualize-data/visualization-types/scatter.md
index f1605db0f..6051b4e82 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/scatter.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/scatter.md
@@ -1,7 +1,7 @@
 ---
 title: Scatter visualization
 list_title: Scatter
-list_image: /img/2-0-visualizations-scatter-example.png
+list_image: /img/influxdb/2-0-visualizations-scatter-example.png
 description: >
   The Scatter view uses a scatter plot to display time series data.
 weight: 208
@@ -17,7 +17,7 @@ related:
 
 The **Scatter** view uses a scatter plot to display time series data.
 
-{{< img-hd src="/img/2-0-visualizations-scatter-example.png" alt="Scatter plot example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-scatter-example.png" alt="Scatter plot example" />}}
 
 Select the **Scatter** option from the visualization dropdown in the upper right.
 
@@ -93,7 +93,7 @@ union(tables: [cpu, mem])
 ###### Use a scatter plot to visualize correlation
 In the Scatter visualization controls, points are differentiated based on their group keys.
 
-{{< img-hd src="/img/2-0-visualizations-scatter-correlation.png" alt="Heatmap correlation example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-scatter-correlation.png" alt="Heatmap correlation example" />}}
 
 ## Important notes
 
@@ -104,7 +104,7 @@ However, in certain cases, scatterplots can "hide" points if they share the same
 
 For example, the dashboard cells below visualize the same query results:
 
-{{< img-hd src="/img/2-0-visualizations-heatmap-vs-scatter.png" alt="Heatmap vs Scatter plot" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-heatmap-vs-scatter.png" alt="Heatmap vs Scatter plot" />}}
 
 The heatmap indicates isolated high point density, which isn't visible in the scatter plot.
 In the scatter plot visualization, points that share the same X and Y coordinates
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/single-stat.md b/content/influxdb/v2.0/visualize-data/visualization-types/single-stat.md
index c3f489b43..8f86e31ac 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/single-stat.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/single-stat.md
@@ -1,7 +1,7 @@
 ---
 title: Single Stat visualization
 list_title: Single stat
-list_image: /img/2-0-visualizations-single-stat-example.png
+list_image: /img/influxdb/2-0-visualizations-single-stat-example.png
 description: >
   The Single Stat view displays the most recent value of the specified time series as a numerical value.
 weight: 205
@@ -15,7 +15,7 @@ menu:
 
 The **Single Stat** view displays the most recent value of the specified time series as a numerical value.
 
-{{< img-hd src="/img/2-0-visualizations-single-stat-example-8.png" alt="Single stat example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-single-stat-example-8.png" alt="Single stat example" />}}
 
 Select the **Single Stat** option from the visualization dropdown in the upper right.
 
@@ -64,4 +64,4 @@ from(bucket: "example-bucket")
 ```
 
 ###### Memory usage as a single stat
-{{< img-hd src="/img/2-0-visualizations-single-stat-example-8.png" alt="Graph + Single Stat Memory Usage Example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-single-stat-example-8.png" alt="Graph + Single Stat Memory Usage Example" />}}
diff --git a/content/influxdb/v2.0/visualize-data/visualization-types/table.md b/content/influxdb/v2.0/visualize-data/visualization-types/table.md
index cb0151e83..e506a2623 100644
--- a/content/influxdb/v2.0/visualize-data/visualization-types/table.md
+++ b/content/influxdb/v2.0/visualize-data/visualization-types/table.md
@@ -1,7 +1,7 @@
 ---
 title: Table visualization
 list_title: Table
-list_image: /img/2-0-visualizations-table-example.png
+list_image: /img/influxdb/2-0-visualizations-table-example.png
 description: >
   The Table option displays the results of queries in a tabular view, which is
   sometimes easier to analyze than graph views of data.
@@ -17,7 +17,7 @@ menu:
 The **Table** option displays the results of queries in a tabular view, which is
 sometimes easier to analyze than graph views of data.
 
-{{< img-hd src="/img/2-0-visualizations-table-example.png" alt="Table example" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-table-example.png" alt="Table example" />}}
 
 Select the **Table** option from the visualization dropdown in the upper right.
 
@@ -82,4 +82,4 @@ from(bucket: "example-bucket")
 ```
 
 ###### Cluster metrics in a table
-{{< img-hd src="/img/2-0-visualizations-table-human-readable.png" alt="Human readable metrics in a table" />}}
+{{< img-hd src="/img/influxdb/2-0-visualizations-table-human-readable.png" alt="Human readable metrics in a table" />}}
diff --git a/content/platform/introduction/getting-started.md b/content/platform/introduction/getting-started.md
index 39069573b..6fe5890f1 100644
--- a/content/platform/introduction/getting-started.md
+++ b/content/platform/introduction/getting-started.md
@@ -8,7 +8,7 @@ menu:
 ---
 ## Overview
 
-![Getting started setup](/img/chronograf/v1.6/intro-gs-diagram.png)
+![Getting started setup](/img/chronograf/1-6-intro-gs-diagram.png)
 
 Before following the steps below, [download and install](/platform/install-and-deploy/install/) each component of the TICK stack, or [Install the InfluxData Sandbox](/platform/install-and-deploy/deploying/sandbox-install/).