diff --git a/modules/ROOT/assets/image-source-files/add-api-instance-modify-api-groups.graffle/image1.png b/modules/ROOT/assets/image-source-files/add-api-instance-modify-api-groups.graffle/image1.png
deleted file mode 100644
index 7a9cb3075..000000000
Binary files a/modules/ROOT/assets/image-source-files/add-api-instance-modify-api-groups.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/add-api-instance-modify-api-groups.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/add-api-instance-modify-api-groups.graffle/preview.jpeg
deleted file mode 100644
index abfc20300..000000000
Binary files a/modules/ROOT/assets/image-source-files/add-api-instance-modify-api-groups.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/api-groups-add-sla-tier.graffle/image1.png b/modules/ROOT/assets/image-source-files/api-groups-add-sla-tier.graffle/image1.png
deleted file mode 100644
index 6d115f617..000000000
Binary files a/modules/ROOT/assets/image-source-files/api-groups-add-sla-tier.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/api-groups-add-sla-tier.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/api-groups-add-sla-tier.graffle/preview.jpeg
deleted file mode 100644
index c328cf3d9..000000000
Binary files a/modules/ROOT/assets/image-source-files/api-groups-add-sla-tier.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/api-groups-copy-sla-tier-limits.graffle/image2.png b/modules/ROOT/assets/image-source-files/api-groups-copy-sla-tier-limits.graffle/image2.png
deleted file mode 100644
index 672401f9a..000000000
Binary files a/modules/ROOT/assets/image-source-files/api-groups-copy-sla-tier-limits.graffle/image2.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/api-groups-copy-sla-tier-limits.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/api-groups-copy-sla-tier-limits.graffle/preview.jpeg
deleted file mode 100644
index 1d2fb4074..000000000
Binary files a/modules/ROOT/assets/image-source-files/api-groups-copy-sla-tier-limits.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/api-groups-remove-sla-tiers.graffle/image1.png b/modules/ROOT/assets/image-source-files/api-groups-remove-sla-tiers.graffle/image1.png
deleted file mode 100644
index c03db5305..000000000
Binary files a/modules/ROOT/assets/image-source-files/api-groups-remove-sla-tiers.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/api-groups-remove-sla-tiers.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/api-groups-remove-sla-tiers.graffle/preview.jpeg
deleted file mode 100644
index d9fb5c48d..000000000
Binary files a/modules/ROOT/assets/image-source-files/api-groups-remove-sla-tiers.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/apis-api-manager-dashboard.graffle/image1.png b/modules/ROOT/assets/image-source-files/apis-api-manager-dashboard.graffle/image1.png
deleted file mode 100644
index 952e0cce1..000000000
Binary files a/modules/ROOT/assets/image-source-files/apis-api-manager-dashboard.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/apis-api-manager-dashboard.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/apis-api-manager-dashboard.graffle/preview.jpeg
deleted file mode 100644
index 96e0d013f..000000000
Binary files a/modules/ROOT/assets/image-source-files/apis-api-manager-dashboard.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/applying-default-policies.graffle/image1.png b/modules/ROOT/assets/image-source-files/applying-default-policies.graffle/image1.png
deleted file mode 100644
index fce7944b7..000000000
Binary files a/modules/ROOT/assets/image-source-files/applying-default-policies.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/applying-default-policies.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/applying-default-policies.graffle/preview.jpeg
deleted file mode 100644
index 424cabba9..000000000
Binary files a/modules/ROOT/assets/image-source-files/applying-default-policies.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/build-soap-proxy-advanced-options.graffle/image1.png b/modules/ROOT/assets/image-source-files/build-soap-proxy-advanced-options.graffle/image1.png
deleted file mode 100644
index b25b1de54..000000000
Binary files a/modules/ROOT/assets/image-source-files/build-soap-proxy-advanced-options.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/build-soap-proxy-advanced-options.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/build-soap-proxy-advanced-options.graffle/preview.jpeg
deleted file mode 100644
index a42a5c28d..000000000
Binary files a/modules/ROOT/assets/image-source-files/build-soap-proxy-advanced-options.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/build-soap-proxy-endpoint-configuration.graffle/image4.png b/modules/ROOT/assets/image-source-files/build-soap-proxy-endpoint-configuration.graffle/image4.png
deleted file mode 100644
index 704bc306f..000000000
Binary files a/modules/ROOT/assets/image-source-files/build-soap-proxy-endpoint-configuration.graffle/image4.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/build-soap-proxy-endpoint-configuration.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/build-soap-proxy-endpoint-configuration.graffle/preview.jpeg
deleted file mode 100644
index 91d7ab969..000000000
Binary files a/modules/ROOT/assets/image-source-files/build-soap-proxy-endpoint-configuration.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/building-https-proxy-c7589.graffle/image3.png b/modules/ROOT/assets/image-source-files/building-https-proxy-c7589.graffle/image3.png
deleted file mode 100644
index 0aeed8544..000000000
Binary files a/modules/ROOT/assets/image-source-files/building-https-proxy-c7589.graffle/image3.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/building-https-proxy-c7589.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/building-https-proxy-c7589.graffle/preview.jpeg
deleted file mode 100644
index 1eed9b740..000000000
Binary files a/modules/ROOT/assets/image-source-files/building-https-proxy-c7589.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/configure-regex-resources-list.graffle/image1.png b/modules/ROOT/assets/image-source-files/configure-regex-resources-list.graffle/image1.png
deleted file mode 100644
index 653c590ac..000000000
Binary files a/modules/ROOT/assets/image-source-files/configure-regex-resources-list.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/configure-regex-resources-list.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/configure-regex-resources-list.graffle/preview.jpeg
deleted file mode 100644
index c10197633..000000000
Binary files a/modules/ROOT/assets/image-source-files/configure-regex-resources-list.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/configure-uri-regex-example.graffle/image1.png b/modules/ROOT/assets/image-source-files/configure-uri-regex-example.graffle/image1.png
deleted file mode 100644
index 9c1f1b6b5..000000000
Binary files a/modules/ROOT/assets/image-source-files/configure-uri-regex-example.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/configure-uri-regex-example.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/configure-uri-regex-example.graffle/preview.jpeg
deleted file mode 100644
index 813ad807a..000000000
Binary files a/modules/ROOT/assets/image-source-files/configure-uri-regex-example.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/cors-policy-sop-example.png b/modules/ROOT/assets/image-source-files/cors-policy-sop-example.png
deleted file mode 100644
index d00765923..000000000
Binary files a/modules/ROOT/assets/image-source-files/cors-policy-sop-example.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-api-instance-with-midp.graffle/image2.png b/modules/ROOT/assets/image-source-files/create-api-instance-with-midp.graffle/image2.png
deleted file mode 100644
index 03e96e52f..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-api-instance-with-midp.graffle/image2.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-api-instance-with-midp.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/create-api-instance-with-midp.graffle/preview.jpeg
deleted file mode 100644
index 1c7c144db..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-api-instance-with-midp.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-api-instances-api-groups.graffle/image1.png b/modules/ROOT/assets/image-source-files/create-api-instances-api-groups.graffle/image1.png
deleted file mode 100644
index 00733b339..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-api-instances-api-groups.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-api-instances-api-groups.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/create-api-instances-api-groups.graffle/preview.jpeg
deleted file mode 100644
index 4ffe6d11b..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-api-instances-api-groups.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-endpoint-api-with-proxy.graffle/image1.png b/modules/ROOT/assets/image-source-files/create-endpoint-api-with-proxy.graffle/image1.png
deleted file mode 100644
index ebe79c57e..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-endpoint-api-with-proxy.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-endpoint-api-with-proxy.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/create-endpoint-api-with-proxy.graffle/preview.jpeg
deleted file mode 100644
index ffad751b0..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-endpoint-api-with-proxy.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp copy.graffle/image1.png b/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp copy.graffle/image1.png
deleted file mode 100644
index 1ea03b100..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp copy.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp copy.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp copy.graffle/preview.jpeg
deleted file mode 100644
index 2df921363..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp copy.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp.graffle/image1.png b/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp.graffle/image1.png
deleted file mode 100644
index 1ea03b100..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp.graffle/preview.jpeg
deleted file mode 100644
index 2d7ba5a70..000000000
Binary files a/modules/ROOT/assets/image-source-files/create-instance-endpoint-midp.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/getting-started-proxy-editing-api.graffle/image5.png b/modules/ROOT/assets/image-source-files/getting-started-proxy-editing-api.graffle/image5.png
deleted file mode 100644
index 587bf3150..000000000
Binary files a/modules/ROOT/assets/image-source-files/getting-started-proxy-editing-api.graffle/image5.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/getting-started-proxy-editing-api.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/getting-started-proxy-editing-api.graffle/preview.jpeg
deleted file mode 100644
index a9aecbf18..000000000
Binary files a/modules/ROOT/assets/image-source-files/getting-started-proxy-editing-api.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/proxy-deploy-raml-oas-proxy-85634.graffle/image6.png b/modules/ROOT/assets/image-source-files/proxy-deploy-raml-oas-proxy-85634.graffle/image6.png
deleted file mode 100644
index 4cfaead66..000000000
Binary files a/modules/ROOT/assets/image-source-files/proxy-deploy-raml-oas-proxy-85634.graffle/image6.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/proxy-deploy-raml-oas-proxy-85634.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/proxy-deploy-raml-oas-proxy-85634.graffle/preview.jpeg
deleted file mode 100644
index 9688450e6..000000000
Binary files a/modules/ROOT/assets/image-source-files/proxy-deploy-raml-oas-proxy-85634.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/remove-api-instance-api-groups.graffle/image1.png b/modules/ROOT/assets/image-source-files/remove-api-instance-api-groups.graffle/image1.png
deleted file mode 100644
index 10969a751..000000000
Binary files a/modules/ROOT/assets/image-source-files/remove-api-instance-api-groups.graffle/image1.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/remove-api-instance-api-groups.graffle/preview.jpeg b/modules/ROOT/assets/image-source-files/remove-api-instance-api-groups.graffle/preview.jpeg
deleted file mode 100644
index d38ae8485..000000000
Binary files a/modules/ROOT/assets/image-source-files/remove-api-instance-api-groups.graffle/preview.jpeg and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/remove-api-instance.png b/modules/ROOT/assets/image-source-files/remove-api-instance.png
deleted file mode 100644
index e073ac075..000000000
Binary files a/modules/ROOT/assets/image-source-files/remove-api-instance.png and /dev/null differ
diff --git a/modules/ROOT/assets/image-source-files/revoke-access-to-api.png b/modules/ROOT/assets/image-source-files/revoke-access-to-api.png
deleted file mode 100644
index b66b49e99..000000000
Binary files a/modules/ROOT/assets/image-source-files/revoke-access-to-api.png and /dev/null differ
diff --git a/modules/ROOT/pages/api-groups-modifying-groups.adoc b/modules/ROOT/pages/api-groups-modifying-groups.adoc
index aa74e72c8..811b9d9e2 100644
--- a/modules/ROOT/pages/api-groups-modifying-groups.adoc
+++ b/modules/ROOT/pages/api-groups-modifying-groups.adoc
@@ -77,7 +77,7 @@ To remove an API instance from an API Group:
 . Expand the API Group version to view its available instances.
 . Click the API Group instance to view the instance details.
 . Click the more options menu icon (
-image:overflow-menu-icon.png[width=0.50%,height=0.50%,title="Screenshot of the more options menu icon"]
+image:overflow-menu-icon.png["",width=0.50%,height=0.50%,title="Screenshot of the more options menu icon"]
 ) next to *Edit* and select *Delete*. 
 +
 NOTE: If the API instance you removed is the last API linked to an asset, you must create a new version of the API Group.
diff --git a/modules/ROOT/pages/create-instance-task-flex.adoc b/modules/ROOT/pages/create-instance-task-flex.adoc
index 9c3ccbfee..26c13d724 100644
--- a/modules/ROOT/pages/create-instance-task-flex.adoc
+++ b/modules/ROOT/pages/create-instance-task-flex.adoc
@@ -80,7 +80,7 @@ Each API instance supports up to {routes-per-api} routes and each route can supp
 
 Before adding additional routes, enter an optional *Route label* for clarity.
 
-You can add additional routes by clicking *Add Route*, and you can delete routes by clicking the *Trash Can* icon (image:trash-can-icon.png[2%,2%]). If only one route is defined, you cannot delete that route.
+You can add additional routes by clicking *Add Route*, and you can delete routes by clicking the *Trash Can* icon (image:trash-can-icon.png["",2%,2%]). If only one route is defined, you cannot delete that route.
 
 ==== Route Rules
 
@@ -142,7 +142,7 @@ To define the *Headers* rule:
 . Enter the header name in the first box.
 . Enter the header's regular expresion value in the second box.
 +
-NOTE: To delete a header, click the *Trash Can* icon (image:trash-can-icon.png[2%,2%]).  
+NOTE: To delete a header, click the *Trash Can* icon (image:trash-can-icon.png["",2%,2%]).  
 
 ==== Route Order
 
@@ -166,7 +166,7 @@ What upstream service within the route each request is sent to is random and ind
 
 Because any upstream service within a route can receive any request, all upstream services within the same route must adhere to the same API contract.
 
-You can add an upstream service by clicking *Add Upstream*, and you can delete an upstream service by clicking the *Trash Can* icon (image:trash-can-icon.png[2%,2%]). If only one upstream service is defined, you cannot delete it.
+You can add an upstream service by clicking *Add Upstream*, and you can delete an upstream service by clicking the *Trash Can* icon (image:trash-can-icon.png["",2%,2%]). If only one upstream service is defined, you cannot delete it.
 
 Configure the following fields for each upstream service:
 
diff --git a/modules/ROOT/pages/environment-permission-task.adoc b/modules/ROOT/pages/environment-permission-task.adoc
index da19cff56..d3c4d27f7 100644
--- a/modules/ROOT/pages/environment-permission-task.adoc
+++ b/modules/ROOT/pages/environment-permission-task.adoc
@@ -52,7 +52,7 @@ This permission is per environment. API visibility cannot be restricted to speci
 To grant environment permissions to roles from API Manager:
 
 . *Click Access Management* > *Users* > *_a user to give permissions_* > *API Manager* > Permissions.
-. Select the permissions for the user and click image:blue-plus.png[blue plus icon] to save the permissions:
+. Select the permissions for the user and click image:blue-plus.png[""] to save the permissions:
 
 image::apim-user-perms.png[How to set permissions in Access Management]
 
diff --git a/modules/ROOT/pages/viewing-api-analytics.adoc b/modules/ROOT/pages/viewing-api-analytics.adoc
index ea4b899dd..ad4f68755 100644
--- a/modules/ROOT/pages/viewing-api-analytics.adoc
+++ b/modules/ROOT/pages/viewing-api-analytics.adoc
@@ -42,7 +42,7 @@ All of the charts on the Overview Dashboard are cross-filtered. If you filter th
 |*Requests by Platform* |Click one or more segments to filter to just those results. Hover over a segment for a tooltip displaying the name of the application and the total number of requests from that application for that time period. |Click the segment(s) again to reset the chart.
 |===
 
-To export the data for any of these charts, click the Export icon (image:export.png["Curved arrow".]).
+To export the data for any of these charts, click the Export icon (image:export.png["",.]).
 
 If you have filtered data on one of the charts to show only selected data, the export icon triggers an export of a .csv file of the full data for that chart, filtered by whatever date range and API selection you have made using the filters in the upper left of the page. Exported files are limited to a maximum of 1 million records.
 
@@ -84,15 +84,15 @@ image::createchart.png["The create chart page."]
 [%header,cols="20a,20a,60a"]
 |===
 |Icon |Chart Type |Chart Options
-|image:line-chart-icon.png["Thumbnail graphic of a line chart."] |Line chart
+|image:line-chart-icon.png[""] |Line chart
 |Data Source, Metric: _metrics_ and Total, Data Interval: _durations_
-|image:bar-chart-icon.png["Thumbnail graphic of a bar chart."] |Bar chart
+|image:bar-chart-icon.png[""] |Bar chart
 |Data Source, Metric: _metrics_ and Total, Group By: _categories_
 |image:stack-chart-icon.png["Thumbnail graphic of a stack chart."] |Stack chart
 |Data Source, Metric: _metrics_ and Total, Group By: _categories_, Then By: _categories_
-|image:ring-chart-icon.png["Thumbnail graphic of a ring chart."] |Ring chart
+|image:ring-chart-icon.png[""] |Ring chart
 |Data Source, Metric: _metrics_ and Total, Group By: _categories_
-|image:map-chart-icon.png["Thumbnail graphic of a map chart."] |Map chart
+|image:map-chart-icon.png[""] |Map chart
 |Data Source, Metric: _metrics_ and Total
 |===
 +
@@ -185,7 +185,7 @@ Use the date range picker to adjust the time period for all the charts on your d
 
 == Exporting Analytics Data
 
-You can export your analytics data from the charts displayed on your Overview Dashboard or your Custom Dashboard. On either dashboard, click the Export icon (image:export.png["Curved arrow".]) to download a CSV file with the data for that chart.
+You can export your analytics data from the charts displayed on your Overview Dashboard or your Custom Dashboard. On either dashboard, click the Export icon (image:export.png["",.]) to download a CSV file with the data for that chart.
 
 
 The data you download reflects filtering options you selected. However, if you are exporting chart data from the Overview Dashboard and you have selected one or more subsections of a chart, the exported files do not include filtering options. Exported files contain the full data for that chart.