diff --git a/doc/administration/geo/replication/img/geo-ha-diagram_v12.png b/doc/administration/geo/replication/img/geo-ha-diagram_v11_11.png
similarity index 100%
rename from doc/administration/geo/replication/img/geo-ha-diagram_v12.png
rename to doc/administration/geo/replication/img/geo-ha-diagram_v11_11.png
diff --git a/doc/administration/geo/replication/multiple_servers.md b/doc/administration/geo/replication/multiple_servers.md
index 6bc9968b18320b88b3a1b2fac1a58d22da21e3e7..b39456600968b3e9374d7bdeddd54175f9f5909d 100644
--- a/doc/administration/geo/replication/multiple_servers.md
+++ b/doc/administration/geo/replication/multiple_servers.md
@@ -18,7 +18,7 @@ described, it is possible to adapt these instructions to your needs.
 
 ## Architecture overview
 
-![Architecture for running Geo in a multi-node configuration with primary and secondary backend services](img/geo-ha-diagram_v12.png)
+![Architecture for running Geo in a multi-node configuration with primary and secondary backend services](img/geo-ha-diagram_v11_11.png)
 
 _[diagram source - GitLab employees only](https://docs.google.com/drawings/d/1z0VlizKiLNXVVVaERFwgsIOuEgjcUqDTWPdQYsE7Z4c/edit)_
 
diff --git a/doc/administration/geo/secondary_proxy/_index.md b/doc/administration/geo/secondary_proxy/_index.md
index eeef06bc6d615a51b672ce4292fcacd02f42c403..a89b01c792127938d1ac6df6b449dd46d1a621fa 100644
--- a/doc/administration/geo/secondary_proxy/_index.md
+++ b/doc/administration/geo/secondary_proxy/_index.md
@@ -252,7 +252,7 @@ Disabling the proxying feature flag has the following general effects:
 - The secondary site does not proxy HTTP requests to the primary site. Instead, it attempts to serve them itself, or fail.
 - Git requests generally succeed. Git pushes are redirected or proxied to the primary site.
 - Other than Git requests, any HTTP request which may write data fails. Read requests generally succeed.
-- The secondary site UI shows a banner: ![Secondary Site UI Banner for Read-Only](img/secondary_proxy_read_only_v17.8.png)
+- The secondary site UI shows a banner: ![Secondary Site UI Banner for Read-Only](img/secondary_proxy_read_only_v17_8.png)
 
 | Feature / component                                 | Succeed                   | Notes                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | :-------------------------------------------------- | :------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
diff --git a/doc/administration/geo/secondary_proxy/img/secondary_proxy_read_only_v17.8.png b/doc/administration/geo/secondary_proxy/img/secondary_proxy_read_only_v17_8.png
similarity index 100%
rename from doc/administration/geo/secondary_proxy/img/secondary_proxy_read_only_v17.8.png
rename to doc/administration/geo/secondary_proxy/img/secondary_proxy_read_only_v17_8.png
diff --git a/doc/integration/gmail_action_buttons_for_gitlab.md b/doc/integration/gmail_action_buttons_for_gitlab.md
index 8e2d9b161396ef3b3dbcc20b213e80f5195f8d38..328b31bd9e0eb16d3c6c4f24f7269eb4278f0e45 100644
--- a/doc/integration/gmail_action_buttons_for_gitlab.md
+++ b/doc/integration/gmail_action_buttons_for_gitlab.md
@@ -15,8 +15,6 @@ title: Gmail actions
 GitLab supports [Google actions in email](https://developers.google.com/gmail/markup/actions/actions-overview).
 When you configure this integration, emails that require an action are marked in Gmail.
 
-![Gmail actions button](img/gmail_action_buttons_for_gitlab_v8.png)
-
 To get this functioning, you must be registered with Google. For instructions, see
 [Register with Google](https://developers.google.com/gmail/markup/registering-with-google).
 
diff --git a/doc/integration/img/gmail_action_buttons_for_gitlab_v8.png b/doc/integration/img/gmail_action_buttons_for_gitlab_v8.png
deleted file mode 100644
index 0e3e24d6ffc6cb95228d2bf0300f787cdc4f580d..0000000000000000000000000000000000000000
Binary files a/doc/integration/img/gmail_action_buttons_for_gitlab_v8.png and /dev/null differ
diff --git a/doc/user/group/saml_sso/example_saml_config.md b/doc/user/group/saml_sso/example_saml_config.md
index f775eca24a8dce56b9bae5ef6f821efd39d4a811..2a812da0a370ca60a1bd98bc07d03e41a7453d05 100644
--- a/doc/user/group/saml_sso/example_saml_config.md
+++ b/doc/user/group/saml_sso/example_saml_config.md
@@ -134,19 +134,19 @@ Setting the username for the newly provisioned users when assigning them the SCI
 
 ### Basic SAML app configuration
 
-![OneLogin application details](img/OneLogin-app_details_v12.png)
+![OneLogin application details](img/OneLogin-app_details_v12_8.png)
 
 ### Parameters
 
-![OneLogin application details](img/OneLogin-parameters_v12.png)
+![OneLogin application details](img/OneLogin-parameters_v12_8.png)
 
 ### Adding a user
 
-![OneLogin user add](img/OneLogin-userAdd_v12.png)
+![OneLogin user add](img/OneLogin-userAdd_v12_8.png)
 
 ### SSO settings
 
-![OneLogin SSO settings](img/OneLogin-SSOsettings_v12.png)
+![OneLogin SSO settings](img/OneLogin-SSOsettings_v12_8.png)
 
 ## SAML response example
 
diff --git a/doc/user/group/saml_sso/img/OneLogin-SSOsettings_v12.png b/doc/user/group/saml_sso/img/OneLogin-SSOsettings_v12_8.png
similarity index 100%
rename from doc/user/group/saml_sso/img/OneLogin-SSOsettings_v12.png
rename to doc/user/group/saml_sso/img/OneLogin-SSOsettings_v12_8.png
diff --git a/doc/user/group/saml_sso/img/OneLogin-app_details_v12.png b/doc/user/group/saml_sso/img/OneLogin-app_details_v12_8.png
similarity index 100%
rename from doc/user/group/saml_sso/img/OneLogin-app_details_v12.png
rename to doc/user/group/saml_sso/img/OneLogin-app_details_v12_8.png
diff --git a/doc/user/group/saml_sso/img/OneLogin-parameters_v12.png b/doc/user/group/saml_sso/img/OneLogin-parameters_v12_8.png
similarity index 100%
rename from doc/user/group/saml_sso/img/OneLogin-parameters_v12.png
rename to doc/user/group/saml_sso/img/OneLogin-parameters_v12_8.png
diff --git a/doc/user/group/saml_sso/img/OneLogin-userAdd_v12.png b/doc/user/group/saml_sso/img/OneLogin-userAdd_v12_8.png
similarity index 100%
rename from doc/user/group/saml_sso/img/OneLogin-userAdd_v12.png
rename to doc/user/group/saml_sso/img/OneLogin-userAdd_v12_8.png