diff --git a/boards/arc/em_starterkit/doc/em_starterkit.jpg b/boards/arc/em_starterkit/doc/em_starterkit.jpg
index 0dff5f5b819..c3deb7d649e 100644
Binary files a/boards/arc/em_starterkit/doc/em_starterkit.jpg and b/boards/arc/em_starterkit/doc/em_starterkit.jpg differ
diff --git a/boards/arc/em_starterkit/doc/index.rst b/boards/arc/em_starterkit/doc/index.rst
index 7d5621853f4..79e73a591d8 100644
--- a/boards/arc/em_starterkit/doc/index.rst
+++ b/boards/arc/em_starterkit/doc/index.rst
@@ -12,8 +12,7 @@ for the ARC EM Family of processors. The EM Family includes the EM4, EM6,
 EM5D, EM7D, EM9D, and EM11D cores. The Zephyr RTOS can be used with the
 EM Starter Kit.
 
-.. image:: ./em_starterkit.jpg
-   :width: 442px
+.. image:: em_starterkit.jpg
    :align: center
    :alt: DesignWare(R) ARC(R) EM Starter Kit (synopsys.com)
 
diff --git a/boards/arc/emsdp/doc/emsdp.jpg b/boards/arc/emsdp/doc/emsdp.jpg
index b017453a520..7c22b530ffa 100644
Binary files a/boards/arc/emsdp/doc/emsdp.jpg and b/boards/arc/emsdp/doc/emsdp.jpg differ
diff --git a/boards/arc/emsdp/doc/index.rst b/boards/arc/emsdp/doc/index.rst
index 6bda0a943a6..664035dacd2 100644
--- a/boards/arc/emsdp/doc/index.rst
+++ b/boards/arc/emsdp/doc/index.rst
@@ -12,8 +12,7 @@ to accelerate software development and debug of ARC EM processors and subsystems
 a wide range of ultra-low power embedded applications such as IoT, sensor fusion,
 and voice applications.
 
-.. image:: ./emsdp.jpg
-   :width: 650px
+.. image:: emsdp.jpg
    :align: center
    :alt: DesignWare(R) ARC(R) EM Software Development Platform (synopsys.com)
 
diff --git a/boards/arc/hsdk/doc/arduino_shield_interface.jpg b/boards/arc/hsdk/doc/arduino_shield_interface.jpg
index 7f0c509de9a..12efeece84a 100644
Binary files a/boards/arc/hsdk/doc/arduino_shield_interface.jpg and b/boards/arc/hsdk/doc/arduino_shield_interface.jpg differ
diff --git a/boards/arc/hsdk/doc/hsdk.jpg b/boards/arc/hsdk/doc/hsdk.jpg
index afee5ff6e39..3c7e595747c 100644
Binary files a/boards/arc/hsdk/doc/hsdk.jpg and b/boards/arc/hsdk/doc/hsdk.jpg differ
diff --git a/boards/arc/hsdk/doc/index.rst b/boards/arc/hsdk/doc/index.rst
index 27d9d11bf23..5d5fb1aa521 100644
--- a/boards/arc/hsdk/doc/index.rst
+++ b/boards/arc/hsdk/doc/index.rst
@@ -14,8 +14,7 @@ UART, I2S, ADC, PWM and GPIO. A Vivante GPU is also contained in the ARC
 Development System SoC. This allows developers to build and debug complex
 software on a comprehensive hardware platform
 
-.. image:: ./hsdk.jpg
-   :width: 650px
+.. image:: hsdk.jpg
    :align: center
    :alt: DesignWare(R) ARC(R) HS Development Kit (synopsys.com)
 
@@ -110,8 +109,7 @@ The functionality of the Pmod connectors is programmable and includes GPIO, UART
 The location of the pins on the Pmod connectors is shown in Figure below. Detailed pin descriptions
 depending on the pin multiplexer settings are provided in the subsequent sections.
 
-.. image:: ./pinout_diagram_of_the_pmod.jpg
-   :width: 442px
+.. image:: pinout_diagram_of_the_pmod.jpg
    :align: center
    :alt: Pinout Diagram of the Pmod
 
@@ -211,8 +209,7 @@ Mikrobus
 The ARC HSDK features a set of MikroBUS headers. Figure below shows the relevant function assignments,
 fully compatible with the MikroBUS standard. Table below shows the pin assignment on the I/O Multiplexer.
 
-.. image:: ./mikrobus_header.jpg
-   :width: 650px
+.. image:: mikrobus_header.jpg
    :align: center
    :alt: mikrobus header
 
@@ -246,8 +243,7 @@ the ARC HSDK board is fixed to 3V3. Note that the ICSP header is also not availa
 shields do not require this ICSP header as the SPI master interface on this ICSP header
 is also available on the IO10 to IO13 pins.
 
-.. image:: ./arduino_shield_interface.jpg
-   :width: 442px
+.. image:: arduino_shield_interface.jpg
    :align: center
    :alt: arduino shield interface
 
diff --git a/boards/arc/hsdk/doc/mikrobus_header.jpg b/boards/arc/hsdk/doc/mikrobus_header.jpg
index 410e8b27685..ae95d586d35 100644
Binary files a/boards/arc/hsdk/doc/mikrobus_header.jpg and b/boards/arc/hsdk/doc/mikrobus_header.jpg differ
diff --git a/boards/arc/hsdk/doc/pinout_diagram_of_the_pmod.jpg b/boards/arc/hsdk/doc/pinout_diagram_of_the_pmod.jpg
index 616ec960426..8e2b8a3f6d1 100644
Binary files a/boards/arc/hsdk/doc/pinout_diagram_of_the_pmod.jpg and b/boards/arc/hsdk/doc/pinout_diagram_of_the_pmod.jpg differ
diff --git a/boards/arc/iotdk/doc/index.rst b/boards/arc/iotdk/doc/index.rst
index 951ca8b8513..e3fd707f9ad 100644
--- a/boards/arc/iotdk/doc/index.rst
+++ b/boards/arc/iotdk/doc/index.rst
@@ -14,8 +14,7 @@ implementation of the ARC Data Fusion IP Subsystem running at 144 MHz on
 SMIC's 55-nm ultra-low power process, and a rich set of peripherals commonly
 used in IoT designs such as USB, UART, SPI, I2C, PWM, SDIO, and ADCs.
 
-.. image:: ./iotdk.jpg
-   :width: 650px
+.. image:: iotdk.jpg
    :align: center
    :alt: DesignWare(R) ARC(R)IoT Development Kit (synopsys.com)
 
diff --git a/boards/arc/iotdk/doc/iotdk.jpg b/boards/arc/iotdk/doc/iotdk.jpg
index 10fa3e0f58c..d06de1c7c8c 100644
Binary files a/boards/arc/iotdk/doc/iotdk.jpg and b/boards/arc/iotdk/doc/iotdk.jpg differ
diff --git a/boards/arm/96b_aerocore2/doc/img/96b_aerocore2.jpg b/boards/arm/96b_aerocore2/doc/img/96b_aerocore2.jpg
index 08a3f6768f2..175fe31899b 100644
Binary files a/boards/arm/96b_aerocore2/doc/img/96b_aerocore2.jpg and b/boards/arm/96b_aerocore2/doc/img/96b_aerocore2.jpg differ
diff --git a/boards/arm/96b_aerocore2/doc/index.rst b/boards/arm/96b_aerocore2/doc/index.rst
index aa8661b577d..fbfee1f0081 100644
--- a/boards/arm/96b_aerocore2/doc/index.rst
+++ b/boards/arm/96b_aerocore2/doc/index.rst
@@ -13,7 +13,6 @@ boards. It can also be used as a standalone board.
 
 
 .. figure:: img/96b_aerocore2.jpg
-     :width: 487px
      :align: center
      :alt: 96Boards Aerocore2
 
diff --git a/boards/arm/96b_argonkey/doc/img/96b_argonkey.jpg b/boards/arm/96b_argonkey/doc/img/96b_argonkey.jpg
index 69987e482a4..e5ddc9df956 100644
Binary files a/boards/arm/96b_argonkey/doc/img/96b_argonkey.jpg and b/boards/arm/96b_argonkey/doc/img/96b_argonkey.jpg differ
diff --git a/boards/arm/96b_argonkey/doc/index.rst b/boards/arm/96b_argonkey/doc/index.rst
index 98a67b5b674..0cbed592156 100644
--- a/boards/arm/96b_argonkey/doc/index.rst
+++ b/boards/arm/96b_argonkey/doc/index.rst
@@ -13,9 +13,7 @@ This board acts as a sensor hub platform for all 96Boards compliant
 family products. It can also be used as a standalone board.
 
 .. figure:: img/96b_argonkey.jpg
-     :width: 540px
      :align: center
-     :height: 558px
      :alt: 96Boards Argonkey
 
      96Boards Argonkey
diff --git a/boards/arm/96b_avenger96/doc/img/96b_avenger96.jpg b/boards/arm/96b_avenger96/doc/img/96b_avenger96.jpg
new file mode 100644
index 00000000000..2df3664bfef
Binary files /dev/null and b/boards/arm/96b_avenger96/doc/img/96b_avenger96.jpg differ
diff --git a/boards/arm/96b_avenger96/doc/img/96b_avenger96.png b/boards/arm/96b_avenger96/doc/img/96b_avenger96.png
deleted file mode 100644
index 4c509bc9278..00000000000
Binary files a/boards/arm/96b_avenger96/doc/img/96b_avenger96.png and /dev/null differ
diff --git a/boards/arm/96b_avenger96/doc/index.rst b/boards/arm/96b_avenger96/doc/index.rst
index cf085d90c9d..de7e1393182 100644
--- a/boards/arm/96b_avenger96/doc/index.rst
+++ b/boards/arm/96b_avenger96/doc/index.rst
@@ -41,10 +41,8 @@ core. Zephyr OS is ported to run on the Cortex®-M4 core.
     - 1x Yellow WiFi LED
     - 1x Red power supply LED
 
-.. image:: img/96b_avenger96.png
-     :width: 1027px
+.. image:: img/96b_avenger96.jpg
      :align: center
-     :height: 1217px
      :alt: 96Boards Avenger96
 
 More information about the board can be found at the
diff --git a/boards/arm/96b_carbon/doc/img/96b_carbon.jpg b/boards/arm/96b_carbon/doc/img/96b_carbon.jpg
new file mode 100644
index 00000000000..9f9bd49fac5
Binary files /dev/null and b/boards/arm/96b_carbon/doc/img/96b_carbon.jpg differ
diff --git a/boards/arm/96b_carbon/doc/img/96b_carbon.png b/boards/arm/96b_carbon/doc/img/96b_carbon.png
deleted file mode 100644
index 2c27def9aef..00000000000
Binary files a/boards/arm/96b_carbon/doc/img/96b_carbon.png and /dev/null differ
diff --git a/boards/arm/96b_carbon/doc/index.rst b/boards/arm/96b_carbon/doc/index.rst
index 520d84393b8..608e77e2b42 100644
--- a/boards/arm/96b_carbon/doc/index.rst
+++ b/boards/arm/96b_carbon/doc/index.rst
@@ -35,8 +35,7 @@ After you have flashed your nRF51, you can perform basic validation
 of this Bluetooth setup using the instructions
 :ref:`below <96b_carbon_verify_bluetooth>`.
 
-.. figure:: img/96b_carbon.png
-     :width: 487px
+.. figure:: img/96b_carbon.jpg
      :align: center
      :alt: 96Boards Carbon
 
diff --git a/boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.jpg b/boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.jpg
new file mode 100644
index 00000000000..9833a9ebab4
Binary files /dev/null and b/boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.jpg differ
diff --git a/boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.png b/boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.png
deleted file mode 100644
index d233d097e31..00000000000
Binary files a/boards/arm/96b_carbon_nrf51/doc/img/96b_carbon_nrf51.png and /dev/null differ
diff --git a/boards/arm/96b_carbon_nrf51/doc/index.rst b/boards/arm/96b_carbon_nrf51/doc/index.rst
index 89fdbb44f54..5a17733d35f 100644
--- a/boards/arm/96b_carbon_nrf51/doc/index.rst
+++ b/boards/arm/96b_carbon_nrf51/doc/index.rst
@@ -83,7 +83,7 @@ debugger, via the debug header labeled "BLE" on the board's
 silkscreen. The header is not populated; 0.1" male header must be
 soldered on first.
 
-.. figure:: img/96b_carbon_nrf51.png
+.. figure:: img/96b_carbon_nrf51.jpg
      :align: center
      :alt: 96Boards Carbon nRF51 Debug
 
diff --git a/boards/arm/96b_meerkat96/doc/img/96b_meerkat96.jpg b/boards/arm/96b_meerkat96/doc/img/96b_meerkat96.jpg
index 5be76a5105f..fcb7c11b9c3 100644
Binary files a/boards/arm/96b_meerkat96/doc/img/96b_meerkat96.jpg and b/boards/arm/96b_meerkat96/doc/img/96b_meerkat96.jpg differ
diff --git a/boards/arm/96b_neonkey/doc/img/96b_neonkey.jpg b/boards/arm/96b_neonkey/doc/img/96b_neonkey.jpg
index 4ee87e56394..17e7f4bf969 100644
Binary files a/boards/arm/96b_neonkey/doc/img/96b_neonkey.jpg and b/boards/arm/96b_neonkey/doc/img/96b_neonkey.jpg differ
diff --git a/boards/arm/96b_neonkey/doc/index.rst b/boards/arm/96b_neonkey/doc/index.rst
index d530f6916eb..8f0311259e1 100644
--- a/boards/arm/96b_neonkey/doc/index.rst
+++ b/boards/arm/96b_neonkey/doc/index.rst
@@ -10,9 +10,7 @@ Overview
 Cortex M4 CPU.
 
 .. figure:: img/96b_neonkey.jpg
-     :width: 500px
      :align: center
-     :height: 330px
      :alt: 96Boards Neonkey
 
      96Boards Neonkey
diff --git a/boards/arm/96b_nitrogen/doc/img/96b_nitrogen.jpg b/boards/arm/96b_nitrogen/doc/img/96b_nitrogen.jpg
new file mode 100644
index 00000000000..69e2df3345b
Binary files /dev/null and b/boards/arm/96b_nitrogen/doc/img/96b_nitrogen.jpg differ
diff --git a/boards/arm/96b_nitrogen/doc/img/96b_nitrogen.png b/boards/arm/96b_nitrogen/doc/img/96b_nitrogen.png
deleted file mode 100644
index fc28794a5d4..00000000000
Binary files a/boards/arm/96b_nitrogen/doc/img/96b_nitrogen.png and /dev/null differ
diff --git a/boards/arm/96b_nitrogen/doc/index.rst b/boards/arm/96b_nitrogen/doc/index.rst
index 2aeb1085ca4..86e08e96ccf 100644
--- a/boards/arm/96b_nitrogen/doc/index.rst
+++ b/boards/arm/96b_nitrogen/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The 96Boards Nitrogen hardware provides support for the Nordic Semiconductor
 nRF52832 ARM Cortex-M4F CPU.
 
-.. figure:: img/96b_nitrogen.png
-     :width: 487px
+.. figure:: img/96b_nitrogen.jpg
      :align: center
      :alt: 96Boards Nitrogen
 
diff --git a/boards/arm/96b_stm32_sensor_mez/doc/img/96b_stm32_sensor_mez.jpg b/boards/arm/96b_stm32_sensor_mez/doc/img/96b_stm32_sensor_mez.jpg
new file mode 100644
index 00000000000..b5a3383a57b
Binary files /dev/null and b/boards/arm/96b_stm32_sensor_mez/doc/img/96b_stm32_sensor_mez.jpg differ
diff --git a/boards/arm/96b_stm32_sensor_mez/doc/img/96b_stm32_sensor_mez.png b/boards/arm/96b_stm32_sensor_mez/doc/img/96b_stm32_sensor_mez.png
deleted file mode 100644
index 9609f1256b9..00000000000
Binary files a/boards/arm/96b_stm32_sensor_mez/doc/img/96b_stm32_sensor_mez.png and /dev/null differ
diff --git a/boards/arm/96b_stm32_sensor_mez/doc/index.rst b/boards/arm/96b_stm32_sensor_mez/doc/index.rst
index 5702cbd5134..1160777bb0f 100644
--- a/boards/arm/96b_stm32_sensor_mez/doc/index.rst
+++ b/boards/arm/96b_stm32_sensor_mez/doc/index.rst
@@ -12,7 +12,7 @@ STM32F446VE Cortex M4 CPU.
 This board acts as a mezzanine platform for all 96Boards CE compliant
 boards. It can also be used as a standalone board.
 
-.. figure:: img/96b_stm32_sensor_mez.png
+.. figure:: img/96b_stm32_sensor_mez.jpg
      :align: center
      :alt: 96Boards STM32 Sensor Mezzanine
 
diff --git a/boards/arm/96b_wistrio/doc/96b_wistrio.rst b/boards/arm/96b_wistrio/doc/96b_wistrio.rst
index 500e218df98..58bb3ee18b8 100644
--- a/boards/arm/96b_wistrio/doc/96b_wistrio.rst
+++ b/boards/arm/96b_wistrio/doc/96b_wistrio.rst
@@ -11,10 +11,8 @@ chipset integrating SX1276 LoRaWAN Modem, STM32L151CB-A MCU and GPS module.
 Zephyr applications use the 96b_wistrio configuration to run on these
 boards.
 
-.. figure:: img/96b-wistrio.png
-     :width: 1000px
+.. figure:: img/96b-wistrio.jpg
      :align: center
-     :height: 509px
      :alt: 96Boards WisTrio
 
      96Boards WisTrio
diff --git a/boards/arm/96b_wistrio/doc/img/96b-wistrio.jpg b/boards/arm/96b_wistrio/doc/img/96b-wistrio.jpg
new file mode 100644
index 00000000000..d45d1c22fac
Binary files /dev/null and b/boards/arm/96b_wistrio/doc/img/96b-wistrio.jpg differ
diff --git a/boards/arm/96b_wistrio/doc/img/96b-wistrio.png b/boards/arm/96b_wistrio/doc/img/96b-wistrio.png
deleted file mode 100644
index be1d14d55cc..00000000000
Binary files a/boards/arm/96b_wistrio/doc/img/96b-wistrio.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus/doc/img/Icarus_front.jpg b/boards/arm/actinius_icarus/doc/img/Icarus_front.jpg
new file mode 100644
index 00000000000..40ee6259a33
Binary files /dev/null and b/boards/arm/actinius_icarus/doc/img/Icarus_front.jpg differ
diff --git a/boards/arm/actinius_icarus/doc/img/Icarus_front.png b/boards/arm/actinius_icarus/doc/img/Icarus_front.png
deleted file mode 100644
index 4534a5c922e..00000000000
Binary files a/boards/arm/actinius_icarus/doc/img/Icarus_front.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus/doc/img/Icarus_pinouts.jpg b/boards/arm/actinius_icarus/doc/img/Icarus_pinouts.jpg
new file mode 100644
index 00000000000..629dae3ffb3
Binary files /dev/null and b/boards/arm/actinius_icarus/doc/img/Icarus_pinouts.jpg differ
diff --git a/boards/arm/actinius_icarus/doc/img/Icarus_pinouts.png b/boards/arm/actinius_icarus/doc/img/Icarus_pinouts.png
deleted file mode 100644
index 39540528a22..00000000000
Binary files a/boards/arm/actinius_icarus/doc/img/Icarus_pinouts.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus/doc/index.rst b/boards/arm/actinius_icarus/doc/index.rst
index a9ce297fbad..7f040e6630e 100644
--- a/boards/arm/actinius_icarus/doc/index.rst
+++ b/boards/arm/actinius_icarus/doc/index.rst
@@ -6,8 +6,7 @@ Actinius Icarus
 Overview
 ********
 
-.. figure:: img/Icarus_front.png
-     :width: 450px
+.. figure:: img/Icarus_front.jpg
      :align: center
      :alt: Icarus IoT Dev Board
 
@@ -42,8 +41,7 @@ Hardware
 
 The detailed information about the on-board hardware can be found at the `Icarus Product Website`_.
 
-.. figure:: img/Icarus_pinouts.png
-     :width: 450px
+.. figure:: img/Icarus_pinouts.jpg
      :align: center
      :alt: Icarus IoT Dev Board w/ Pinouts
 
diff --git a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg
new file mode 100644
index 00000000000..fd68bd7fe67
Binary files /dev/null and b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg differ
diff --git a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.png b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.png
deleted file mode 100644
index 3bda407f10d..00000000000
Binary files a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-external-pins.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg
new file mode 100644
index 00000000000..aa8efe902b4
Binary files /dev/null and b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg differ
diff --git a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.png b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.png
deleted file mode 100644
index 0ff49c8519c..00000000000
Binary files a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee.jpg b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee.jpg
new file mode 100644
index 00000000000..edb843c6a46
Binary files /dev/null and b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee.jpg differ
diff --git a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee.png b/boards/arm/actinius_icarus_bee/doc/img/icarus-bee.png
deleted file mode 100644
index 09626c4a0fe..00000000000
Binary files a/boards/arm/actinius_icarus_bee/doc/img/icarus-bee.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus_bee/doc/index.rst b/boards/arm/actinius_icarus_bee/doc/index.rst
index 159dad93473..b6d166900aa 100644
--- a/boards/arm/actinius_icarus_bee/doc/index.rst
+++ b/boards/arm/actinius_icarus_bee/doc/index.rst
@@ -6,8 +6,7 @@ Actinius Icarus Bee
 Overview
 ********
 
-.. figure:: img/icarus-bee.png
-     :width: 450px
+.. figure:: img/icarus-bee.jpg
      :align: center
      :alt: Icarus Bee
 
@@ -37,15 +36,13 @@ following devices (provided directly by Nordic):
 * :abbr:`WDT (Watchdog Timer)`
 * :abbr:`IDAU (Implementation Defined Attribution Unit)`
 
-.. figure:: img/icarus-bee-external-pins.png
-     :width: 450px
+.. figure:: img/icarus-bee-external-pins.jpg
      :align: center
      :alt: Icarus Bee w/ Pinouts
 
      Icarus Bee w/ Pinouts
 
-.. figure:: img/icarus-bee-peripherals-pins.png
-     :width: 200px
+.. figure:: img/icarus-bee-peripherals-pins.jpg
      :align: center
      :alt: Icarus Bee
 
diff --git a/boards/arm/actinius_icarus_som/doc/img/icarus-som-external-pins.jpg b/boards/arm/actinius_icarus_som/doc/img/icarus-som-external-pins.jpg
new file mode 100644
index 00000000000..4492de2a932
Binary files /dev/null and b/boards/arm/actinius_icarus_som/doc/img/icarus-som-external-pins.jpg differ
diff --git a/boards/arm/actinius_icarus_som/doc/img/icarus-som-external-pins.png b/boards/arm/actinius_icarus_som/doc/img/icarus-som-external-pins.png
deleted file mode 100644
index 910471fc267..00000000000
Binary files a/boards/arm/actinius_icarus_som/doc/img/icarus-som-external-pins.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.jpg b/boards/arm/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.jpg
new file mode 100644
index 00000000000..0fe6a2e56e9
Binary files /dev/null and b/boards/arm/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.jpg differ
diff --git a/boards/arm/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.png b/boards/arm/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.png
deleted file mode 100644
index 0b5fca9f971..00000000000
Binary files a/boards/arm/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus_som/doc/img/icarus-som.jpg b/boards/arm/actinius_icarus_som/doc/img/icarus-som.jpg
new file mode 100644
index 00000000000..a48d455ee5b
Binary files /dev/null and b/boards/arm/actinius_icarus_som/doc/img/icarus-som.jpg differ
diff --git a/boards/arm/actinius_icarus_som/doc/img/icarus-som.png b/boards/arm/actinius_icarus_som/doc/img/icarus-som.png
deleted file mode 100644
index 36b583bac2b..00000000000
Binary files a/boards/arm/actinius_icarus_som/doc/img/icarus-som.png and /dev/null differ
diff --git a/boards/arm/actinius_icarus_som/doc/index.rst b/boards/arm/actinius_icarus_som/doc/index.rst
index 3426ac00520..6c22d627e11 100644
--- a/boards/arm/actinius_icarus_som/doc/index.rst
+++ b/boards/arm/actinius_icarus_som/doc/index.rst
@@ -6,8 +6,7 @@ Actinius Icarus SoM
 Overview
 ********
 
-.. figure:: img/icarus-som.png
-     :width: 450px
+.. figure:: img/icarus-som.jpg
      :align: center
      :alt: Icarus SoM
 
@@ -37,15 +36,13 @@ following devices (provided directly by Nordic):
 * :abbr:`WDT (Watchdog Timer)`
 * :abbr:`IDAU (Implementation Defined Attribution Unit)`
 
-.. figure:: img/icarus-som-external-pins.png
-     :width: 450px
+.. figure:: img/icarus-som-external-pins.jpg
      :align: center
      :alt: Icarus SoM Pins
 
      Icarus SoM Pins
 
-.. figure:: img/icarus-som-peripherals-pins.png
-     :width: 200px
+.. figure:: img/icarus-som-peripherals-pins.jpg
      :align: center
      :alt: Icarus SoM
 
diff --git a/boards/arm/adafruit_feather_m0_basic_proto/doc/img/adafruit_feather_m0_basic_proto.jpg b/boards/arm/adafruit_feather_m0_basic_proto/doc/img/adafruit_feather_m0_basic_proto.jpg
index 6a806da2ee0..de8afcbed2a 100644
Binary files a/boards/arm/adafruit_feather_m0_basic_proto/doc/img/adafruit_feather_m0_basic_proto.jpg and b/boards/arm/adafruit_feather_m0_basic_proto/doc/img/adafruit_feather_m0_basic_proto.jpg differ
diff --git a/boards/arm/adafruit_feather_m0_basic_proto/doc/index.rst b/boards/arm/adafruit_feather_m0_basic_proto/doc/index.rst
index 2344e200383..680de554fbb 100644
--- a/boards/arm/adafruit_feather_m0_basic_proto/doc/index.rst
+++ b/boards/arm/adafruit_feather_m0_basic_proto/doc/index.rst
@@ -12,7 +12,6 @@ polymer batteries, charging status indicator and user LEDs, native USB
 connector, 20 I/O pins, and a small prototyping area.
 
 .. image:: img/adafruit_feather_m0_basic_proto.jpg
-     :width: 640px
      :align: center
      :alt: Adafruit Feather M0 Basic Proto
 
diff --git a/boards/arm/adafruit_feather_nrf52840/doc/img/adafruit_feather_nrf52840.jpg b/boards/arm/adafruit_feather_nrf52840/doc/img/adafruit_feather_nrf52840.jpg
index e83c5353d69..13c06db3487 100644
Binary files a/boards/arm/adafruit_feather_nrf52840/doc/img/adafruit_feather_nrf52840.jpg and b/boards/arm/adafruit_feather_nrf52840/doc/img/adafruit_feather_nrf52840.jpg differ
diff --git a/boards/arm/adafruit_feather_nrf52840/doc/index.rst b/boards/arm/adafruit_feather_nrf52840/doc/index.rst
index d49564a5570..6110da15dca 100644
--- a/boards/arm/adafruit_feather_nrf52840/doc/index.rst
+++ b/boards/arm/adafruit_feather_nrf52840/doc/index.rst
@@ -26,7 +26,6 @@ nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/adafruit_feather_nrf52840.jpg
-     :width: 640px
      :align: center
      :alt: Adafruit Feather nRF52840 Express
 
diff --git a/boards/arm/adafruit_feather_stm32f405/doc/img/adafruit_feather_stm32f405.jpg b/boards/arm/adafruit_feather_stm32f405/doc/img/adafruit_feather_stm32f405.jpg
index 139237bcfe5..ed95a309014 100644
Binary files a/boards/arm/adafruit_feather_stm32f405/doc/img/adafruit_feather_stm32f405.jpg and b/boards/arm/adafruit_feather_stm32f405/doc/img/adafruit_feather_stm32f405.jpg differ
diff --git a/boards/arm/adafruit_feather_stm32f405/doc/index.rst b/boards/arm/adafruit_feather_stm32f405/doc/index.rst
index 2dcd3ce64f9..1e80ba70b49 100644
--- a/boards/arm/adafruit_feather_stm32f405/doc/index.rst
+++ b/boards/arm/adafruit_feather_stm32f405/doc/index.rst
@@ -13,7 +13,6 @@ with a lithium ion battery charger, native USB C connector, 2MB of
 external flash memory, and SD card socket.
 
 .. image:: img/adafruit_feather_stm32f405.jpg
-     :width: 640px
      :align: center
      :alt: Adafruit Feather STM32F405 Express
 
diff --git a/boards/arm/adafruit_itsybitsy_m4_express/doc/img/adafruit_itsybitsy_m4_express.jpg b/boards/arm/adafruit_itsybitsy_m4_express/doc/img/adafruit_itsybitsy_m4_express.jpg
new file mode 100644
index 00000000000..2aebf616b51
Binary files /dev/null and b/boards/arm/adafruit_itsybitsy_m4_express/doc/img/adafruit_itsybitsy_m4_express.jpg differ
diff --git a/boards/arm/adafruit_itsybitsy_m4_express/doc/img/adafruit_itsybitsy_m4_express.png b/boards/arm/adafruit_itsybitsy_m4_express/doc/img/adafruit_itsybitsy_m4_express.png
deleted file mode 100644
index ba04458e396..00000000000
Binary files a/boards/arm/adafruit_itsybitsy_m4_express/doc/img/adafruit_itsybitsy_m4_express.png and /dev/null differ
diff --git a/boards/arm/adafruit_itsybitsy_m4_express/doc/index.rst b/boards/arm/adafruit_itsybitsy_m4_express/doc/index.rst
index 06a0691d299..025a037d7f1 100644
--- a/boards/arm/adafruit_itsybitsy_m4_express/doc/index.rst
+++ b/boards/arm/adafruit_itsybitsy_m4_express/doc/index.rst
@@ -10,8 +10,7 @@ The Adafruit ItsyBitsy M4 express is a small (36 mm x 18 mm) ARM development
 board with an onboard RGB LED, USB port, 2 MiB of SPI flash, and range of I/O
 broken out onto 23 GPIO pins.
 
-.. image:: img/adafruit_itsybitsy_m4_express.png
-     :width: 500px
+.. image:: img/adafruit_itsybitsy_m4_express.jpg
      :align: center
      :alt: Adafruit ItsyBitsy M4 Express
 
diff --git a/boards/arm/adafruit_trinket_m0/doc/img/adafruit_trinket_m0.jpg b/boards/arm/adafruit_trinket_m0/doc/img/adafruit_trinket_m0.jpg
new file mode 100644
index 00000000000..f375b29ad52
Binary files /dev/null and b/boards/arm/adafruit_trinket_m0/doc/img/adafruit_trinket_m0.jpg differ
diff --git a/boards/arm/adafruit_trinket_m0/doc/img/adafruit_trinket_m0.png b/boards/arm/adafruit_trinket_m0/doc/img/adafruit_trinket_m0.png
deleted file mode 100644
index 18d623baedd..00000000000
Binary files a/boards/arm/adafruit_trinket_m0/doc/img/adafruit_trinket_m0.png and /dev/null differ
diff --git a/boards/arm/adafruit_trinket_m0/doc/index.rst b/boards/arm/adafruit_trinket_m0/doc/index.rst
index 7aeea8a6461..07b7ce428cf 100644
--- a/boards/arm/adafruit_trinket_m0/doc/index.rst
+++ b/boards/arm/adafruit_trinket_m0/doc/index.rst
@@ -10,8 +10,7 @@ The Adafruit Trinket M0 is a tiny (27 mm x 15 mm) ARM development
 board with an onboard RGB LED, USB port, and range of I/O broken out
 onto 5 pins.
 
-.. image:: img/adafruit_trinket_m0.png
-     :width: 500px
+.. image:: img/adafruit_trinket_m0.jpg
      :align: center
      :alt: Adafruit Trinket M0
 
diff --git a/boards/arm/arduino_due/doc/img/arduino_due.jpg b/boards/arm/arduino_due/doc/img/arduino_due.jpg
new file mode 100644
index 00000000000..43ea9367905
Binary files /dev/null and b/boards/arm/arduino_due/doc/img/arduino_due.jpg differ
diff --git a/boards/arm/arduino_due/doc/img/arduino_due.png b/boards/arm/arduino_due/doc/img/arduino_due.png
deleted file mode 100644
index e77472d00fa..00000000000
Binary files a/boards/arm/arduino_due/doc/img/arduino_due.png and /dev/null differ
diff --git a/boards/arm/arduino_due/doc/index.rst b/boards/arm/arduino_due/doc/index.rst
index 53c34ce3d5a..f607298e133 100644
--- a/boards/arm/arduino_due/doc/index.rst
+++ b/boards/arm/arduino_due/doc/index.rst
@@ -23,8 +23,7 @@ the processor.
 .. note::
    This configuration is not supported by Arduino.
 
-.. image:: img/arduino_due.png
-     :width: 500px
+.. image:: img/arduino_due.jpg
      :align: center
      :alt: Arduino Due
 
diff --git a/boards/arm/arduino_mkrzero/doc/img/arduino_mkrzero.jpg b/boards/arm/arduino_mkrzero/doc/img/arduino_mkrzero.jpg
new file mode 100644
index 00000000000..78ca006568d
Binary files /dev/null and b/boards/arm/arduino_mkrzero/doc/img/arduino_mkrzero.jpg differ
diff --git a/boards/arm/arduino_mkrzero/doc/img/arduino_mkrzero.png b/boards/arm/arduino_mkrzero/doc/img/arduino_mkrzero.png
deleted file mode 100644
index e563973734b..00000000000
Binary files a/boards/arm/arduino_mkrzero/doc/img/arduino_mkrzero.png and /dev/null differ
diff --git a/boards/arm/arduino_mkrzero/doc/index.rst b/boards/arm/arduino_mkrzero/doc/index.rst
index 145269220d8..3df9ea49d19 100644
--- a/boards/arm/arduino_mkrzero/doc/index.rst
+++ b/boards/arm/arduino_mkrzero/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The Arduino MKR Zero built with smaller MKR form factor and powered by Atmel's SAMD21 MCU.
 This board come with microSD card holder that allows you to play with music files with no extra hardware.
 
-.. image:: img/arduino_mkrzero.png
-     :width: 250px
+.. image:: img/arduino_mkrzero.jpg
      :align: center
      :alt: Arduino MKR Zero
 
diff --git a/boards/arm/arduino_nano_33_ble/doc/img/arduino_nano_33_ble_sense.jpg b/boards/arm/arduino_nano_33_ble/doc/img/arduino_nano_33_ble_sense.jpg
new file mode 100644
index 00000000000..e903d7904ff
Binary files /dev/null and b/boards/arm/arduino_nano_33_ble/doc/img/arduino_nano_33_ble_sense.jpg differ
diff --git a/boards/arm/arduino_nano_33_ble/doc/img/arduino_nano_33_ble_sense.png b/boards/arm/arduino_nano_33_ble/doc/img/arduino_nano_33_ble_sense.png
deleted file mode 100644
index ff68d973060..00000000000
Binary files a/boards/arm/arduino_nano_33_ble/doc/img/arduino_nano_33_ble_sense.png and /dev/null differ
diff --git a/boards/arm/arduino_nano_33_ble/doc/index.rst b/boards/arm/arduino_nano_33_ble/doc/index.rst
index 28cf8eef559..47a0bd124a1 100644
--- a/boards/arm/arduino_nano_33_ble/doc/index.rst
+++ b/boards/arm/arduino_nano_33_ble/doc/index.rst
@@ -11,8 +11,7 @@ nRF52840 ARM Cortex-M4F CPU. Arduino sells 2 variants of the board, the
 plain `BLE`_ type and the `BLE Sense`_ type. The "Sense" variant is distinguished by
 the inclusion of more sensors, but otherwise both variants are the same.
 
-.. image:: img/arduino_nano_33_ble_sense.png
-     :width: 500px
+.. image:: img/arduino_nano_33_ble_sense.jpg
      :align: center
      :alt: Arduino Nano 33 BLE (Sense variant)
 
diff --git a/boards/arm/arduino_nano_33_iot/doc/img/nano_33_iot.jpg b/boards/arm/arduino_nano_33_iot/doc/img/nano_33_iot.jpg
new file mode 100644
index 00000000000..adc9e7e02f9
Binary files /dev/null and b/boards/arm/arduino_nano_33_iot/doc/img/nano_33_iot.jpg differ
diff --git a/boards/arm/arduino_nano_33_iot/doc/img/nano_33_iot.png b/boards/arm/arduino_nano_33_iot/doc/img/nano_33_iot.png
deleted file mode 100644
index d5beace56dd..00000000000
Binary files a/boards/arm/arduino_nano_33_iot/doc/img/nano_33_iot.png and /dev/null differ
diff --git a/boards/arm/arduino_nano_33_iot/doc/index.rst b/boards/arm/arduino_nano_33_iot/doc/index.rst
index 51b41165196..64e89e717f5 100644
--- a/boards/arm/arduino_nano_33_iot/doc/index.rst
+++ b/boards/arm/arduino_nano_33_iot/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The Arduino Nano 33 IOT is a a small form factor development board with USB,
 Wifi, Bluetooth, a 6 axis IMU, and secure element.
 
-.. image:: img/nano_33_iot.png
-     :width: 500px
+.. image:: img/nano_33_iot.jpg
      :align: center
      :alt: Arduino Nano 33 IOT
 
diff --git a/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me.jpg b/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me.jpg
new file mode 100644
index 00000000000..122e8ac4440
Binary files /dev/null and b/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me.jpg differ
diff --git a/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me.png b/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me.png
deleted file mode 100644
index 311062784a1..00000000000
Binary files a/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me.png and /dev/null differ
diff --git a/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me_pinout.jpg b/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me_pinout.jpg
new file mode 100644
index 00000000000..3886dc9d57a
Binary files /dev/null and b/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me_pinout.jpg differ
diff --git a/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me_pinout.png b/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me_pinout.png
deleted file mode 100644
index 76447d4f7d0..00000000000
Binary files a/boards/arm/arduino_nicla_sense_me/doc/arduino_nicla_sense_me_pinout.png and /dev/null differ
diff --git a/boards/arm/arduino_nicla_sense_me/doc/index.rst b/boards/arm/arduino_nicla_sense_me/doc/index.rst
index 279493b19f2..1c8ad554c34 100644
--- a/boards/arm/arduino_nicla_sense_me/doc/index.rst
+++ b/boards/arm/arduino_nicla_sense_me/doc/index.rst
@@ -10,8 +10,7 @@ nrf52832 ARM Cortex-M4F CPU. The board houses 4 low power industrial grade senso
 that can measure rotation, acceleration, pressure, humidity, temperature, air quality
 and CO2 levels.
 
-.. figure:: arduino_nicla_sense_me.png
-   :width: 500px
+.. figure:: arduino_nicla_sense_me.jpg
    :align: center
    :alt: Arduino Nicla Sense ME
 
@@ -75,10 +74,8 @@ Connections and IOs
 
 Available pins:
 ---------------
-.. figure:: arduino_nicla_sense_me_pinout.png
-   :width: 500px
+.. figure:: arduino_nicla_sense_me_pinout.jpg
    :align: center
-   :height: 500px
    :alt: Arduino Nicla Sense ME pinout
 
    Arduino Nicla Sense ME pinout (Credit: Arduino)
diff --git a/boards/arm/arduino_zero/doc/img/arduino_zero.jpg b/boards/arm/arduino_zero/doc/img/arduino_zero.jpg
new file mode 100644
index 00000000000..aa1f1065b55
Binary files /dev/null and b/boards/arm/arduino_zero/doc/img/arduino_zero.jpg differ
diff --git a/boards/arm/arduino_zero/doc/img/arduino_zero.png b/boards/arm/arduino_zero/doc/img/arduino_zero.png
deleted file mode 100644
index 20d38564833..00000000000
Binary files a/boards/arm/arduino_zero/doc/img/arduino_zero.png and /dev/null differ
diff --git a/boards/arm/arduino_zero/doc/index.rst b/boards/arm/arduino_zero/doc/index.rst
index 1952c3fd28a..c178c2e5377 100644
--- a/boards/arm/arduino_zero/doc/index.rst
+++ b/boards/arm/arduino_zero/doc/index.rst
@@ -10,8 +10,7 @@ The Arduino Zero is a maker-friendly development board with
 Atmel’s Embedded Debugger (EDBG), which provides a full
 debug interface without the need for additional hardware.
 
-.. image:: img/arduino_zero.png
-     :width: 500px
+.. image:: img/arduino_zero.jpg
      :align: center
      :alt: Arduino Zero
 
diff --git a/boards/arm/arty/doc/arty_a7-35.jpg b/boards/arm/arty/doc/arty_a7-35.jpg
new file mode 100644
index 00000000000..1fb25d59b9d
Binary files /dev/null and b/boards/arm/arty/doc/arty_a7-35.jpg differ
diff --git a/boards/arm/arty/doc/arty_a7-35.png b/boards/arm/arty/doc/arty_a7-35.png
deleted file mode 100644
index 99d11a76774..00000000000
Binary files a/boards/arm/arty/doc/arty_a7-35.png and /dev/null differ
diff --git a/boards/arm/arty/doc/index.rst b/boards/arm/arty/doc/index.rst
index 57ca26e03d4..58f0e467f6c 100644
--- a/boards/arm/arty/doc/index.rst
+++ b/boards/arm/arty/doc/index.rst
@@ -14,8 +14,7 @@ Each board is equipped with on-board JTAG for FPGA programming and debugging,
 LEDs, switches, buttons, DDR3 RAM, and QSPI flash for storing the FPGA
 bitstream.
 
-.. figure:: ./arty_a7-35.png
-   :width: 500px
+.. figure:: arty_a7-35.jpg
    :align: center
    :alt: Digilent Arty A7-35
 
diff --git a/boards/arm/ast1030_evb/doc/ast1030_evb.jpg b/boards/arm/ast1030_evb/doc/ast1030_evb.jpg
new file mode 100644
index 00000000000..e4a0226461a
Binary files /dev/null and b/boards/arm/ast1030_evb/doc/ast1030_evb.jpg differ
diff --git a/boards/arm/ast1030_evb/doc/ast1030_evb.png b/boards/arm/ast1030_evb/doc/ast1030_evb.png
deleted file mode 100644
index 92929bd11d7..00000000000
Binary files a/boards/arm/ast1030_evb/doc/ast1030_evb.png and /dev/null differ
diff --git a/boards/arm/ast1030_evb/doc/index.rst b/boards/arm/ast1030_evb/doc/index.rst
index fd917c709d6..0e00488b727 100644
--- a/boards/arm/ast1030_evb/doc/index.rst
+++ b/boards/arm/ast1030_evb/doc/index.rst
@@ -10,8 +10,7 @@ The AST1030_EVB kit is a development platform to evaluate the
 Aspeed AST10x0 series SOCs. This board needs to be mated with
 part number AST1030.
 
-.. image:: ./ast1030_evb.png
-     :width: 800px
+.. image:: ast1030_evb.jpg
      :align: center
      :alt: AST1030 Evaluation Board
 
diff --git a/boards/arm/atsamd20_xpro/doc/img/atsamd20_xpro.jpg b/boards/arm/atsamd20_xpro/doc/img/atsamd20_xpro.jpg
index 507eb13b025..27f88fa728f 100644
Binary files a/boards/arm/atsamd20_xpro/doc/img/atsamd20_xpro.jpg and b/boards/arm/atsamd20_xpro/doc/img/atsamd20_xpro.jpg differ
diff --git a/boards/arm/atsamd20_xpro/doc/index.rst b/boards/arm/atsamd20_xpro/doc/index.rst
index de5adc3639d..fee9662bed4 100644
--- a/boards/arm/atsamd20_xpro/doc/index.rst
+++ b/boards/arm/atsamd20_xpro/doc/index.rst
@@ -13,7 +13,6 @@ which provides a full debug interface without the need for additional
 hardware.
 
 .. image:: img/atsamd20_xpro.jpg
-     :width: 500px
      :align: center
      :alt: ATSAMD20-XPRO
 
diff --git a/boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO-pinout.jpg b/boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO-pinout.jpg
new file mode 100644
index 00000000000..e9b3e44de8a
Binary files /dev/null and b/boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO-pinout.jpg differ
diff --git a/boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO-pinout.png b/boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO-pinout.png
deleted file mode 100644
index da729dedf63..00000000000
Binary files a/boards/arm/atsamd21_xpro/doc/img/ATSAMD21-XPRO-pinout.png and /dev/null differ
diff --git a/boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.jpg b/boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.jpg
new file mode 100644
index 00000000000..506174c26d6
Binary files /dev/null and b/boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.jpg differ
diff --git a/boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.png b/boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.png
deleted file mode 100644
index 6b379a5a6e7..00000000000
Binary files a/boards/arm/atsamd21_xpro/doc/img/atsamd21_xpro.png and /dev/null differ
diff --git a/boards/arm/atsamd21_xpro/doc/index.rst b/boards/arm/atsamd21_xpro/doc/index.rst
index cfc056b0cc7..c1443191cba 100644
--- a/boards/arm/atsamd21_xpro/doc/index.rst
+++ b/boards/arm/atsamd21_xpro/doc/index.rst
@@ -12,8 +12,7 @@ microcontrollers. The kit includes Atmel’s Embedded Debugger (EDBG),
 which provides a full debug interface without the need for additional
 hardware.
 
-.. image:: img/atsamd21_xpro.png
-     :width: 500px
+.. image:: img/atsamd21_xpro.jpg
      :align: center
      :alt: ATSAMD21-XPRO
 
@@ -72,8 +71,7 @@ controllers are responsible for pin muxing, input/output, pull-up, etc.
 For mode details please refer to `SAM D21 Family Datasheet`_ and the `SAM D21
 Xplained Pro Schematic`_.
 
-.. image:: img/ATSAMD21-XPRO-pinout.png
-     :width: 500px
+.. image:: img/ATSAMD21-XPRO-pinout.jpg
      :align: center
      :alt: ATSAMD21-XPRO-pinout
 
diff --git a/boards/arm/atsame54_xpro/doc/img/ATSAME54-XPRO-pinout.jpg b/boards/arm/atsame54_xpro/doc/img/ATSAME54-XPRO-pinout.jpg
new file mode 100644
index 00000000000..a15a990c261
Binary files /dev/null and b/boards/arm/atsame54_xpro/doc/img/ATSAME54-XPRO-pinout.jpg differ
diff --git a/boards/arm/atsame54_xpro/doc/img/ATSAME54-XPRO-pinout.png b/boards/arm/atsame54_xpro/doc/img/ATSAME54-XPRO-pinout.png
deleted file mode 100644
index d9809aa771a..00000000000
Binary files a/boards/arm/atsame54_xpro/doc/img/ATSAME54-XPRO-pinout.png and /dev/null differ
diff --git a/boards/arm/atsame54_xpro/doc/img/atsame54_xpro.jpg b/boards/arm/atsame54_xpro/doc/img/atsame54_xpro.jpg
new file mode 100644
index 00000000000..ca493cc2ef2
Binary files /dev/null and b/boards/arm/atsame54_xpro/doc/img/atsame54_xpro.jpg differ
diff --git a/boards/arm/atsame54_xpro/doc/img/atsame54_xpro.png b/boards/arm/atsame54_xpro/doc/img/atsame54_xpro.png
deleted file mode 100644
index 3fae378ae31..00000000000
Binary files a/boards/arm/atsame54_xpro/doc/img/atsame54_xpro.png and /dev/null differ
diff --git a/boards/arm/atsame54_xpro/doc/index.rst b/boards/arm/atsame54_xpro/doc/index.rst
index ca8e1742e83..b08c7e3e367 100644
--- a/boards/arm/atsame54_xpro/doc/index.rst
+++ b/boards/arm/atsame54_xpro/doc/index.rst
@@ -12,8 +12,7 @@ microcontrollers. The kit includes Atmel’s Embedded Debugger (EDBG),
 which provides a full debug interface without the need for additional
 hardware.
 
-.. image:: img/atsame54_xpro.png
-     :width: 500px
+.. image:: img/atsame54_xpro.jpg
      :align: center
      :alt: ATSAME54-XPRO
 
@@ -81,8 +80,7 @@ controllers are responsible for pin muxing, input/output, pull-up, etc.
 For more details please refer to `SAM D5x/E5x Family Datasheet`_ and the `SAM E54
 Xplained Pro Schematic`_.
 
-.. image:: img/ATSAME54-XPRO-pinout.png
-     :width: 500px
+.. image:: img/ATSAME54-XPRO-pinout.jpg
      :align: center
      :alt: ATSAME54-XPRO-pinout
 
diff --git a/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro-pinout.jpg b/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro-pinout.jpg
new file mode 100644
index 00000000000..a02d42090f3
Binary files /dev/null and b/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro-pinout.jpg differ
diff --git a/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro-pinout.png b/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro-pinout.png
deleted file mode 100644
index 043b328feab..00000000000
Binary files a/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro-pinout.png and /dev/null differ
diff --git a/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro.jpg b/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro.jpg
new file mode 100644
index 00000000000..6ec02a691c6
Binary files /dev/null and b/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro.jpg differ
diff --git a/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro.png b/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro.png
deleted file mode 100644
index 1f6bd108fe6..00000000000
Binary files a/boards/arm/atsaml21_xpro/doc/img/atsaml21-xpro.png and /dev/null differ
diff --git a/boards/arm/atsaml21_xpro/doc/index.rst b/boards/arm/atsaml21_xpro/doc/index.rst
index 783a4844488..2051b9efa18 100644
--- a/boards/arm/atsaml21_xpro/doc/index.rst
+++ b/boards/arm/atsaml21_xpro/doc/index.rst
@@ -12,8 +12,7 @@ microcontrollers. The kit includes Atmel’s Embedded Debugger (EDBG),
 which provides a full debug interface without the need for additional
 hardware.
 
-.. image:: img/atsaml21-xpro.png
-     :width: 500px
+.. image:: img/atsaml21-xpro.jpg
      :align: center
      :alt: ATSAML21-XPRO
 
@@ -85,8 +84,7 @@ controllers are responsible for pin muxing, input/output, pull-up, etc.
 For mode details please refer to `SAM L21 Family Datasheet`_ and the `SAM L21
 Xplained Pro Schematic`_.
 
-.. image:: img/atsaml21-xpro-pinout.png
-     :width: 500px
+.. image:: img/atsaml21-xpro-pinout.jpg
      :align: center
      :alt: ATSAML21-XPRO-pinout
 
diff --git a/boards/arm/atsamr21_xpro/doc/img/ATSAMR21-XPRO-pinout.jpg b/boards/arm/atsamr21_xpro/doc/img/ATSAMR21-XPRO-pinout.jpg
new file mode 100644
index 00000000000..c3f25b355b7
Binary files /dev/null and b/boards/arm/atsamr21_xpro/doc/img/ATSAMR21-XPRO-pinout.jpg differ
diff --git a/boards/arm/atsamr21_xpro/doc/img/ATSAMR21-XPRO-pinout.png b/boards/arm/atsamr21_xpro/doc/img/ATSAMR21-XPRO-pinout.png
deleted file mode 100644
index 28dfc525148..00000000000
Binary files a/boards/arm/atsamr21_xpro/doc/img/ATSAMR21-XPRO-pinout.png and /dev/null differ
diff --git a/boards/arm/atsamr21_xpro/doc/img/atsamr21_xpro.jpg b/boards/arm/atsamr21_xpro/doc/img/atsamr21_xpro.jpg
new file mode 100644
index 00000000000..161791d0f83
Binary files /dev/null and b/boards/arm/atsamr21_xpro/doc/img/atsamr21_xpro.jpg differ
diff --git a/boards/arm/atsamr21_xpro/doc/img/atsamr21_xpro.png b/boards/arm/atsamr21_xpro/doc/img/atsamr21_xpro.png
deleted file mode 100644
index 63a6ec2ce13..00000000000
Binary files a/boards/arm/atsamr21_xpro/doc/img/atsamr21_xpro.png and /dev/null differ
diff --git a/boards/arm/atsamr21_xpro/doc/index.rst b/boards/arm/atsamr21_xpro/doc/index.rst
index cf35140a2b7..be3bd2b4dd3 100644
--- a/boards/arm/atsamr21_xpro/doc/index.rst
+++ b/boards/arm/atsamr21_xpro/doc/index.rst
@@ -12,8 +12,7 @@ bundled with Atmel's AT86RF233, a 2.4GHz IEEE802.15.4 compatible radio.
 The kit includes Atmel’s Embedded Debugger (EDBG), which provides a full
 debug interface without the need for additional hardware.
 
-.. image:: img/atsamr21_xpro.png
-     :width: 500px
+.. image:: img/atsamr21_xpro.jpg
      :align: center
      :alt: ATSAMR21-XPRO
 
@@ -68,8 +67,7 @@ controllers are responsible for pin muxing, input/output, pull-up, etc.
 For mode details please refer to `SAM R21 Family Datasheet`_ and the `SAM R21
 Xplained Pro Schematic`_.
 
-.. image:: img/ATSAMR21-XPRO-pinout.png
-     :width: 500px
+.. image:: img/ATSAMR21-XPRO-pinout.jpg
      :align: center
      :alt: ATSAMR21-XPRO-pinout
 
diff --git a/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro-pinout.jpg b/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro-pinout.jpg
new file mode 100644
index 00000000000..f0827727050
Binary files /dev/null and b/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro-pinout.jpg differ
diff --git a/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro-pinout.png b/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro-pinout.png
deleted file mode 100644
index 0818688ef96..00000000000
Binary files a/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro-pinout.png and /dev/null differ
diff --git a/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro.jpg b/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro.jpg
new file mode 100644
index 00000000000..f4c79058c53
Binary files /dev/null and b/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro.jpg differ
diff --git a/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro.png b/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro.png
deleted file mode 100644
index 04e06ee89f6..00000000000
Binary files a/boards/arm/atsamr34_xpro/doc/img/atsamr34-xpro.png and /dev/null differ
diff --git a/boards/arm/atsamr34_xpro/doc/index.rst b/boards/arm/atsamr34_xpro/doc/index.rst
index 56879c364df..051245c5d39 100644
--- a/boards/arm/atsamr34_xpro/doc/index.rst
+++ b/boards/arm/atsamr34_xpro/doc/index.rst
@@ -17,8 +17,7 @@ including both a SAML21 die, and a Semtech SX1276 LoRa radio die.
 
 This board is also referred to as DM320111.
 
-.. image:: img/atsamr34-xpro.png
-     :width: 500px
+.. image:: img/atsamr34-xpro.jpg
      :align: center
      :alt: ATSAMR34-XPRO
 
@@ -103,8 +102,7 @@ controllers are responsible for pin muxing, input/output, pull-up, etc.
 For mode details please refer to `SAM R34 Family Datasheet`_ and the `SAM R34
 Xplained Pro Schematic`_.
 
-.. image:: img/atsamr34-xpro-pinout.png
-     :width: 500px
+.. image:: img/atsamr34-xpro-pinout.jpg
      :align: center
      :alt: ATSAMR34-XPRO-pinout
 
diff --git a/boards/arm/b_g474e_dpow1/doc/img/b_g474e_dpow1.jpg b/boards/arm/b_g474e_dpow1/doc/img/b_g474e_dpow1.jpg
index 0e40cc5351c..0fcc393b2ad 100644
Binary files a/boards/arm/b_g474e_dpow1/doc/img/b_g474e_dpow1.jpg and b/boards/arm/b_g474e_dpow1/doc/img/b_g474e_dpow1.jpg differ
diff --git a/boards/arm/b_g474e_dpow1/doc/index.rst b/boards/arm/b_g474e_dpow1/doc/index.rst
index 658f175b8f9..30aa1719dd2 100644
--- a/boards/arm/b_g474e_dpow1/doc/index.rst
+++ b/boards/arm/b_g474e_dpow1/doc/index.rst
@@ -35,8 +35,6 @@ the STLINK-V3E debugger and programmer.
   Virtual COM port, and debug port
 
 .. image:: img/b_g474e_dpow1.jpg
-   :width: 426px
-   :height: 638px
    :align: center
    :alt: B-G474E-DPOW1
 
diff --git a/boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.jpg b/boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.jpg
new file mode 100644
index 00000000000..6ec49d39b0f
Binary files /dev/null and b/boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.jpg differ
diff --git a/boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.png b/boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.png
deleted file mode 100644
index 87fb6d1b83e..00000000000
Binary files a/boards/arm/b_l072z_lrwan1/doc/img/b_l072z_lrwan1.png and /dev/null differ
diff --git a/boards/arm/b_l072z_lrwan1/doc/index.rst b/boards/arm/b_l072z_lrwan1/doc/index.rst
index d94123c0518..9a28af18e39 100644
--- a/boards/arm/b_l072z_lrwan1/doc/index.rst
+++ b/boards/arm/b_l072z_lrwan1/doc/index.rst
@@ -53,10 +53,8 @@ This kit provides:
         - 2 push-buttons (user and reset)
 - Arduino* Uno V3 connectors
 
-.. image:: img/b_l072z_lrwan1.png
-     :width: 500px
+.. image:: img/b_l072z_lrwan1.jpg
      :align: center
-     :height: 325px
      :alt: B-L072Z-LRWAN1
 
 More information about the board can be found at the `B-L072Z-LRWAN1 website`_.
diff --git a/boards/arm/b_l4s5i_iot01a/doc/img/b-l4s5i_iot01a.jpg b/boards/arm/b_l4s5i_iot01a/doc/img/b-l4s5i_iot01a.jpg
index 4331b958b1f..120e6c67504 100644
Binary files a/boards/arm/b_l4s5i_iot01a/doc/img/b-l4s5i_iot01a.jpg and b/boards/arm/b_l4s5i_iot01a/doc/img/b-l4s5i_iot01a.jpg differ
diff --git a/boards/arm/b_l4s5i_iot01a/doc/index.rst b/boards/arm/b_l4s5i_iot01a/doc/index.rst
index c61d0646bf4..14d9480707b 100644
--- a/boards/arm/b_l4s5i_iot01a/doc/index.rst
+++ b/boards/arm/b_l4s5i_iot01a/doc/index.rst
@@ -41,9 +41,7 @@ some highlights of the B_L4S5I_IOT01A Discovery kit:
 
 
 .. image:: img/b-l4s5i_iot01a.jpg
-     :width: 450px
      :align: center
-     :height: 394px
      :alt: B_L4S5I_IOT01A Discovery kit
 
 More information about the board can be found at the `B L4S5I IOT01A Discovery kit website`_.
diff --git a/boards/arm/b_u585i_iot02a/doc/img/b-u585i-iot02a.jpg b/boards/arm/b_u585i_iot02a/doc/img/b-u585i-iot02a.jpg
index 6fe7baa7faa..e7c31dbc1f7 100644
Binary files a/boards/arm/b_u585i_iot02a/doc/img/b-u585i-iot02a.jpg and b/boards/arm/b_u585i_iot02a/doc/img/b-u585i-iot02a.jpg differ
diff --git a/boards/arm/b_u585i_iot02a/doc/index.rst b/boards/arm/b_u585i_iot02a/doc/index.rst
index d0bcedbfb72..31b1118f96a 100644
--- a/boards/arm/b_u585i_iot02a/doc/index.rst
+++ b/boards/arm/b_u585i_iot02a/doc/index.rst
@@ -36,9 +36,7 @@ some highlights of the B_U585I_IOT02A Discovery kit:
 
 
 .. image:: img/b-u585i-iot02a.jpg
-     :width: 426px
      :align: center
-     :height: 33px
      :alt: B_U585I_IOT02A Discovery kit
 
 More information about the board can be found at the `B U585I IOT02A Discovery kit website`_.
diff --git a/boards/arm/bbc_microbit/doc/img/bbc_microbit.jpg b/boards/arm/bbc_microbit/doc/img/bbc_microbit.jpg
new file mode 100644
index 00000000000..39c5a20c220
Binary files /dev/null and b/boards/arm/bbc_microbit/doc/img/bbc_microbit.jpg differ
diff --git a/boards/arm/bbc_microbit/doc/img/bbc_microbit.png b/boards/arm/bbc_microbit/doc/img/bbc_microbit.png
deleted file mode 100644
index 8eba9e8e4db..00000000000
Binary files a/boards/arm/bbc_microbit/doc/img/bbc_microbit.png and /dev/null differ
diff --git a/boards/arm/bbc_microbit/doc/index.rst b/boards/arm/bbc_microbit/doc/index.rst
index 465b0b1e900..aa36d3d662b 100644
--- a/boards/arm/bbc_microbit/doc/index.rst
+++ b/boards/arm/bbc_microbit/doc/index.rst
@@ -23,8 +23,7 @@ connectors that are part of the 23-pin edge connector.
 * FLASH
 * RADIO (Bluetooth Low Energy)
 
-.. figure:: img/bbc_microbit.png
-     :width: 442px
+.. figure:: img/bbc_microbit.jpg
      :align: center
      :alt: BBC Micro Bit
 
diff --git a/boards/arm/bbc_microbit_v2/doc/img/bbc_microbit2.jpg b/boards/arm/bbc_microbit_v2/doc/img/bbc_microbit2.jpg
new file mode 100644
index 00000000000..d4126317bc5
Binary files /dev/null and b/boards/arm/bbc_microbit_v2/doc/img/bbc_microbit2.jpg differ
diff --git a/boards/arm/bbc_microbit_v2/doc/img/bbc_microbit2.png b/boards/arm/bbc_microbit_v2/doc/img/bbc_microbit2.png
deleted file mode 100644
index a2a3d98be0a..00000000000
Binary files a/boards/arm/bbc_microbit_v2/doc/img/bbc_microbit2.png and /dev/null differ
diff --git a/boards/arm/bbc_microbit_v2/doc/index.rst b/boards/arm/bbc_microbit_v2/doc/index.rst
index e6d67d4afbd..7c94a3e5a4e 100644
--- a/boards/arm/bbc_microbit_v2/doc/index.rst
+++ b/boards/arm/bbc_microbit_v2/doc/index.rst
@@ -16,8 +16,7 @@ magnetometer sensors, Bluetooth and USB connectivity, a display consisting of
 USB or an external battery pack. The device inputs and outputs are through five
 ring connectors that are part of the 23-pin edge connector.
 
-.. figure:: img/bbc_microbit2.png
-     :width: 442px
+.. figure:: img/bbc_microbit2.jpg
      :align: center
      :alt: BBC Micro Bit V2
 
diff --git a/boards/arm/bl5340_dvk/doc/img/bl5340_dvk_top.jpg b/boards/arm/bl5340_dvk/doc/img/bl5340_dvk_top.jpg
new file mode 100644
index 00000000000..712a2be971c
Binary files /dev/null and b/boards/arm/bl5340_dvk/doc/img/bl5340_dvk_top.jpg differ
diff --git a/boards/arm/bl5340_dvk/doc/img/bl5340_dvk_top.png b/boards/arm/bl5340_dvk/doc/img/bl5340_dvk_top.png
deleted file mode 100644
index 6e6782e561d..00000000000
Binary files a/boards/arm/bl5340_dvk/doc/img/bl5340_dvk_top.png and /dev/null differ
diff --git a/boards/arm/bl5340_dvk/doc/index.rst b/boards/arm/bl5340_dvk/doc/index.rst
index f92a83dea58..efe6984a0d4 100644
--- a/boards/arm/bl5340_dvk/doc/index.rst
+++ b/boards/arm/bl5340_dvk/doc/index.rst
@@ -43,8 +43,7 @@ This development kit has the following features:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/bl5340_dvk_top.png
-     :width: 340px
+.. figure:: img/bl5340_dvk_top.jpg
      :align: center
      :alt: BL5340 DVK
 
diff --git a/boards/arm/bl652_dvk/doc/bl652_dvk.rst b/boards/arm/bl652_dvk/doc/bl652_dvk.rst
index c994309315b..3fafbf1c34b 100644
--- a/boards/arm/bl652_dvk/doc/bl652_dvk.rst
+++ b/boards/arm/bl652_dvk/doc/bl652_dvk.rst
@@ -32,14 +32,12 @@ Available BL652 DVK part numbers:
 * DVK-BL652-SC
 
 .. figure:: img/bl652_dvk.jpg
-     :width: 500px
      :align: center
      :alt: BL652 DVK
 
      BL652 DVK Board
 
 .. figure:: img/BL652-SA_DVK_BoxContents.jpg
-     :width: 500px
      :align: center
      :alt: BL652-SA DVK Box Contents
 
diff --git a/boards/arm/bl652_dvk/doc/img/BL652-SA_DVK_BoxContents.jpg b/boards/arm/bl652_dvk/doc/img/BL652-SA_DVK_BoxContents.jpg
index fd2d1382897..07ae2e5a23e 100644
Binary files a/boards/arm/bl652_dvk/doc/img/BL652-SA_DVK_BoxContents.jpg and b/boards/arm/bl652_dvk/doc/img/BL652-SA_DVK_BoxContents.jpg differ
diff --git a/boards/arm/bl652_dvk/doc/img/bl652_dvk.jpg b/boards/arm/bl652_dvk/doc/img/bl652_dvk.jpg
index 4b1fc2314a6..d35ddb3de57 100644
Binary files a/boards/arm/bl652_dvk/doc/img/bl652_dvk.jpg and b/boards/arm/bl652_dvk/doc/img/bl652_dvk.jpg differ
diff --git a/boards/arm/bl653_dvk/doc/bl653_dvk.rst b/boards/arm/bl653_dvk/doc/bl653_dvk.rst
index ba22234fafc..98c6bbf23aa 100644
--- a/boards/arm/bl653_dvk/doc/bl653_dvk.rst
+++ b/boards/arm/bl653_dvk/doc/bl653_dvk.rst
@@ -28,7 +28,6 @@ This development kit has the following features:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/bl653_dvk.jpg
-     :width: 500px
      :align: center
      :alt: BL653 Development Kit
 
diff --git a/boards/arm/bl653_dvk/doc/img/bl653_dvk.jpg b/boards/arm/bl653_dvk/doc/img/bl653_dvk.jpg
index a1c80bae69f..07ed13730a5 100644
Binary files a/boards/arm/bl653_dvk/doc/img/bl653_dvk.jpg and b/boards/arm/bl653_dvk/doc/img/bl653_dvk.jpg differ
diff --git a/boards/arm/bl654_dvk/doc/bl654_dvk.rst b/boards/arm/bl654_dvk/doc/bl654_dvk.rst
index f64e85918cb..4ae9f496d6f 100644
--- a/boards/arm/bl654_dvk/doc/bl654_dvk.rst
+++ b/boards/arm/bl654_dvk/doc/bl654_dvk.rst
@@ -28,14 +28,12 @@ This development kit has the following features:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/bl654_dvk.jpg
-     :width: 500px
      :align: center
      :alt: BL654 Development Kit
 
      BL654 Development Kit Board
 
 .. figure:: img/455-00001_BoxContents.jpg
-     :width: 500px
      :align: center
      :alt: 455-00001 Box Contents
 
diff --git a/boards/arm/bl654_dvk/doc/img/455-00001_BoxContents.jpg b/boards/arm/bl654_dvk/doc/img/455-00001_BoxContents.jpg
index e6ec63f15d8..b40e641f036 100644
Binary files a/boards/arm/bl654_dvk/doc/img/455-00001_BoxContents.jpg and b/boards/arm/bl654_dvk/doc/img/455-00001_BoxContents.jpg differ
diff --git a/boards/arm/bl654_dvk/doc/img/bl654_dvk.jpg b/boards/arm/bl654_dvk/doc/img/bl654_dvk.jpg
index 01277ac0239..6178c02cdb3 100644
Binary files a/boards/arm/bl654_dvk/doc/img/bl654_dvk.jpg and b/boards/arm/bl654_dvk/doc/img/bl654_dvk.jpg differ
diff --git a/boards/arm/bl654_sensor_board/doc/bl654_sensor_board.rst b/boards/arm/bl654_sensor_board/doc/bl654_sensor_board.rst
index 92783aa35ff..7a1c79f4804 100644
--- a/boards/arm/bl654_sensor_board/doc/bl654_sensor_board.rst
+++ b/boards/arm/bl654_sensor_board/doc/bl654_sensor_board.rst
@@ -27,15 +27,13 @@ This sensor board has the following features:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/bl654_sensor_board.png
-     :width: 467px
+.. figure:: img/bl654_sensor_board.jpg
      :align: center
      :alt: BL654 Sensor Board front and back
 
      BL654 Sensor Board front and back
 
-.. figure:: img/bl654_sensor_board_usb_swd_programmer.png
-     :width: 302px
+.. figure:: img/bl654_sensor_board_usb_swd_programmer.jpg
      :align: center
      :alt: BL654 Sensor Board connected to USB-SWD Programmer (UART and SWD access)
 
diff --git a/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board.jpg b/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board.jpg
new file mode 100644
index 00000000000..95b247661d2
Binary files /dev/null and b/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board.jpg differ
diff --git a/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board.png b/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board.png
deleted file mode 100644
index 6d05c33d386..00000000000
Binary files a/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board.png and /dev/null differ
diff --git a/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board_usb_swd_programmer.jpg b/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board_usb_swd_programmer.jpg
new file mode 100644
index 00000000000..e8ef1064c15
Binary files /dev/null and b/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board_usb_swd_programmer.jpg differ
diff --git a/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board_usb_swd_programmer.png b/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board_usb_swd_programmer.png
deleted file mode 100644
index 9cc9a2da60e..00000000000
Binary files a/boards/arm/bl654_sensor_board/doc/img/bl654_sensor_board_usb_swd_programmer.png and /dev/null differ
diff --git a/boards/arm/bl654_usb/doc/bl654_usb.rst b/boards/arm/bl654_usb/doc/bl654_usb.rst
index 2c5b5f53352..887a2c82685 100644
--- a/boards/arm/bl654_usb/doc/bl654_usb.rst
+++ b/boards/arm/bl654_usb/doc/bl654_usb.rst
@@ -24,14 +24,12 @@ This USB adapter has the following features:
 * :abbr:`RTC (nRF RTC System Clock)`
 
 .. figure:: img/bl654_usb.jpg
-     :width: 500px
      :align: center
      :alt: BL654 USB adapter
 
      BL654 USB Adapter
 
 .. figure:: img/bl654_usb_pcb.jpg
-     :width: 500px
      :align: center
      :alt: 451-00004 Box Contents
 
@@ -126,7 +124,6 @@ before proceeding. These instructions were tested with version 6.1.0.
    The push button is in a pin-hole on the logo side of the USB adapter.
 
    .. image:: img/bl654_usb_reset.jpg
-      :width: 500px
       :align: center
       :alt: Location of RESET button
 
diff --git a/boards/arm/bl654_usb/doc/img/bl654_usb.jpg b/boards/arm/bl654_usb/doc/img/bl654_usb.jpg
index d05af0ead27..4c129e7864a 100644
Binary files a/boards/arm/bl654_usb/doc/img/bl654_usb.jpg and b/boards/arm/bl654_usb/doc/img/bl654_usb.jpg differ
diff --git a/boards/arm/bl654_usb/doc/img/bl654_usb_pcb.jpg b/boards/arm/bl654_usb/doc/img/bl654_usb_pcb.jpg
index 879254326ce..b095e649172 100644
Binary files a/boards/arm/bl654_usb/doc/img/bl654_usb_pcb.jpg and b/boards/arm/bl654_usb/doc/img/bl654_usb_pcb.jpg differ
diff --git a/boards/arm/bl654_usb/doc/img/bl654_usb_reset.jpg b/boards/arm/bl654_usb/doc/img/bl654_usb_reset.jpg
index bdcb58d1eea..bc0008ad326 100644
Binary files a/boards/arm/bl654_usb/doc/img/bl654_usb_reset.jpg and b/boards/arm/bl654_usb/doc/img/bl654_usb_reset.jpg differ
diff --git a/boards/arm/black_f407ve/doc/img/black_f407ve.jpg b/boards/arm/black_f407ve/doc/img/black_f407ve.jpg
index 688b5f5629c..a8280ec0d15 100644
Binary files a/boards/arm/black_f407ve/doc/img/black_f407ve.jpg and b/boards/arm/black_f407ve/doc/img/black_f407ve.jpg differ
diff --git a/boards/arm/black_f407ve/doc/img/stm32f407vet6_left02.jpg b/boards/arm/black_f407ve/doc/img/stm32f407vet6_left02.jpg
new file mode 100644
index 00000000000..a0a90aa1658
Binary files /dev/null and b/boards/arm/black_f407ve/doc/img/stm32f407vet6_left02.jpg differ
diff --git a/boards/arm/black_f407ve/doc/img/stm32f407vet6_left02.png b/boards/arm/black_f407ve/doc/img/stm32f407vet6_left02.png
deleted file mode 100644
index fe098e5db60..00000000000
Binary files a/boards/arm/black_f407ve/doc/img/stm32f407vet6_left02.png and /dev/null differ
diff --git a/boards/arm/black_f407ve/doc/img/stm32f407vet6_right01.jpg b/boards/arm/black_f407ve/doc/img/stm32f407vet6_right01.jpg
new file mode 100644
index 00000000000..bfb9b4b1c3a
Binary files /dev/null and b/boards/arm/black_f407ve/doc/img/stm32f407vet6_right01.jpg differ
diff --git a/boards/arm/black_f407ve/doc/img/stm32f407vet6_right01.png b/boards/arm/black_f407ve/doc/img/stm32f407vet6_right01.png
deleted file mode 100644
index d8c34780c15..00000000000
Binary files a/boards/arm/black_f407ve/doc/img/stm32f407vet6_right01.png and /dev/null differ
diff --git a/boards/arm/black_f407ve/doc/img/stm32f407vet6_st-link02.jpg b/boards/arm/black_f407ve/doc/img/stm32f407vet6_st-link02.jpg
new file mode 100644
index 00000000000..c17304ba84a
Binary files /dev/null and b/boards/arm/black_f407ve/doc/img/stm32f407vet6_st-link02.jpg differ
diff --git a/boards/arm/black_f407ve/doc/img/stm32f407vet6_st-link02.png b/boards/arm/black_f407ve/doc/img/stm32f407vet6_st-link02.png
deleted file mode 100644
index c7a85310a5b..00000000000
Binary files a/boards/arm/black_f407ve/doc/img/stm32f407vet6_st-link02.png and /dev/null differ
diff --git a/boards/arm/black_f407ve/doc/index.rst b/boards/arm/black_f407ve/doc/index.rst
index 97ec9886e02..86af49bb477 100644
--- a/boards/arm/black_f407ve/doc/index.rst
+++ b/boards/arm/black_f407ve/doc/index.rst
@@ -28,9 +28,7 @@ Here are some highlights of the BLACK_F407VE board:
 - Mini-AB connector
 
 .. image:: img/black_f407ve.jpg
-     :width: 500px
      :align: center
-     :height: 500px
      :alt: BLACK_F407VE
 
 See also board descriptions at `STM32-base website`_,
@@ -131,22 +129,16 @@ Pin Mapping
 BLACK_F407VE has 5 GPIO controllers. These controllers are responsible for pin
 muxing, input/output, pull-up, etc.
 
-.. image:: img/stm32f407vet6_left02.png
-     :width: 200px
+.. image:: img/stm32f407vet6_left02.jpg
      :align: center
-     :height: 200px
      :alt: left pins
 
-.. image:: img/stm32f407vet6_right01.png
-     :width: 200px
+.. image:: img/stm32f407vet6_right01.jpg
      :align: center
-     :height: 200px
      :alt: right pins
 
-.. image:: img/stm32f407vet6_st-link02.png
-     :width: 200px
+.. image:: img/stm32f407vet6_st-link02.jpg
      :align: center
-     :height: 200px
      :alt: bottom and top pins
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/black_f407zg_pro/doc/img/black_f407zg_pro.jpg b/boards/arm/black_f407zg_pro/doc/img/black_f407zg_pro.jpg
index bcd4aa7eb07..20a223eff3a 100644
Binary files a/boards/arm/black_f407zg_pro/doc/img/black_f407zg_pro.jpg and b/boards/arm/black_f407zg_pro/doc/img/black_f407zg_pro.jpg differ
diff --git a/boards/arm/black_f407zg_pro/doc/index.rst b/boards/arm/black_f407zg_pro/doc/index.rst
index 7c0539e00ac..18b44f3adf4 100644
--- a/boards/arm/black_f407zg_pro/doc/index.rst
+++ b/boards/arm/black_f407zg_pro/doc/index.rst
@@ -28,9 +28,7 @@ Here are some highlights of the BLACK_F407ZG_PRO board:
 - Mini-AB connector
 
 .. image:: img/black_f407zg_pro.jpg
-     :width: 500px
      :align: center
-     :height: 500px
      :alt: BLACK_F407ZG_PRO
 
 .. warning:: The +5V pins on this board are directly connected to the +5V pin
diff --git a/boards/arm/blackpill_f401cc/doc/img/Blackpill_Pinout.jpg b/boards/arm/blackpill_f401cc/doc/img/Blackpill_Pinout.jpg
new file mode 100644
index 00000000000..b16f4610b08
Binary files /dev/null and b/boards/arm/blackpill_f401cc/doc/img/Blackpill_Pinout.jpg differ
diff --git a/boards/arm/blackpill_f401cc/doc/img/Blackpill_Pinout.png b/boards/arm/blackpill_f401cc/doc/img/Blackpill_Pinout.png
deleted file mode 100644
index 3f15c620d20..00000000000
Binary files a/boards/arm/blackpill_f401cc/doc/img/Blackpill_Pinout.png and /dev/null differ
diff --git a/boards/arm/blackpill_f401cc/doc/img/blackpill-v3.jpg b/boards/arm/blackpill_f401cc/doc/img/blackpill-v3.jpg
index d4687d8e0c8..184ec306f9b 100644
Binary files a/boards/arm/blackpill_f401cc/doc/img/blackpill-v3.jpg and b/boards/arm/blackpill_f401cc/doc/img/blackpill-v3.jpg differ
diff --git a/boards/arm/blackpill_f401cc/doc/index.rst b/boards/arm/blackpill_f401cc/doc/index.rst
index 2af413c3abe..e4ba748e258 100644
--- a/boards/arm/blackpill_f401cc/doc/index.rst
+++ b/boards/arm/blackpill_f401cc/doc/index.rst
@@ -80,7 +80,7 @@ Pin Mapping
 
 Available pins:
 ---------------
-.. image:: img/Blackpill_Pinout.png
+.. image:: img/Blackpill_Pinout.jpg
       :align: center
       :alt: Black Pill V1.2 Pinout
 
diff --git a/boards/arm/blackpill_f401ce/doc/img/Blackpill_Pinout.jpg b/boards/arm/blackpill_f401ce/doc/img/Blackpill_Pinout.jpg
new file mode 100644
index 00000000000..b16f4610b08
Binary files /dev/null and b/boards/arm/blackpill_f401ce/doc/img/Blackpill_Pinout.jpg differ
diff --git a/boards/arm/blackpill_f401ce/doc/img/Blackpill_Pinout.png b/boards/arm/blackpill_f401ce/doc/img/Blackpill_Pinout.png
deleted file mode 100644
index 3f15c620d20..00000000000
Binary files a/boards/arm/blackpill_f401ce/doc/img/Blackpill_Pinout.png and /dev/null differ
diff --git a/boards/arm/blackpill_f401ce/doc/img/blackpill-v3.jpg b/boards/arm/blackpill_f401ce/doc/img/blackpill-v3.jpg
index d4687d8e0c8..184ec306f9b 100644
Binary files a/boards/arm/blackpill_f401ce/doc/img/blackpill-v3.jpg and b/boards/arm/blackpill_f401ce/doc/img/blackpill-v3.jpg differ
diff --git a/boards/arm/blackpill_f401ce/doc/index.rst b/boards/arm/blackpill_f401ce/doc/index.rst
index a252d244e75..da8f63df258 100644
--- a/boards/arm/blackpill_f401ce/doc/index.rst
+++ b/boards/arm/blackpill_f401ce/doc/index.rst
@@ -80,7 +80,7 @@ Pin Mapping
 
 Available pins:
 ---------------
-.. image:: img/Blackpill_Pinout.png
+.. image:: img/Blackpill_Pinout.jpg
       :align: center
       :alt: Black Pill V3.0+ Pinout
 
diff --git a/boards/arm/blackpill_f411ce/doc/img/Blackpill_Pinout.jpg b/boards/arm/blackpill_f411ce/doc/img/Blackpill_Pinout.jpg
new file mode 100644
index 00000000000..b16f4610b08
Binary files /dev/null and b/boards/arm/blackpill_f411ce/doc/img/Blackpill_Pinout.jpg differ
diff --git a/boards/arm/blackpill_f411ce/doc/img/Blackpill_Pinout.png b/boards/arm/blackpill_f411ce/doc/img/Blackpill_Pinout.png
deleted file mode 100644
index 3f15c620d20..00000000000
Binary files a/boards/arm/blackpill_f411ce/doc/img/Blackpill_Pinout.png and /dev/null differ
diff --git a/boards/arm/blackpill_f411ce/doc/img/blackpill-v2.jpg b/boards/arm/blackpill_f411ce/doc/img/blackpill-v2.jpg
index d4687d8e0c8..184ec306f9b 100644
Binary files a/boards/arm/blackpill_f411ce/doc/img/blackpill-v2.jpg and b/boards/arm/blackpill_f411ce/doc/img/blackpill-v2.jpg differ
diff --git a/boards/arm/blackpill_f411ce/doc/index.rst b/boards/arm/blackpill_f411ce/doc/index.rst
index 32ee1e9159e..877556288f2 100644
--- a/boards/arm/blackpill_f411ce/doc/index.rst
+++ b/boards/arm/blackpill_f411ce/doc/index.rst
@@ -80,7 +80,7 @@ Pin Mapping
 
 Available pins:
 ---------------
-.. image:: img/Blackpill_Pinout.png
+.. image:: img/Blackpill_Pinout.jpg
       :align: center
       :alt: Black Pill V2.0+ Pinout
 
diff --git a/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/img/blueclover_plt_demo_v2.jpg b/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/img/blueclover_plt_demo_v2.jpg
new file mode 100644
index 00000000000..55679b6c9c3
Binary files /dev/null and b/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/img/blueclover_plt_demo_v2.jpg differ
diff --git a/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/img/blueclover_plt_demo_v2.png b/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/img/blueclover_plt_demo_v2.png
deleted file mode 100644
index 78b0aba5360..00000000000
Binary files a/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/img/blueclover_plt_demo_v2.png and /dev/null differ
diff --git a/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/index.rst b/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/index.rst
index 33e3bae5f86..517572c3d96 100644
--- a/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/index.rst
+++ b/boards/arm/blueclover_plt_demo_v2_nrf52832/doc/index.rst
@@ -27,8 +27,7 @@ The Nordic Semiconductor nRF52832 ARM Cortex-M4F MCU features the following:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/blueclover_plt_demo_v2.png
-     :width: 614px
+.. figure:: img/blueclover_plt_demo_v2.jpg
      :align: center
      :alt: Blue Clover PLT Demo V2 nRF52832
 
diff --git a/boards/arm/bt510/doc/bt510.rst b/boards/arm/bt510/doc/bt510.rst
index 48e2d95b1b1..1d5290fe1e6 100644
--- a/boards/arm/bt510/doc/bt510.rst
+++ b/boards/arm/bt510/doc/bt510.rst
@@ -25,14 +25,12 @@ The sensor has the following features:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/bt510.jpg
-     :width: 250px
      :align: center
      :alt: Sentrius BT510 Sensor, front view
 
      Sentrius BT510 Sensor, front view
 
 .. figure:: img/bt510_back.jpg
-     :width: 250px
      :align: center
      :alt: Sentrius BT510 Sensor, rear view
 
@@ -176,8 +174,7 @@ board, on the programming board set SW6 to the supply out position and SW5 to th
 position, ensure there is a jumper on J35 and that SW1 is in the debug position, then
 connect the BT510 to the board using the Tag-Connect cable via J3:
 
-.. figure:: img/bt510_prog.png
-     :width: 630px
+.. figure:: img/bt510_prog.jpg
      :align: center
      :alt: Sentrius BT510 Sensor connected to programming board
 
diff --git a/boards/arm/bt510/doc/img/bt510.jpg b/boards/arm/bt510/doc/img/bt510.jpg
index 0c51c4a0540..74d5e9b2bf2 100644
Binary files a/boards/arm/bt510/doc/img/bt510.jpg and b/boards/arm/bt510/doc/img/bt510.jpg differ
diff --git a/boards/arm/bt510/doc/img/bt510_back.jpg b/boards/arm/bt510/doc/img/bt510_back.jpg
index 56d657ed389..ef0032b8b23 100644
Binary files a/boards/arm/bt510/doc/img/bt510_back.jpg and b/boards/arm/bt510/doc/img/bt510_back.jpg differ
diff --git a/boards/arm/bt510/doc/img/bt510_prog.jpg b/boards/arm/bt510/doc/img/bt510_prog.jpg
new file mode 100644
index 00000000000..42a524470c8
Binary files /dev/null and b/boards/arm/bt510/doc/img/bt510_prog.jpg differ
diff --git a/boards/arm/bt510/doc/img/bt510_prog.png b/boards/arm/bt510/doc/img/bt510_prog.png
deleted file mode 100644
index 1a9d407f5cb..00000000000
Binary files a/boards/arm/bt510/doc/img/bt510_prog.png and /dev/null differ
diff --git a/boards/arm/bt610/doc/bt610.rst b/boards/arm/bt610/doc/bt610.rst
index c393e3ab822..e792f91ec57 100644
--- a/boards/arm/bt610/doc/bt610.rst
+++ b/boards/arm/bt610/doc/bt610.rst
@@ -29,14 +29,12 @@ The sensor has the following features:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/bt610_front.jpg
-     :width: 500px
      :align: center
      :alt: Sentrius BT610 Sensor, front view
 
      Sentrius BT610 Sensor, front view
 
 .. figure:: img/bt610_back.jpg
-     :width: 500px
      :align: center
      :alt: Sentrius BT610 Sensor, rear view
 
@@ -90,7 +88,6 @@ hardware features:
 +-----------+------------+----------------------+
 
 .. figure:: img/bt610_board.jpg
-     :width: 500px
      :align: center
      :alt: Sentrius BT610 Sensor, board layout
 
diff --git a/boards/arm/bt610/doc/img/bt610_back.jpg b/boards/arm/bt610/doc/img/bt610_back.jpg
index ba903ec5151..29d7da710d7 100644
Binary files a/boards/arm/bt610/doc/img/bt610_back.jpg and b/boards/arm/bt610/doc/img/bt610_back.jpg differ
diff --git a/boards/arm/bt610/doc/img/bt610_board.jpg b/boards/arm/bt610/doc/img/bt610_board.jpg
index 0c3d355b019..e3b9dabb392 100644
Binary files a/boards/arm/bt610/doc/img/bt610_board.jpg and b/boards/arm/bt610/doc/img/bt610_board.jpg differ
diff --git a/boards/arm/bt610/doc/img/bt610_front.jpg b/boards/arm/bt610/doc/img/bt610_front.jpg
index 61dad863f1e..c0a2c8d110d 100644
Binary files a/boards/arm/bt610/doc/img/bt610_front.jpg and b/boards/arm/bt610/doc/img/bt610_front.jpg differ
diff --git a/boards/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg b/boards/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg
new file mode 100644
index 00000000000..58b122a901a
Binary files /dev/null and b/boards/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.jpg differ
diff --git a/boards/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.png b/boards/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.png
deleted file mode 100644
index 68bc0718996..00000000000
Binary files a/boards/arm/cc1352r1_launchxl/doc/img/cc1352r1_launchxl.png and /dev/null differ
diff --git a/boards/arm/cc1352r1_launchxl/doc/index.rst b/boards/arm/cc1352r1_launchxl/doc/index.rst
index ebe45d806dc..30afada55fe 100644
--- a/boards/arm/cc1352r1_launchxl/doc/index.rst
+++ b/boards/arm/cc1352r1_launchxl/doc/index.rst
@@ -11,8 +11,7 @@ development kit for the SimpleLink |trade| multi-Standard CC1352R wireless MCU.
 
 See the `TI CC1352R LaunchPad Product Page`_ for details.
 
-.. figure:: img/cc1352r1_launchxl.png
-   :width: 400px
+.. figure:: img/cc1352r1_launchxl.jpg
    :align: center
    :alt: TI CC1352R LaunchPad
 
diff --git a/boards/arm/cc1352r_sensortag/doc/img/cc1352r_sensortag.jpg b/boards/arm/cc1352r_sensortag/doc/img/cc1352r_sensortag.jpg
index ad1ae2304d2..c3e45bc09d0 100644
Binary files a/boards/arm/cc1352r_sensortag/doc/img/cc1352r_sensortag.jpg and b/boards/arm/cc1352r_sensortag/doc/img/cc1352r_sensortag.jpg differ
diff --git a/boards/arm/cc1352r_sensortag/doc/img/launchpad-lpstk-debug.jpg b/boards/arm/cc1352r_sensortag/doc/img/launchpad-lpstk-debug.jpg
index 0cf75446c8b..4e6815c8cda 100644
Binary files a/boards/arm/cc1352r_sensortag/doc/img/launchpad-lpstk-debug.jpg and b/boards/arm/cc1352r_sensortag/doc/img/launchpad-lpstk-debug.jpg differ
diff --git a/boards/arm/cc1352r_sensortag/doc/index.rst b/boards/arm/cc1352r_sensortag/doc/index.rst
index 1f7588a4479..577d303f4dd 100644
--- a/boards/arm/cc1352r_sensortag/doc/index.rst
+++ b/boards/arm/cc1352r_sensortag/doc/index.rst
@@ -12,7 +12,6 @@ development kit for the SimpleLink |trade| multi-Standard CC1352R wireless MCU.
 See the `TI CC1352R SensorTag Product Page`_ for details.
 
 .. figure:: img/cc1352r_sensortag.jpg
-   :width: 400px
    :align: center
    :alt: TI CC1352R SensorTag
 
@@ -146,7 +145,6 @@ to use it in tandem with a ``CC1352R LaunchPad``, making use of the integrated
 #. Connect your XDS110 LaunchPad to your PC!
 
 .. figure:: img/launchpad-lpstk-debug.jpg
-   :width: 400px
    :align: center
    :alt: Debugging the TI CC1352R SensorTag
 
diff --git a/boards/arm/cc26x2r1_launchxl/doc/img/cc26x2r1_launchxl.jpg b/boards/arm/cc26x2r1_launchxl/doc/img/cc26x2r1_launchxl.jpg
new file mode 100644
index 00000000000..0ad5170fac9
Binary files /dev/null and b/boards/arm/cc26x2r1_launchxl/doc/img/cc26x2r1_launchxl.jpg differ
diff --git a/boards/arm/cc26x2r1_launchxl/doc/img/cc26x2r1_launchxl.png b/boards/arm/cc26x2r1_launchxl/doc/img/cc26x2r1_launchxl.png
deleted file mode 100644
index 4ae7674b9e4..00000000000
Binary files a/boards/arm/cc26x2r1_launchxl/doc/img/cc26x2r1_launchxl.png and /dev/null differ
diff --git a/boards/arm/cc26x2r1_launchxl/doc/index.rst b/boards/arm/cc26x2r1_launchxl/doc/index.rst
index 902360657d3..052eeed4dc5 100644
--- a/boards/arm/cc26x2r1_launchxl/doc/index.rst
+++ b/boards/arm/cc26x2r1_launchxl/doc/index.rst
@@ -11,8 +11,7 @@ development kit for the SimpleLink |trade| multi-Standard CC2652R wireless MCU.
 
 See the `TI CC26x2R LaunchPad Product Page`_ for details.
 
-.. figure:: img/cc26x2r1_launchxl.png
-   :width: 400px
+.. figure:: img/cc26x2r1_launchxl.jpg
    :align: center
    :alt: TI CC26x2R LaunchPad
 
diff --git a/boards/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.jpg b/boards/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.jpg
new file mode 100644
index 00000000000..2496e5b4275
Binary files /dev/null and b/boards/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.jpg differ
diff --git a/boards/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.png b/boards/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.png
deleted file mode 100644
index 238a06e0973..00000000000
Binary files a/boards/arm/circuitdojo_feather_nrf9160/doc/img/circuitdojo_feather_nrf9160.png and /dev/null differ
diff --git a/boards/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.jpg b/boards/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.jpg
new file mode 100644
index 00000000000..5f316c2d5c4
Binary files /dev/null and b/boards/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.jpg differ
diff --git a/boards/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.png b/boards/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.png
deleted file mode 100644
index 6b21a746620..00000000000
Binary files a/boards/arm/circuitdojo_feather_nrf9160/doc/img/nrf9160-feather-v31-features.png and /dev/null differ
diff --git a/boards/arm/circuitdojo_feather_nrf9160/doc/index.rst b/boards/arm/circuitdojo_feather_nrf9160/doc/index.rst
index ffd1d6a44ea..025c1638e21 100644
--- a/boards/arm/circuitdojo_feather_nrf9160/doc/index.rst
+++ b/boards/arm/circuitdojo_feather_nrf9160/doc/index.rst
@@ -3,8 +3,7 @@
 nRF9160 Feather
 ###############
 
-.. figure:: img/circuitdojo_feather_nrf9160.png
-     :width: 711px
+.. figure:: img/circuitdojo_feather_nrf9160.jpg
      :align: center
      :alt: Circuit Dojo nRF9160 Feather
 
@@ -40,8 +39,7 @@ More information about the board can be found at the
 Hardware
 ********
 
-.. figure:: img/nrf9160-feather-v31-features.png
-   :width: 711px
+.. figure:: img/nrf9160-feather-v31-features.jpg
    :align: center
    :alt: nRF9160 Feather Features
 
diff --git a/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.jpg b/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.jpg
new file mode 100644
index 00000000000..3a0f86f73d9
Binary files /dev/null and b/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.jpg differ
diff --git a/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.png b/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.png
deleted file mode 100644
index 9e15d846db8..00000000000
Binary files a/boards/arm/colibri_imx7d_m4/doc/colibri_imx7d_m4.png and /dev/null differ
diff --git a/boards/arm/colibri_imx7d_m4/doc/index.rst b/boards/arm/colibri_imx7d_m4/doc/index.rst
index 1c9ecc36677..f8de598f794 100644
--- a/boards/arm/colibri_imx7d_m4/doc/index.rst
+++ b/boards/arm/colibri_imx7d_m4/doc/index.rst
@@ -12,8 +12,7 @@ Zephyr was ported to run on the M4 core. In a later release, it will also
 communicate with the A7 core (running Linux) via RPmsg.
 
 
-.. image:: ./colibri_imx7d_m4.png
-   :width: 720px
+.. image:: colibri_imx7d_m4.jpg
    :align: center
    :alt: Colibri-iMX7
 
diff --git a/boards/arm/contextualelectronics_abc/doc/img/contextualelectronics_abc.jpg b/boards/arm/contextualelectronics_abc/doc/img/contextualelectronics_abc.jpg
index 0ffebd739db..1bf737c8fd5 100644
Binary files a/boards/arm/contextualelectronics_abc/doc/img/contextualelectronics_abc.jpg and b/boards/arm/contextualelectronics_abc/doc/img/contextualelectronics_abc.jpg differ
diff --git a/boards/arm/contextualelectronics_abc/doc/index.rst b/boards/arm/contextualelectronics_abc/doc/index.rst
index ead1ecc424f..15f9e52bca8 100644
--- a/boards/arm/contextualelectronics_abc/doc/index.rst
+++ b/boards/arm/contextualelectronics_abc/doc/index.rst
@@ -22,7 +22,6 @@ Nordic Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices:
 * Quectel BG95 Modem
 
 .. figure:: img/contextualelectronics_abc.jpg
-     :width: 2046px
      :align: center
      :alt: Contextual Electronics Advanced BLE Cell
 
diff --git a/boards/arm/cy8ckit_062_ble/doc/img/cy8ckit-062-ble.jpg b/boards/arm/cy8ckit_062_ble/doc/img/cy8ckit-062-ble.jpg
index 82f2996df95..d0c68ecbd39 100644
Binary files a/boards/arm/cy8ckit_062_ble/doc/img/cy8ckit-062-ble.jpg and b/boards/arm/cy8ckit_062_ble/doc/img/cy8ckit-062-ble.jpg differ
diff --git a/boards/arm/cy8ckit_062_ble/doc/index.rst b/boards/arm/cy8ckit_062_ble/doc/index.rst
index ecf49b4e26d..d6b77f6da42 100644
--- a/boards/arm/cy8ckit_062_ble/doc/index.rst
+++ b/boards/arm/cy8ckit_062_ble/doc/index.rst
@@ -31,7 +31,6 @@ The Cortex-M0+ is a primary core on the board's SoC. It starts first and
 enables the CM4 core.
 
 .. image:: img/cy8ckit-062-ble.jpg
-     :width: 887px
      :align: center
      :alt: CY8CKIT_062_BLE
 
diff --git a/boards/arm/cy8ckit_062_wifi_bt/doc/img/cy8ckit_062_wifi_bt_m0.jpg b/boards/arm/cy8ckit_062_wifi_bt/doc/img/cy8ckit_062_wifi_bt_m0.jpg
new file mode 100644
index 00000000000..7481e9cc2e6
Binary files /dev/null and b/boards/arm/cy8ckit_062_wifi_bt/doc/img/cy8ckit_062_wifi_bt_m0.jpg differ
diff --git a/boards/arm/cy8ckit_062_wifi_bt/doc/img/cy8ckit_062_wifi_bt_m0.png b/boards/arm/cy8ckit_062_wifi_bt/doc/img/cy8ckit_062_wifi_bt_m0.png
deleted file mode 100644
index b48744c3db6..00000000000
Binary files a/boards/arm/cy8ckit_062_wifi_bt/doc/img/cy8ckit_062_wifi_bt_m0.png and /dev/null differ
diff --git a/boards/arm/cy8ckit_062_wifi_bt/doc/index.rst b/boards/arm/cy8ckit_062_wifi_bt/doc/index.rst
index 1841e7176d4..ec313afb120 100644
--- a/boards/arm/cy8ckit_062_wifi_bt/doc/index.rst
+++ b/boards/arm/cy8ckit_062_wifi_bt/doc/index.rst
@@ -23,8 +23,7 @@ The PSoC 6 WiFi-BT Pioneer board offers compatibility with Arduino shields.
 The Cortex-M0+ is a primary core on the board's SoC. It starts first and
 enables the CM4 core.
 
-.. image:: img/cy8ckit_062_wifi_bt_m0.png
-     :width: 887px
+.. image:: img/cy8ckit_062_wifi_bt_m0.jpg
      :align: center
      :alt: CY8CKIT_062_WIFI_BT
 
diff --git a/boards/arm/cyclonev_socdk/doc/img/cv_soc_board.jpg b/boards/arm/cyclonev_socdk/doc/img/cv_soc_board.jpg
index faac3f3deb1..46c258a03f2 100644
Binary files a/boards/arm/cyclonev_socdk/doc/img/cv_soc_board.jpg and b/boards/arm/cyclonev_socdk/doc/img/cv_soc_board.jpg differ
diff --git a/boards/arm/cyclonev_socdk/doc/img/cyclonev_blinky.jpg b/boards/arm/cyclonev_socdk/doc/img/cyclonev_blinky.jpg
index c0ac79095bd..d11a8da0b7d 100644
Binary files a/boards/arm/cyclonev_socdk/doc/img/cyclonev_blinky.jpg and b/boards/arm/cyclonev_socdk/doc/img/cyclonev_blinky.jpg differ
diff --git a/boards/arm/cyclonev_socdk/doc/img/cyclonev_westflash.jpg b/boards/arm/cyclonev_socdk/doc/img/cyclonev_westflash.jpg
index bdc6c5b89ea..5ef840d7aa5 100644
Binary files a/boards/arm/cyclonev_socdk/doc/img/cyclonev_westflash.jpg and b/boards/arm/cyclonev_socdk/doc/img/cyclonev_westflash.jpg differ
diff --git a/boards/arm/cyclonev_socdk/doc/index.rst b/boards/arm/cyclonev_socdk/doc/index.rst
index db034b2b1ca..1f51e20650c 100644
--- a/boards/arm/cyclonev_socdk/doc/index.rst
+++ b/boards/arm/cyclonev_socdk/doc/index.rst
@@ -11,7 +11,6 @@ The Zephyr kernel is supported on the Intel® Cyclone® V SoC Development Kit,
 using its Hard Processor System (HPS) CPU.
 
 .. figure:: img/cv_soc_board.jpg
-   :width: 800px
    :align: center
    :alt: Intel's Cyclone® V SoC FPGA DevKit
 
@@ -199,7 +198,6 @@ The following image shows the expected output (UART) after executing "west flash
 the "hello world" sample design:
 
 .. figure:: img/cyclonev_westflash.jpg
-   :width: 700px
    :align: center
    :alt: UART output after "west flash" example
 
@@ -337,7 +335,6 @@ Development Kit Board. Try to ``blink`` an LED from the HPS side of the chip:
    :goals: flash
 
 .. figure:: img/cyclonev_blinky.jpg
-   :width: 600px
    :align: center
    :alt: HPS LED0 blinking example
 
diff --git a/boards/arm/degu_evk/doc/img/degu_evk.jpg b/boards/arm/degu_evk/doc/img/degu_evk.jpg
new file mode 100644
index 00000000000..73d2fba818a
Binary files /dev/null and b/boards/arm/degu_evk/doc/img/degu_evk.jpg differ
diff --git a/boards/arm/degu_evk/doc/img/degu_evk.png b/boards/arm/degu_evk/doc/img/degu_evk.png
deleted file mode 100644
index 46c612e7557..00000000000
Binary files a/boards/arm/degu_evk/doc/img/degu_evk.png and /dev/null differ
diff --git a/boards/arm/degu_evk/doc/index.rst b/boards/arm/degu_evk/doc/index.rst
index 026495b4e10..a252c4273e8 100644
--- a/boards/arm/degu_evk/doc/index.rst
+++ b/boards/arm/degu_evk/doc/index.rst
@@ -9,6 +9,6 @@ Nordic nRF52840 SoC and NXP A71CH Secure Element, and can
 connect some Seeed Grove sensors via GPIO, ADC, I2C,
 and UART.
 
-.. figure:: img/degu_evk.png
+.. figure:: img/degu_evk.jpg
 
 For more information, see the `Degu Project website <https://open-degu.com/en/>`__.
diff --git a/boards/arm/disco_l475_iot1/doc/img/disco_l475_iot1.jpg b/boards/arm/disco_l475_iot1/doc/img/disco_l475_iot1.jpg
index 557fb6f6446..97044e71815 100644
Binary files a/boards/arm/disco_l475_iot1/doc/img/disco_l475_iot1.jpg and b/boards/arm/disco_l475_iot1/doc/img/disco_l475_iot1.jpg differ
diff --git a/boards/arm/disco_l475_iot1/doc/index.rst b/boards/arm/disco_l475_iot1/doc/index.rst
index 35fc0c1ef0a..e62bae9b5af 100644
--- a/boards/arm/disco_l475_iot1/doc/index.rst
+++ b/boards/arm/disco_l475_iot1/doc/index.rst
@@ -37,9 +37,7 @@ This kit provides:
 
 
 .. image:: img/disco_l475_iot1.jpg
-     :width: 531px
      :align: center
-     :height: 354px
      :alt: Disco L475 IoT1
 
 More information about the board can be found at the `Disco L475 IoT1 website`_.
diff --git a/boards/arm/dragino_lsn50/doc/img/dragino_lsn50.jpg b/boards/arm/dragino_lsn50/doc/img/dragino_lsn50.jpg
new file mode 100644
index 00000000000..759f00daccc
Binary files /dev/null and b/boards/arm/dragino_lsn50/doc/img/dragino_lsn50.jpg differ
diff --git a/boards/arm/dragino_lsn50/doc/img/dragino_lsn50.png b/boards/arm/dragino_lsn50/doc/img/dragino_lsn50.png
deleted file mode 100644
index 063dc1d6c09..00000000000
Binary files a/boards/arm/dragino_lsn50/doc/img/dragino_lsn50.png and /dev/null differ
diff --git a/boards/arm/dragino_lsn50/doc/index.rst b/boards/arm/dragino_lsn50/doc/index.rst
index c4bd31049cc..08471cbba18 100644
--- a/boards/arm/dragino_lsn50/doc/index.rst
+++ b/boards/arm/dragino_lsn50/doc/index.rst
@@ -23,10 +23,8 @@ This kit provides:
 - GPIOs exposed via screw terminals on the carrier board
 - Housing
 
-.. image:: img/dragino_lsn50.png
-     :width: 531px
+.. image:: img/dragino_lsn50.jpg
      :align: center
-     :height: 354px
      :alt: Dragino LSN50
 
 More information about the board can be found at the `Dragino LSN50 website`_.
diff --git a/boards/arm/dragino_nbsn95/doc/img/dragino_nbsn95.jpg b/boards/arm/dragino_nbsn95/doc/img/dragino_nbsn95.jpg
new file mode 100644
index 00000000000..d3f2eb3d9e0
Binary files /dev/null and b/boards/arm/dragino_nbsn95/doc/img/dragino_nbsn95.jpg differ
diff --git a/boards/arm/dragino_nbsn95/doc/img/dragino_nbsn95.png b/boards/arm/dragino_nbsn95/doc/img/dragino_nbsn95.png
deleted file mode 100644
index 1c5ac11493f..00000000000
Binary files a/boards/arm/dragino_nbsn95/doc/img/dragino_nbsn95.png and /dev/null differ
diff --git a/boards/arm/dragino_nbsn95/doc/index.rst b/boards/arm/dragino_nbsn95/doc/index.rst
index 98992886753..762125afb3d 100644
--- a/boards/arm/dragino_nbsn95/doc/index.rst
+++ b/boards/arm/dragino_nbsn95/doc/index.rst
@@ -22,10 +22,8 @@ This kit provides:
 - GPIOs exposed via screw terminals on the carrier board
 - Housing
 
-.. image:: img/dragino_nbsn95.png
-     :width: 531px
+.. image:: img/dragino_nbsn95.jpg
      :align: center
-     :height: 354px
      :alt: Dragino NBSN95
 
 More information about the board can be found at the `Dragino NBSN95 website`_.
diff --git a/boards/arm/ebyte_e73_tbb_nrf52832/doc/img/ebyte_e73_tbb_nrf52832.jpg b/boards/arm/ebyte_e73_tbb_nrf52832/doc/img/ebyte_e73_tbb_nrf52832.jpg
index 06fd294f4c2..3b83b7d5000 100644
Binary files a/boards/arm/ebyte_e73_tbb_nrf52832/doc/img/ebyte_e73_tbb_nrf52832.jpg and b/boards/arm/ebyte_e73_tbb_nrf52832/doc/img/ebyte_e73_tbb_nrf52832.jpg differ
diff --git a/boards/arm/ebyte_e73_tbb_nrf52832/doc/index.rst b/boards/arm/ebyte_e73_tbb_nrf52832/doc/index.rst
index 1430f04fb04..d679b5f30c4 100644
--- a/boards/arm/ebyte_e73_tbb_nrf52832/doc/index.rst
+++ b/boards/arm/ebyte_e73_tbb_nrf52832/doc/index.rst
@@ -26,7 +26,6 @@ the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/ebyte_e73_tbb_nrf52832.jpg
-     :width: 520
      :align: center
      :alt: EBYTE E73-TBB
 
diff --git a/boards/arm/efm32gg_slwstk6121a/doc/index.rst b/boards/arm/efm32gg_slwstk6121a/doc/index.rst
index 61b5995b4ec..be1f25efdaa 100644
--- a/boards/arm/efm32gg_slwstk6121a/doc/index.rst
+++ b/boards/arm/efm32gg_slwstk6121a/doc/index.rst
@@ -10,8 +10,7 @@ The WGM160P Starter Kit SLWSTK6121A comes with the BRD4321A radio board.
 This radio boards contains a WGM160P module, which combines the WF200 Wi-Fi
 transceiver with an EFM32GG11 microcontroller.
 
-.. figure:: ./wgm160p-starter-kit.jpg
-   :width: 300px
+.. figure:: wgm160p-starter-kit.jpg
    :align: center
    :alt: SLWSTK6121A
 
diff --git a/boards/arm/efm32gg_slwstk6121a/doc/wgm160p-starter-kit.jpg b/boards/arm/efm32gg_slwstk6121a/doc/wgm160p-starter-kit.jpg
index 68be3359845..7b9cac8e3c6 100644
Binary files a/boards/arm/efm32gg_slwstk6121a/doc/wgm160p-starter-kit.jpg and b/boards/arm/efm32gg_slwstk6121a/doc/wgm160p-starter-kit.jpg differ
diff --git a/boards/arm/efm32gg_stk3701a/doc/efm32gg_stk3701a.jpg b/boards/arm/efm32gg_stk3701a/doc/efm32gg_stk3701a.jpg
index 25c33d94c19..58da7aae769 100644
Binary files a/boards/arm/efm32gg_stk3701a/doc/efm32gg_stk3701a.jpg and b/boards/arm/efm32gg_stk3701a/doc/efm32gg_stk3701a.jpg differ
diff --git a/boards/arm/efm32gg_stk3701a/doc/index.rst b/boards/arm/efm32gg_stk3701a/doc/index.rst
index 20ffece0991..50b3d9cd785 100644
--- a/boards/arm/efm32gg_stk3701a/doc/index.rst
+++ b/boards/arm/efm32gg_stk3701a/doc/index.rst
@@ -10,8 +10,7 @@ The EFM32 Giant Gecko Starter Kit EFM32GG-STK3701A contains an MCU from the
 EFM32GG Series 1 family built on an ARM® Cortex®-M4F processor with excellent
 low power capabilities.
 
-.. figure:: ./efm32gg_stk3701a.jpg
-   :width: 375px
+.. figure:: efm32gg_stk3701a.jpg
    :align: center
    :alt: EFM32GG-SLSTK3701A
 
diff --git a/boards/arm/efm32hg_slstk3400a/doc/efm32hg_slstk3400a.jpg b/boards/arm/efm32hg_slstk3400a/doc/efm32hg_slstk3400a.jpg
index 7279694d3c5..ffa4c0ae6ee 100644
Binary files a/boards/arm/efm32hg_slstk3400a/doc/efm32hg_slstk3400a.jpg and b/boards/arm/efm32hg_slstk3400a/doc/efm32hg_slstk3400a.jpg differ
diff --git a/boards/arm/efm32hg_slstk3400a/doc/index.rst b/boards/arm/efm32hg_slstk3400a/doc/index.rst
index 2d9c9ac9fe0..6f81474df52 100644
--- a/boards/arm/efm32hg_slstk3400a/doc/index.rst
+++ b/boards/arm/efm32hg_slstk3400a/doc/index.rst
@@ -10,8 +10,7 @@ The EFM32 Happy Gecko Starter Kit EFM32HG-SLSTK3400A contains a MCU from the
 EFM32HG family built on ARM® Cortex®-M0+ processor with excellent low
 power capabilities.
 
-.. figure:: ./efm32hg_slstk3400a.jpg
-   :width: 375px
+.. figure:: efm32hg_slstk3400a.jpg
    :align: center
    :alt: EFM32HG-SLSTK3400A
 
diff --git a/boards/arm/efm32pg_stk3401a/doc/efm32pg_stk3401a.jpg b/boards/arm/efm32pg_stk3401a/doc/efm32pg_stk3401a.jpg
index 5c48ef83c15..22c8aa42a61 100644
Binary files a/boards/arm/efm32pg_stk3401a/doc/efm32pg_stk3401a.jpg and b/boards/arm/efm32pg_stk3401a/doc/efm32pg_stk3401a.jpg differ
diff --git a/boards/arm/efm32pg_stk3401a/doc/index.rst b/boards/arm/efm32pg_stk3401a/doc/index.rst
index 99f7e94bde2..4d646060f25 100644
--- a/boards/arm/efm32pg_stk3401a/doc/index.rst
+++ b/boards/arm/efm32pg_stk3401a/doc/index.rst
@@ -10,8 +10,7 @@ The EFM32 Pearl Gecko Starter Kit EFM32PG-STK3401A contains an MCU from the
 EFM32PG family built on an ARM® Cortex®-M4F processor with excellent low
 power capabilities.
 
-.. figure:: ./efm32pg_stk3401a.jpg
-   :width: 375px
+.. figure:: efm32pg_stk3401a.jpg
    :align: center
    :alt: EFM32PG-SLSTK3401A
 
diff --git a/boards/arm/efm32pg_stk3402a/doc/efm32pg_stk3402a.jpg b/boards/arm/efm32pg_stk3402a/doc/efm32pg_stk3402a.jpg
index aea6a32e084..0815af72bfe 100644
Binary files a/boards/arm/efm32pg_stk3402a/doc/efm32pg_stk3402a.jpg and b/boards/arm/efm32pg_stk3402a/doc/efm32pg_stk3402a.jpg differ
diff --git a/boards/arm/efm32pg_stk3402a/doc/index.rst b/boards/arm/efm32pg_stk3402a/doc/index.rst
index 1a6de113ec9..6dfd2fd96e4 100644
--- a/boards/arm/efm32pg_stk3402a/doc/index.rst
+++ b/boards/arm/efm32pg_stk3402a/doc/index.rst
@@ -10,8 +10,7 @@ The EFM32 Pearl Gecko Starter Kit EFM32PG-STK3402A contains an MCU from the
 EFM32PG family built on an ARM® Cortex®-M4F processor with excellent low
 power capabilities.
 
-.. figure:: ./efm32pg_stk3402a.jpg
-   :width: 375px
+.. figure:: efm32pg_stk3402a.jpg
    :align: center
    :alt: EFM32PG-SLSTK3402A
 
diff --git a/boards/arm/efm32wg_stk3800/doc/efm32wg_stk3800.jpg b/boards/arm/efm32wg_stk3800/doc/efm32wg_stk3800.jpg
index 57384b770b4..48547fbef6e 100644
Binary files a/boards/arm/efm32wg_stk3800/doc/efm32wg_stk3800.jpg and b/boards/arm/efm32wg_stk3800/doc/efm32wg_stk3800.jpg differ
diff --git a/boards/arm/efm32wg_stk3800/doc/index.rst b/boards/arm/efm32wg_stk3800/doc/index.rst
index b947c92f656..d624619d83f 100644
--- a/boards/arm/efm32wg_stk3800/doc/index.rst
+++ b/boards/arm/efm32wg_stk3800/doc/index.rst
@@ -10,8 +10,7 @@ The EFM32 Wonder Gecko Starter Kit EFM32WG-STK3800 contains a MCU from the
 EFM32WG family built on ARM® Cortex®-M4F processor with excellent low
 power capabilities.
 
-.. figure:: ./efm32wg_stk3800.jpg
-   :width: 375px
+.. figure:: efm32wg_stk3800.jpg
    :align: center
    :alt: EFM32WG-STK3800
 
diff --git a/boards/arm/efr32_radio/doc/brd4104a.rst b/boards/arm/efr32_radio/doc/brd4104a.rst
index 49073b94ba7..e92874a4129 100644
--- a/boards/arm/efr32_radio/doc/brd4104a.rst
+++ b/boards/arm/efr32_radio/doc/brd4104a.rst
@@ -11,8 +11,7 @@ radio boards delivered with `SLWSTK6020B Bluetooth SoC Starter Kit`_. It
 contains a Wireless System-On-Chip from the EFR32BG13 family built on an
 ARM Cortex®-M4F processor with excellent low power capabilities.
 
-.. figure:: ./efr32bg13-slwrb4104a.jpg
-   :height: 260px
+.. figure:: efr32bg13-slwrb4104a.jpg
    :align: center
    :alt: SLWRB4104A Blue Gecko Bluetooth® Low Energy Radio Board
 
diff --git a/boards/arm/efr32_radio/doc/brd4180a.rst b/boards/arm/efr32_radio/doc/brd4180a.rst
index ab6f9370c78..870b324a279 100644
--- a/boards/arm/efr32_radio/doc/brd4180a.rst
+++ b/boards/arm/efr32_radio/doc/brd4180a.rst
@@ -11,8 +11,7 @@ radio boards delivered with `EFR32-SLWSTK6006A Website`_. It contains
 a Wireless System-On-Chip from the EFR32MG21 family built on an
 ARM Cortex®-M33F processor with excellent low power capabilities.
 
-.. figure:: ./efr32mg21-slwrb4180a.jpg
-   :height: 260px
+.. figure:: efr32mg21-slwrb4180a.jpg
    :align: center
    :alt: SLWRB4180A Mighty Gecko Radio Board
 
diff --git a/boards/arm/efr32_radio/doc/brd4250b.rst b/boards/arm/efr32_radio/doc/brd4250b.rst
index 0b64850e2b6..f2cf395c1b9 100644
--- a/boards/arm/efr32_radio/doc/brd4250b.rst
+++ b/boards/arm/efr32_radio/doc/brd4250b.rst
@@ -10,8 +10,7 @@ The EFR32FG1 Flex Gecko 2.4 GHz and 868 MHz Radio Board is delivered as part of
 `SLWSTK6061B Proprietary Wireless Starter Kit`_. It contains a EFR32FG1 Wireless
 SoC built on an ARM Cortex®-M4F processor with excellent low power capabilities.
 
-.. figure:: ./efr32fg1-slwrb4250b.jpg
-   :height: 262px
+.. figure:: efr32fg1-slwrb4250b.jpg
    :align: center
    :alt: SLWRB4250B Flex Gecko 2.4 GHz and 868 MHz Radio Board
 
diff --git a/boards/arm/efr32_radio/doc/brd4255a.rst b/boards/arm/efr32_radio/doc/brd4255a.rst
index 7dd82025047..ab81e513c90 100644
--- a/boards/arm/efr32_radio/doc/brd4255a.rst
+++ b/boards/arm/efr32_radio/doc/brd4255a.rst
@@ -10,8 +10,7 @@ The EFR32FG13P Flex Gecko 2.4 GHz and 915 MHz Radio Board is delivered as a
 `standalone Proprietary Wireless radio board`_. It contains a EFR32FG13P Wireless
 SoC built on an ARM Cortex®-M4F processor with excellent low power capabilities.
 
-.. figure:: ./efr32fg13-slwrb4255a.jpg
-   :height: 262px
+.. figure:: efr32fg13-slwrb4255a.jpg
    :align: center
    :alt: SLWRB4255A Flex Gecko 2.4 GHz and 915 MHz Radio Board
 
diff --git a/boards/arm/efr32_radio/doc/efr32_slwstk6020b.jpg b/boards/arm/efr32_radio/doc/efr32_slwstk6020b.jpg
index fedfe999886..5a93d75ff94 100644
Binary files a/boards/arm/efr32_radio/doc/efr32_slwstk6020b.jpg and b/boards/arm/efr32_radio/doc/efr32_slwstk6020b.jpg differ
diff --git a/boards/arm/efr32_radio/doc/efr32bg13-slwrb4104a.jpg b/boards/arm/efr32_radio/doc/efr32bg13-slwrb4104a.jpg
index edda1a43ea3..54558206831 100644
Binary files a/boards/arm/efr32_radio/doc/efr32bg13-slwrb4104a.jpg and b/boards/arm/efr32_radio/doc/efr32bg13-slwrb4104a.jpg differ
diff --git a/boards/arm/efr32_radio/doc/efr32fg1-slwrb4250b.jpg b/boards/arm/efr32_radio/doc/efr32fg1-slwrb4250b.jpg
index 8451a87ac08..bef358cd5a9 100644
Binary files a/boards/arm/efr32_radio/doc/efr32fg1-slwrb4250b.jpg and b/boards/arm/efr32_radio/doc/efr32fg1-slwrb4250b.jpg differ
diff --git a/boards/arm/efr32_radio/doc/efr32fg13-slwrb4255a.jpg b/boards/arm/efr32_radio/doc/efr32fg13-slwrb4255a.jpg
index 5d50e488732..172b8faadd7 100644
Binary files a/boards/arm/efr32_radio/doc/efr32fg13-slwrb4255a.jpg and b/boards/arm/efr32_radio/doc/efr32fg13-slwrb4255a.jpg differ
diff --git a/boards/arm/efr32_radio/doc/efr32mg21-slwrb4180a.jpg b/boards/arm/efr32_radio/doc/efr32mg21-slwrb4180a.jpg
index 1bf01c58080..9c87c42a610 100644
Binary files a/boards/arm/efr32_radio/doc/efr32mg21-slwrb4180a.jpg and b/boards/arm/efr32_radio/doc/efr32mg21-slwrb4180a.jpg differ
diff --git a/boards/arm/efr32_radio/doc/index.rst b/boards/arm/efr32_radio/doc/index.rst
index 8ce9fdcd00c..9e4f28ed98f 100644
--- a/boards/arm/efr32_radio/doc/index.rst
+++ b/boards/arm/efr32_radio/doc/index.rst
@@ -21,8 +21,7 @@ Support for EFR32 Radio boards is provided by one of the starter kits
 - `SLWSTK6061B Proprietary Wireless Starter Kit`_
 - `SLWSTK6006A Mighty Gecko Wireless Starter Kit`_
 
-.. figure:: ./efr32_slwstk6020b.jpg
-   :width: 490px
+.. figure:: efr32_slwstk6020b.jpg
    :align: center
    :alt: SLWSTK6020B Bluetooth SoC Starter Kit
 
diff --git a/boards/arm/efr32mg_sltb004a/doc/efr32mg_sltb004a.jpg b/boards/arm/efr32mg_sltb004a/doc/efr32mg_sltb004a.jpg
index 8099e5e1cc6..636ca1aac43 100644
Binary files a/boards/arm/efr32mg_sltb004a/doc/efr32mg_sltb004a.jpg and b/boards/arm/efr32mg_sltb004a/doc/efr32mg_sltb004a.jpg differ
diff --git a/boards/arm/efr32mg_sltb004a/doc/index.rst b/boards/arm/efr32mg_sltb004a/doc/index.rst
index 2d992a2c34f..ba93124302b 100644
--- a/boards/arm/efr32mg_sltb004a/doc/index.rst
+++ b/boards/arm/efr32mg_sltb004a/doc/index.rst
@@ -10,7 +10,7 @@ The EFR32™ Mighty Gecko Starter Kit EFR32MG-SLTB004A (a.k.a Thunderboard
 Sense 2) contains a MCU from the EFR32MG family built on ARM® Cortex®-M4F
 processor with low power capabilities.
 
-.. image:: ./efr32mg_sltb004a.jpg
+.. image:: efr32mg_sltb004a.jpg
    :align: center
    :alt: EFR32MG-SLTB004A
 
diff --git a/boards/arm/faze/doc/firecuda-gaming-ssd.jpg b/boards/arm/faze/doc/firecuda-gaming-ssd.jpg
index 645c118cc38..7822d895ca9 100644
Binary files a/boards/arm/faze/doc/firecuda-gaming-ssd.jpg and b/boards/arm/faze/doc/firecuda-gaming-ssd.jpg differ
diff --git a/boards/arm/faze/doc/index.rst b/boards/arm/faze/doc/index.rst
index 9abfe13debb..ed432753fd7 100644
--- a/boards/arm/faze/doc/index.rst
+++ b/boards/arm/faze/doc/index.rst
@@ -15,7 +15,6 @@ through I2C and GPIOs.
 This Zephyr port is running on the NXP LPC11U67 MCU.
 
 .. image:: firecuda-gaming-ssd.jpg
-   :width: 1000px
    :align: center
    :alt: Seagate FireCuda Gaming SSD
 
diff --git a/boards/arm/frdm_k22f/doc/frdm_k22f.jpg b/boards/arm/frdm_k22f/doc/frdm_k22f.jpg
index 3802c25cf96..5fac7d25fec 100644
Binary files a/boards/arm/frdm_k22f/doc/frdm_k22f.jpg and b/boards/arm/frdm_k22f/doc/frdm_k22f.jpg differ
diff --git a/boards/arm/frdm_k22f/doc/index.rst b/boards/arm/frdm_k22f/doc/index.rst
index 3b5b96cdba9..9fa670c7129 100644
--- a/boards/arm/frdm_k22f/doc/index.rst
+++ b/boards/arm/frdm_k22f/doc/index.rst
@@ -19,8 +19,7 @@ MCUs.
   running an open source bootloader, offers options for serial communication,
   flash programming, and run-control debugging
 
-.. image:: ./frdm_k22f.jpg
-   :width: 720px
+.. image:: frdm_k22f.jpg
    :align: center
    :alt: FRDM-K22F
 
diff --git a/boards/arm/frdm_k64f/doc/frdm_k64f.jpg b/boards/arm/frdm_k64f/doc/frdm_k64f.jpg
index b13e4fd4e88..feee11bfb6f 100644
Binary files a/boards/arm/frdm_k64f/doc/frdm_k64f.jpg and b/boards/arm/frdm_k64f/doc/frdm_k64f.jpg differ
diff --git a/boards/arm/frdm_k64f/doc/index.rst b/boards/arm/frdm_k64f/doc/index.rst
index 3bb54da8af9..c28e4cfb3a8 100644
--- a/boards/arm/frdm_k64f/doc/index.rst
+++ b/boards/arm/frdm_k64f/doc/index.rst
@@ -19,8 +19,7 @@ K63, and K24 MCUs.
   running an open source bootloader, offers options for serial communication,
   flash programming, and run-control debugging
 
-.. image:: ./frdm_k64f.jpg
-   :width: 720px
+.. image:: frdm_k64f.jpg
    :align: center
    :alt: FRDM-K64F
 
diff --git a/boards/arm/frdm_k82f/doc/frdm_k82f.jpg b/boards/arm/frdm_k82f/doc/frdm_k82f.jpg
index 5dd1b00f0b9..54efc6940f8 100644
Binary files a/boards/arm/frdm_k82f/doc/frdm_k82f.jpg and b/boards/arm/frdm_k82f/doc/frdm_k82f.jpg differ
diff --git a/boards/arm/frdm_k82f/doc/index.rst b/boards/arm/frdm_k82f/doc/index.rst
index caf876e90a0..d4955d77c2f 100644
--- a/boards/arm/frdm_k82f/doc/index.rst
+++ b/boards/arm/frdm_k82f/doc/index.rst
@@ -19,8 +19,7 @@ and K82 MCUs.
   running an open source bootloader, offers options for serial communication,
   flash programming, and run-control debugging
 
-.. image:: ./frdm_k82f.jpg
-   :width: 720px
+.. image:: frdm_k82f.jpg
    :align: center
    :alt: FRDM-K82F
 
diff --git a/boards/arm/frdm_kl25z/doc/frdm_kl25z.jpg b/boards/arm/frdm_kl25z/doc/frdm_kl25z.jpg
index f2fb0c7a6f0..6c3000d17b6 100644
Binary files a/boards/arm/frdm_kl25z/doc/frdm_kl25z.jpg and b/boards/arm/frdm_kl25z/doc/frdm_kl25z.jpg differ
diff --git a/boards/arm/frdm_kl25z/doc/index.rst b/boards/arm/frdm_kl25z/doc/index.rst
index dd845bf245d..1e6def9f190 100644
--- a/boards/arm/frdm_kl25z/doc/index.rst
+++ b/boards/arm/frdm_kl25z/doc/index.rst
@@ -15,8 +15,7 @@ low-power operation, a standard-based form factor with expansion board
 options and a built-in debug interface for flash programming and run-control.
 
 
-.. image:: ./frdm_kl25z.jpg
-   :width: 272px
+.. image:: frdm_kl25z.jpg
    :align: center
    :alt: FRDM-KL25Z
 
diff --git a/boards/arm/frdm_kw41z/doc/frdm_kw41z.jpg b/boards/arm/frdm_kw41z/doc/frdm_kw41z.jpg
index eaf3c87aad1..09f3d9d69e6 100644
Binary files a/boards/arm/frdm_kw41z/doc/frdm_kw41z.jpg and b/boards/arm/frdm_kw41z/doc/frdm_kw41z.jpg differ
diff --git a/boards/arm/frdm_kw41z/doc/index.rst b/boards/arm/frdm_kw41z/doc/index.rst
index 0d42422828a..4820d4584a2 100644
--- a/boards/arm/frdm_kw41z/doc/index.rst
+++ b/boards/arm/frdm_kw41z/doc/index.rst
@@ -22,8 +22,7 @@ F-antenna which can be bypassed to test via SMA connection, multiple power
 supply options, push/capacitive touch buttons, switches, LEDs and integrated
 sensors.
 
-.. image:: ./frdm_kw41z.jpg
-   :width: 720px
+.. image:: frdm_kw41z.jpg
    :align: center
    :alt: FRDM-KW41Z
 
diff --git a/boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.jpg b/boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.jpg
new file mode 100644
index 00000000000..de29769df49
Binary files /dev/null and b/boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.jpg differ
diff --git a/boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.png b/boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.png
deleted file mode 100644
index 3f984b8889d..00000000000
Binary files a/boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.png and /dev/null differ
diff --git a/boards/arm/gd32e103v_eval/doc/index.rst b/boards/arm/gd32e103v_eval/doc/index.rst
index 2fe7efa4839..ccf1e9b1e3e 100644
--- a/boards/arm/gd32e103v_eval/doc/index.rst
+++ b/boards/arm/gd32e103v_eval/doc/index.rst
@@ -14,8 +14,7 @@ The GD32E103VB features a single-core ARM Cortex-M4F MCU which can run up
 to 120-MHz with flash accesses zero wait states, 128kiB of Flash, 32kiB of
 SRAM and 80 GPIOs.
 
-.. image:: img/gd32e103v_eval.png
-     :width: 800px
+.. image:: img/gd32e103v_eval.jpg
      :align: center
      :alt: gd32e103v_eval
 
diff --git a/boards/arm/gd32e507v_start/doc/img/gd32e507v_start.jpg b/boards/arm/gd32e507v_start/doc/img/gd32e507v_start.jpg
index 2177b6b0c06..2e32c813544 100644
Binary files a/boards/arm/gd32e507v_start/doc/img/gd32e507v_start.jpg and b/boards/arm/gd32e507v_start/doc/img/gd32e507v_start.jpg differ
diff --git a/boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.jpg b/boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.jpg
new file mode 100644
index 00000000000..528d07470dd
Binary files /dev/null and b/boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.jpg differ
diff --git a/boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.png b/boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.png
deleted file mode 100644
index e8c5de489d4..00000000000
Binary files a/boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.png and /dev/null differ
diff --git a/boards/arm/gd32f350r_eval/doc/index.rst b/boards/arm/gd32f350r_eval/doc/index.rst
index 7aa8ce3bb80..35971620c17 100644
--- a/boards/arm/gd32f350r_eval/doc/index.rst
+++ b/boards/arm/gd32f350r_eval/doc/index.rst
@@ -13,7 +13,7 @@ The GD32F350RBT6 features a single-core ARM Cortex-M4F MCU which can run up
 to 108-MHz with flash accesses zero wait states, 128kB of Flash, 16kB of
 SRAM and 55 GPIOs.
 
-.. image:: img/gd32f350r_eval.png
+.. image:: img/gd32f350r_eval.jpg
      :align: center
      :alt: gd32f350r_eval
 
diff --git a/boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.jpg b/boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.jpg
new file mode 100644
index 00000000000..de29769df49
Binary files /dev/null and b/boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.jpg differ
diff --git a/boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.png b/boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.png
deleted file mode 100644
index 3f984b8889d..00000000000
Binary files a/boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.png and /dev/null differ
diff --git a/boards/arm/gd32f403z_eval/doc/index.rst b/boards/arm/gd32f403z_eval/doc/index.rst
index 54d37567921..4a2f5fffa5f 100644
--- a/boards/arm/gd32f403z_eval/doc/index.rst
+++ b/boards/arm/gd32f403z_eval/doc/index.rst
@@ -14,8 +14,7 @@ The GD32F403ZE features a single-core ARM Cortex-M4F MCU which can run up
 to 168-MHz with flash accesses zero wait states, 512kiB of Flash, 96kiB of
 SRAM and 112 GPIOs.
 
-.. image:: img/gd32f403z_eval.png
-     :width: 800px
+.. image:: img/gd32f403z_eval.jpg
      :align: center
      :alt: gd32f403z_eval
 
diff --git a/boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.jpg b/boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.jpg
new file mode 100644
index 00000000000..032905d9842
Binary files /dev/null and b/boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.jpg differ
diff --git a/boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.png b/boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.png
deleted file mode 100644
index 0fe5f3aed2c..00000000000
Binary files a/boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.png and /dev/null differ
diff --git a/boards/arm/gd32f450i_eval/doc/index.rst b/boards/arm/gd32f450i_eval/doc/index.rst
index 23d4c97ae51..56017e4aef5 100644
--- a/boards/arm/gd32f450i_eval/doc/index.rst
+++ b/boards/arm/gd32f450i_eval/doc/index.rst
@@ -13,7 +13,7 @@ The GD32F450IK features a single-core ARM Cortex-M4F MCU which can run up
 to 200 MHz with flash accesses zero wait states, 3072kiB of Flash, 256kiB of
 SRAM and 140 GPIOs.
 
-.. image:: img/gd32f450i_eval.png
+.. image:: img/gd32f450i_eval.jpg
      :align: center
      :alt: gd32f450i_eval
 
diff --git a/boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.jpg b/boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.jpg
new file mode 100644
index 00000000000..7fca7753646
Binary files /dev/null and b/boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.jpg differ
diff --git a/boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.png b/boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.png
deleted file mode 100644
index a0749adedfb..00000000000
Binary files a/boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.png and /dev/null differ
diff --git a/boards/arm/gd32f450z_eval/doc/index.rst b/boards/arm/gd32f450z_eval/doc/index.rst
index 1dcb94c3b89..179886cd0db 100644
--- a/boards/arm/gd32f450z_eval/doc/index.rst
+++ b/boards/arm/gd32f450z_eval/doc/index.rst
@@ -13,7 +13,7 @@ The GD32F450ZK features a single-core ARM Cortex-M4F MCU which can run up
 to 200 MHz with flash accesses zero wait states, 3072kiB of Flash, 256kiB of
 SRAM and 114 GPIOs.
 
-.. image:: img/gd32f450z_eval.png
+.. image:: img/gd32f450z_eval.jpg
      :align: center
      :alt: gd32f450z_eval
 
diff --git a/boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.jpg b/boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.jpg
new file mode 100644
index 00000000000..d4d870ecb89
Binary files /dev/null and b/boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.jpg differ
diff --git a/boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.png b/boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.png
deleted file mode 100644
index 340af2fabd5..00000000000
Binary files a/boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.png and /dev/null differ
diff --git a/boards/arm/gd32f470i_eval/doc/index.rst b/boards/arm/gd32f470i_eval/doc/index.rst
index e09f4c8a774..c28b0212bb1 100644
--- a/boards/arm/gd32f470i_eval/doc/index.rst
+++ b/boards/arm/gd32f470i_eval/doc/index.rst
@@ -13,7 +13,7 @@ The GD32F470IK features a single-core ARM Cortex-M4F MCU which can run up
 to 240 MHz with flash accesses zero wait states, 3072kiB of Flash, 256kiB of
 SRAM and 140 GPIOs.
 
-.. image:: img/gd32f470i_eval.png
+.. image:: img/gd32f470i_eval.jpg
      :align: center
      :alt: gd32f470i_eval
 
diff --git a/boards/arm/hexiwear_k64/doc/hexiwear_k64.jpg b/boards/arm/hexiwear_k64/doc/hexiwear_k64.jpg
index ad9e300008e..e16f61a96e1 100644
Binary files a/boards/arm/hexiwear_k64/doc/hexiwear_k64.jpg and b/boards/arm/hexiwear_k64/doc/hexiwear_k64.jpg differ
diff --git a/boards/arm/hexiwear_k64/doc/index.rst b/boards/arm/hexiwear_k64/doc/index.rst
index b78f4d4e1df..7632ce9c9e0 100644
--- a/boards/arm/hexiwear_k64/doc/index.rst
+++ b/boards/arm/hexiwear_k64/doc/index.rst
@@ -22,8 +22,7 @@ capacitive buttons with haptic feedback.
 - Flexibility to let you add the sensors of your choice nearly 200 additional
   sensors through click boards.
 
-.. image:: ./hexiwear_k64.jpg
-   :width: 442px
+.. image:: hexiwear_k64.jpg
    :align: center
    :alt: Hexiwear
 
diff --git a/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_front.jpg b/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_front.jpg
index 25be0f24daf..6ca029e4161 100644
Binary files a/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_front.jpg and b/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_front.jpg differ
diff --git a/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_pcb.jpg b/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_pcb.jpg
new file mode 100644
index 00000000000..7bbe2d06979
Binary files /dev/null and b/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_pcb.jpg differ
diff --git a/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_pcb.png b/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_pcb.png
deleted file mode 100644
index 448cda8e505..00000000000
Binary files a/boards/arm/holyiot_yj16019/doc/img/holyiot_yj16019_pcb.png and /dev/null differ
diff --git a/boards/arm/holyiot_yj16019/doc/index.rst b/boards/arm/holyiot_yj16019/doc/index.rst
index 495f90cf50a..639b04a5470 100644
--- a/boards/arm/holyiot_yj16019/doc/index.rst
+++ b/boards/arm/holyiot_yj16019/doc/index.rst
@@ -21,7 +21,6 @@ Semiconductor nRF52832 ARM Cortex-M4 CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/holyiot_yj16019_front.jpg
-     :width: 375px
      :align: center
      :alt: Holyiot YJ-16019
 
@@ -95,8 +94,7 @@ pads on the PCB (see image):
 * SWDIO = SDO
 * SWCLK = SCK
 
-.. figure:: img/holyiot_yj16019_pcb.png
-     :width: 390px
+.. figure:: img/holyiot_yj16019_pcb.jpg
      :align: center
      :alt: Holyiot YJ-16019 PCB
 
diff --git a/boards/arm/ip_k66f/doc/index.rst b/boards/arm/ip_k66f/doc/index.rst
index 38acc3dc1dc..b915b60f1e3 100644
--- a/boards/arm/ip_k66f/doc/index.rst
+++ b/boards/arm/ip_k66f/doc/index.rst
@@ -13,8 +13,7 @@ Ethernet switch with Gigabit RGMII/MII/RMII interface.
 - KSZ8794CNX enables evaluation for switch functions
 - On-board debug probe J-Link-OB for programming
 
-.. image:: ./ip_k66f.png
-   :width: 720px
+.. image:: ip_k66f.jpg
    :align: center
    :alt: IP-K66F
 
diff --git a/boards/arm/ip_k66f/doc/ip_k66f.jpg b/boards/arm/ip_k66f/doc/ip_k66f.jpg
new file mode 100644
index 00000000000..8060b6126c2
Binary files /dev/null and b/boards/arm/ip_k66f/doc/ip_k66f.jpg differ
diff --git a/boards/arm/ip_k66f/doc/ip_k66f.png b/boards/arm/ip_k66f/doc/ip_k66f.png
deleted file mode 100644
index 2e4fa19e5f6..00000000000
Binary files a/boards/arm/ip_k66f/doc/ip_k66f.png and /dev/null differ
diff --git a/boards/arm/legend/doc/img/firecuda_gaming_hard_drive.jpg b/boards/arm/legend/doc/img/firecuda_gaming_hard_drive.jpg
new file mode 100644
index 00000000000..3f3287b4750
Binary files /dev/null and b/boards/arm/legend/doc/img/firecuda_gaming_hard_drive.jpg differ
diff --git a/boards/arm/legend/doc/img/firecuda_gaming_hard_drive.png b/boards/arm/legend/doc/img/firecuda_gaming_hard_drive.png
deleted file mode 100644
index d307b423339..00000000000
Binary files a/boards/arm/legend/doc/img/firecuda_gaming_hard_drive.png and /dev/null differ
diff --git a/boards/arm/legend/doc/img/firecuda_gaming_hub.jpg b/boards/arm/legend/doc/img/firecuda_gaming_hub.jpg
new file mode 100644
index 00000000000..9ac2ecfaddb
Binary files /dev/null and b/boards/arm/legend/doc/img/firecuda_gaming_hub.jpg differ
diff --git a/boards/arm/legend/doc/img/firecuda_gaming_hub.png b/boards/arm/legend/doc/img/firecuda_gaming_hub.png
deleted file mode 100644
index ea56212b05a..00000000000
Binary files a/boards/arm/legend/doc/img/firecuda_gaming_hub.png and /dev/null differ
diff --git a/boards/arm/legend/doc/index.rst b/boards/arm/legend/doc/index.rst
index 55204f7dbc4..c744281d651 100644
--- a/boards/arm/legend/doc/index.rst
+++ b/boards/arm/legend/doc/index.rst
@@ -25,13 +25,11 @@ MCU. The two chips are connected together using I2C.
 
 On all boards, the Zephyr port is running on the STM32F070 MCU.
 
-.. image:: img/firecuda_gaming_hard_drive.png
-   :width: 550px
+.. image:: img/firecuda_gaming_hard_drive.jpg
    :align: center
    :alt: Seagate FireCuda Gaming Hard Drive
 
-.. image:: img/firecuda_gaming_hub.png
-   :width: 550px
+.. image:: img/firecuda_gaming_hub.jpg
    :align: center
    :alt: Seagate FireCuda Gaming Hub
 
diff --git a/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board.jpg b/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board.jpg
new file mode 100644
index 00000000000..f4cc12ede43
Binary files /dev/null and b/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board.jpg differ
diff --git a/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board.png b/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board.png
deleted file mode 100644
index 051e6c2ea11..00000000000
Binary files a/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board.png and /dev/null differ
diff --git a/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board_pinout.jpg b/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board_pinout.jpg
new file mode 100644
index 00000000000..8822017b4f2
Binary files /dev/null and b/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board_pinout.jpg differ
diff --git a/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board_pinout.png b/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board_pinout.png
deleted file mode 100644
index 2d1c5c90829..00000000000
Binary files a/boards/arm/lora_e5_dev_board/doc/img/lora_e5_dev_board_pinout.png and /dev/null differ
diff --git a/boards/arm/lora_e5_dev_board/doc/lora_e5_dev_board.rst b/boards/arm/lora_e5_dev_board/doc/lora_e5_dev_board.rst
index 9625802f89b..a24920002d9 100644
--- a/boards/arm/lora_e5_dev_board/doc/lora_e5_dev_board.rst
+++ b/boards/arm/lora_e5_dev_board/doc/lora_e5_dev_board.rst
@@ -13,8 +13,7 @@ The LoRa-E5-HF STM32WLE5JC Module supports multiple LPWAN protocols on the
 All GPIOs of the LoRa-E5 Module are laid out supporting
 various data protocols and interfaces including RS-485 and Grove.
 
-.. image:: img/lora_e5_dev_board.png
-   :width: 700px
+.. image:: img/lora_e5_dev_board.jpg
    :align: center
    :alt: LoRa-E5 Dev board
 
@@ -127,7 +126,7 @@ for pin muxing, input/output, pull-up, etc.
 Available pins:
 ---------------
 
-.. image:: img/lora_e5_dev_board_pinout.png
+.. image:: img/lora_e5_dev_board_pinout.jpg
       :align: center
       :alt: LoRa-E5 Dev Board Pinout
 
diff --git a/boards/arm/lpcxpresso11u68/doc/index.rst b/boards/arm/lpcxpresso11u68/doc/index.rst
index aa880af08cb..75a4b7f15a5 100644
--- a/boards/arm/lpcxpresso11u68/doc/index.rst
+++ b/boards/arm/lpcxpresso11u68/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The LPCXpresso11u68 development board uses an NXP LPC11U68 MCU based
 on an ARM Cortex-M0+ core.
 
-.. figure:: lpcxpresso11u68.png
-   :width: 800px
+.. figure:: lpcxpresso11u68.jpg
    :align: center
    :alt: LPCXpresso11U68
 
diff --git a/boards/arm/lpcxpresso11u68/doc/lpcxpresso11u68.jpg b/boards/arm/lpcxpresso11u68/doc/lpcxpresso11u68.jpg
new file mode 100644
index 00000000000..2eb887c1509
Binary files /dev/null and b/boards/arm/lpcxpresso11u68/doc/lpcxpresso11u68.jpg differ
diff --git a/boards/arm/lpcxpresso11u68/doc/lpcxpresso11u68.png b/boards/arm/lpcxpresso11u68/doc/lpcxpresso11u68.png
deleted file mode 100644
index 6c247f766de..00000000000
Binary files a/boards/arm/lpcxpresso11u68/doc/lpcxpresso11u68.png and /dev/null differ
diff --git a/boards/arm/lpcxpresso51u68/doc/index.rst b/boards/arm/lpcxpresso51u68/doc/index.rst
index 7eafbb80f9d..c1fff7e4d7b 100644
--- a/boards/arm/lpcxpresso51u68/doc/index.rst
+++ b/boards/arm/lpcxpresso51u68/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The LPCXpresso51u68 development board uses an NXP LPC51U68 MCU based
 on an ARM CORTEX-M0+ core.
 
-.. figure:: lpcxpresso51u68.png
-   :width: 800px
+.. figure:: lpcxpresso51u68.jpg
    :align: center
    :alt: LPCXpresso51U68
 
diff --git a/boards/arm/lpcxpresso51u68/doc/lpcxpresso51u68.jpg b/boards/arm/lpcxpresso51u68/doc/lpcxpresso51u68.jpg
new file mode 100644
index 00000000000..725f40075a6
Binary files /dev/null and b/boards/arm/lpcxpresso51u68/doc/lpcxpresso51u68.jpg differ
diff --git a/boards/arm/lpcxpresso51u68/doc/lpcxpresso51u68.png b/boards/arm/lpcxpresso51u68/doc/lpcxpresso51u68.png
deleted file mode 100644
index 2e89e813d4d..00000000000
Binary files a/boards/arm/lpcxpresso51u68/doc/lpcxpresso51u68.png and /dev/null differ
diff --git a/boards/arm/lpcxpresso54114/doc/index.rst b/boards/arm/lpcxpresso54114/doc/index.rst
index ebec53e7f68..e0d38c663ac 100644
--- a/boards/arm/lpcxpresso54114/doc/index.rst
+++ b/boards/arm/lpcxpresso54114/doc/index.rst
@@ -13,8 +13,7 @@ microcontrollers. LPCXpresso is an end-to-end solution enabling embedded
 engineers to develop their applications from initial evaluation to final
 production.
 
-.. image:: ./lpcxpresso54114_m4.png
-   :width: 720px
+.. image:: lpcxpresso54114_m4.jpg
    :align: center
    :alt: LPCXPRESSO54114
 
diff --git a/boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.jpg b/boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.jpg
new file mode 100644
index 00000000000..dd3a1e76043
Binary files /dev/null and b/boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.jpg differ
diff --git a/boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.png b/boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.png
deleted file mode 100644
index 1ee717a962d..00000000000
Binary files a/boards/arm/lpcxpresso54114/doc/lpcxpresso54114_m4.png and /dev/null differ
diff --git a/boards/arm/lpcxpresso55s06/doc/index.rst b/boards/arm/lpcxpresso55s06/doc/index.rst
index 775ed081761..8ca45df1541 100644
--- a/boards/arm/lpcxpresso55s06/doc/index.rst
+++ b/boards/arm/lpcxpresso55s06/doc/index.rst
@@ -13,8 +13,7 @@ with additional expansion ports around the Arduino footprint, along
 with a PMod/host interface port and MikroElektronika Click module
 site.
 
-.. image:: ./lpcxpress55s06.png
-   :width: 720px
+.. image:: lpcxpress55s06.jpg
    :align: center
    :alt: LPCXpresso55S06
 
diff --git a/boards/arm/lpcxpresso55s06/doc/lpcxpress55s06.jpg b/boards/arm/lpcxpresso55s06/doc/lpcxpress55s06.jpg
new file mode 100644
index 00000000000..ad97b295da2
Binary files /dev/null and b/boards/arm/lpcxpresso55s06/doc/lpcxpress55s06.jpg differ
diff --git a/boards/arm/lpcxpresso55s06/doc/lpcxpress55s06.png b/boards/arm/lpcxpresso55s06/doc/lpcxpress55s06.png
deleted file mode 100644
index b3f897560c9..00000000000
Binary files a/boards/arm/lpcxpresso55s06/doc/lpcxpress55s06.png and /dev/null differ
diff --git a/boards/arm/lpcxpresso55s16/doc/index.rst b/boards/arm/lpcxpresso55s16/doc/index.rst
index 7ef25d60582..5202c6e1b7e 100644
--- a/boards/arm/lpcxpresso55s16/doc/index.rst
+++ b/boards/arm/lpcxpresso55s16/doc/index.rst
@@ -13,8 +13,7 @@ with additional expansion ports around the Arduino footprint, along
 with a PMod/host interface port and MikroElektronika Click module
 site.
 
-.. image:: ./lpcxpresso55S16.jpg
-   :width: 720px
+.. image:: lpcxpresso55S16.jpg
    :align: center
    :alt: LPCXpresso55S16
 
diff --git a/boards/arm/lpcxpresso55s16/doc/lpcxpresso55S16.jpg b/boards/arm/lpcxpresso55s16/doc/lpcxpresso55S16.jpg
index 96c11399d61..919cfc7f91e 100644
Binary files a/boards/arm/lpcxpresso55s16/doc/lpcxpresso55S16.jpg and b/boards/arm/lpcxpresso55s16/doc/lpcxpresso55S16.jpg differ
diff --git a/boards/arm/lpcxpresso55s28/doc/LPC55S28-EVK.jpg b/boards/arm/lpcxpresso55s28/doc/LPC55S28-EVK.jpg
new file mode 100644
index 00000000000..8aa3f469d33
Binary files /dev/null and b/boards/arm/lpcxpresso55s28/doc/LPC55S28-EVK.jpg differ
diff --git a/boards/arm/lpcxpresso55s28/doc/LPC55S28-EVK.png b/boards/arm/lpcxpresso55s28/doc/LPC55S28-EVK.png
deleted file mode 100644
index 23676fb92d9..00000000000
Binary files a/boards/arm/lpcxpresso55s28/doc/LPC55S28-EVK.png and /dev/null differ
diff --git a/boards/arm/lpcxpresso55s28/doc/index.rst b/boards/arm/lpcxpresso55s28/doc/index.rst
index 1e870c171e2..c8d5fec7ce3 100644
--- a/boards/arm/lpcxpresso55s28/doc/index.rst
+++ b/boards/arm/lpcxpresso55s28/doc/index.rst
@@ -12,8 +12,7 @@ architecture. The board includes a high-performance onboard debug probe, audio
 subsystem and accelerometer, with several options for adding off-the-shelf
 add-on boards for networking, sensors, displays, and other interfaces.
 
-.. image:: ./LPC55S28-EVK.png
-   :width: 720px
+.. image:: LPC55S28-EVK.jpg
    :align: center
    :alt: LPCXpresso55S28
 
diff --git a/boards/arm/lpcxpresso55s36/doc/index.rst b/boards/arm/lpcxpresso55s36/doc/index.rst
index 73ff56d67f2..15e12046d56 100644
--- a/boards/arm/lpcxpresso55s36/doc/index.rst
+++ b/boards/arm/lpcxpresso55s36/doc/index.rst
@@ -13,8 +13,7 @@ with additional expansion ports around the Arduino footprint, along
 with a PMod/host interface port and MikroElektronika Click module
 site.
 
-.. image:: ./lpcxpresso55S36.jpg
-   :width: 720px
+.. image:: lpcxpresso55S36.jpg
    :align: center
    :alt: LPCXpresso55S36
 
diff --git a/boards/arm/lpcxpresso55s36/doc/lpcxpresso55S36.jpg b/boards/arm/lpcxpresso55s36/doc/lpcxpresso55S36.jpg
index e23bbfc951c..1f4c41d1b9e 100644
Binary files a/boards/arm/lpcxpresso55s36/doc/lpcxpresso55S36.jpg and b/boards/arm/lpcxpresso55s36/doc/lpcxpresso55S36.jpg differ
diff --git a/boards/arm/lpcxpresso55s69/doc/index.rst b/boards/arm/lpcxpresso55s69/doc/index.rst
index 097aaa114c9..a3b70af4ecf 100644
--- a/boards/arm/lpcxpresso55s69/doc/index.rst
+++ b/boards/arm/lpcxpresso55s69/doc/index.rst
@@ -12,8 +12,7 @@ architecture. The board includes a high performance onboard debug probe, audio
 subsystem, and accelerometer, with several options for adding off-the-shelf
 add-on boards for networking, sensors, displays, and other interfaces.
 
-.. image:: ./lpcxpresso55s69.jpg
-   :width: 720px
+.. image:: lpcxpresso55s69.jpg
    :align: center
    :alt: LPCXPRESSO55S69
 
diff --git a/boards/arm/lpcxpresso55s69/doc/lpcxpresso55s69.jpg b/boards/arm/lpcxpresso55s69/doc/lpcxpresso55s69.jpg
index 29cb54f65e6..556916dc093 100644
Binary files a/boards/arm/lpcxpresso55s69/doc/lpcxpresso55s69.jpg and b/boards/arm/lpcxpresso55s69/doc/lpcxpresso55s69.jpg differ
diff --git a/boards/arm/mec1501modular_assy6885/doc/index.rst b/boards/arm/mec1501modular_assy6885/doc/index.rst
index 381613ca84d..6e92348a3cd 100644
--- a/boards/arm/mec1501modular_assy6885/doc/index.rst
+++ b/boards/arm/mec1501modular_assy6885/doc/index.rst
@@ -10,8 +10,7 @@ The MEC1501 Modular card ASSY6885 is a development board to evaluate the Microch
 MEC152X series microcontrollers. This board can work standalone or be mated with
 any platform that complies with MECC specification.
 
-.. image:: ./mec1501modular_assy6885.png
-     :width: 600px
+.. image:: mec1501modular_assy6885.jpg
      :align: center
      :alt: MEC1501 Modular ASSY 6885
 
diff --git a/boards/arm/mec1501modular_assy6885/doc/mec1501modular_assy6885.jpg b/boards/arm/mec1501modular_assy6885/doc/mec1501modular_assy6885.jpg
new file mode 100644
index 00000000000..e07b3fdb603
Binary files /dev/null and b/boards/arm/mec1501modular_assy6885/doc/mec1501modular_assy6885.jpg differ
diff --git a/boards/arm/mec1501modular_assy6885/doc/mec1501modular_assy6885.png b/boards/arm/mec1501modular_assy6885/doc/mec1501modular_assy6885.png
deleted file mode 100644
index 0e2b95821e7..00000000000
Binary files a/boards/arm/mec1501modular_assy6885/doc/mec1501modular_assy6885.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/dediprog_connector_2.jpg b/boards/arm/mec15xxevb_assy6853/doc/dediprog_connector_2.jpg
new file mode 100644
index 00000000000..e8c932fe4e8
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/dediprog_connector_2.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/dediprog_connector_2.png b/boards/arm/mec15xxevb_assy6853/doc/dediprog_connector_2.png
deleted file mode 100644
index ccdd6155ec8..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/dediprog_connector_2.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/index.rst b/boards/arm/mec15xxevb_assy6853/doc/index.rst
index 25fa116c8ed..2053e1366a1 100644
--- a/boards/arm/mec15xxevb_assy6853/doc/index.rst
+++ b/boards/arm/mec15xxevb_assy6853/doc/index.rst
@@ -15,8 +15,7 @@ been updated requiring a new SPI image tool. MEC1501 and MEC152x SPI image
 formats are not compatible with each other. Evaluation and cpu boards are
 compatible.
 
-.. image:: ./mec15xxevb_assy6853.png
-     :width: 600px
+.. image:: mec15xxevb_assy6853.jpg
      :align: center
      :alt: MEC15XX EVB ASSY 6853
 
@@ -196,8 +195,7 @@ PVT SPI, SHD SPI and LED0-2 respectively.
 To receive UART2 serial output, please refer to the picture below
 to make sure that JP9 configured for UART2 output.
 
-.. image:: ./mec15xxevb_assy6853_jp9_1.png
-     :width: 300px
+.. image:: mec15xxevb_assy6853_jp9_1.jpg
      :align: center
      :alt: JP9 header Assy6853
 
@@ -287,8 +285,7 @@ Wiring
 ========
 #. Connect the SPI Dongle ASSY 6791 to ``J44`` in the EVB.
 
-   .. image:: ./spidongle_assy6791_view1.png
-        :width: 400px
+   .. image:: spidongle_assy6791_view1.jpg
         :align: center
         :alt: SPI DONGLE ASSY 6791 Connected
 
@@ -300,21 +297,18 @@ Wiring
       :align: center
 
       * -
-          .. image:: spidongle_assy6791.png
-             :width: 300px
+          .. image:: spidongle_assy6791.jpg
              :align: center
              :alt: SPI DONGLE ASSY 6791
 
         -
-          .. image:: spidongle_assy6791_view2.png
-             :width: 300px
+          .. image:: spidongle_assy6791_view2.jpg
              :align: center
              :alt: SPI DONGLE ASSY 6791 view 2
 
           |
 
-          .. image:: dediprog_connector_2.png
-             :width: 300px
+          .. image:: dediprog_connector_2.jpg
              :align: center
              :alt: SPI DONGLE ASSY 6791 Connected
 
@@ -346,15 +340,13 @@ Wiring
 #. Apply power to the board via a micro-USB cable.
    Configure this option by using a jumper between ``JP88 7-8``.
 
-   .. image:: ./jp88_power_options.png
-        :width: 400px
+   .. image:: jp88_power_options.jpg
         :align: center
         :alt: SPI DONGLE ASSY 6791 Connected
 
 #. Final wiring for the board should look like this:
 
-   .. image:: ./mec_board_setup.png
-        :width: 600px
+   .. image:: mec_board_setup.jpg
         :align: center
         :alt: SPI DONGLE ASSY 6791 Connected
 
@@ -395,8 +387,7 @@ Flashing
    .. note:: When west process started press Reset button and do not release it
     till the whole west process will not be finished successfully.
 
-    .. image:: ./reset_button_1.png
-         :width: 400px
+    .. image:: reset_button_1.jpg
          :align: center
          :alt: SPI DONGLE ASSY 6791 Connected
 
diff --git a/boards/arm/mec15xxevb_assy6853/doc/jp88_power_options.jpg b/boards/arm/mec15xxevb_assy6853/doc/jp88_power_options.jpg
new file mode 100644
index 00000000000..f6798e20e07
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/jp88_power_options.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/jp88_power_options.png b/boards/arm/mec15xxevb_assy6853/doc/jp88_power_options.png
deleted file mode 100644
index 7572d7a1506..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/jp88_power_options.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853.jpg b/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853.jpg
new file mode 100644
index 00000000000..9525f683ab6
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853.png b/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853.png
deleted file mode 100644
index 8c292f4bece..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853_jp9_1.jpg b/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853_jp9_1.jpg
new file mode 100644
index 00000000000..c89f4d32cc6
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853_jp9_1.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853_jp9_1.png b/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853_jp9_1.png
deleted file mode 100644
index d4bedec1fea..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/mec15xxevb_assy6853_jp9_1.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/mec_board_setup.jpg b/boards/arm/mec15xxevb_assy6853/doc/mec_board_setup.jpg
new file mode 100644
index 00000000000..383fd827c91
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/mec_board_setup.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/mec_board_setup.png b/boards/arm/mec15xxevb_assy6853/doc/mec_board_setup.png
deleted file mode 100644
index 7c4d8d8373f..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/mec_board_setup.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/reset_button_1.jpg b/boards/arm/mec15xxevb_assy6853/doc/reset_button_1.jpg
new file mode 100644
index 00000000000..0ae390d5b82
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/reset_button_1.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/reset_button_1.png b/boards/arm/mec15xxevb_assy6853/doc/reset_button_1.png
deleted file mode 100644
index 4e658f1e146..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/reset_button_1.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791.jpg b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791.jpg
new file mode 100644
index 00000000000..2b51781c7b1
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791.png b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791.png
deleted file mode 100644
index 6843c27a8a3..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view1.jpg b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view1.jpg
new file mode 100644
index 00000000000..d459c74cdb8
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view1.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view1.png b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view1.png
deleted file mode 100644
index 68e99b3adf0..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view1.png and /dev/null differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view2.jpg b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view2.jpg
new file mode 100644
index 00000000000..b68fda1083f
Binary files /dev/null and b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view2.jpg differ
diff --git a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view2.png b/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view2.png
deleted file mode 100644
index 5674d21c7e4..00000000000
Binary files a/boards/arm/mec15xxevb_assy6853/doc/spidongle_assy6791_view2.png and /dev/null differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/Reset_Button.jpg b/boards/arm/mec172xevb_assy6906/doc/Reset_Button.jpg
new file mode 100644
index 00000000000..c9fde56cca3
Binary files /dev/null and b/boards/arm/mec172xevb_assy6906/doc/Reset_Button.jpg differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/Reset_Button.png b/boards/arm/mec172xevb_assy6906/doc/Reset_Button.png
deleted file mode 100644
index 89001b0ebdc..00000000000
Binary files a/boards/arm/mec172xevb_assy6906/doc/Reset_Button.png and /dev/null differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/dediprog_connector.jpg b/boards/arm/mec172xevb_assy6906/doc/dediprog_connector.jpg
new file mode 100644
index 00000000000..11e13cbd24c
Binary files /dev/null and b/boards/arm/mec172xevb_assy6906/doc/dediprog_connector.jpg differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/dediprog_connector.png b/boards/arm/mec172xevb_assy6906/doc/dediprog_connector.png
deleted file mode 100644
index a1243fc5b28..00000000000
Binary files a/boards/arm/mec172xevb_assy6906/doc/dediprog_connector.png and /dev/null differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/index.rst b/boards/arm/mec172xevb_assy6906/doc/index.rst
index cf3ec036ce5..b0806817d94 100644
--- a/boards/arm/mec172xevb_assy6906/doc/index.rst
+++ b/boards/arm/mec172xevb_assy6906/doc/index.rst
@@ -11,8 +11,7 @@ Microchip MEC172X series microcontrollers. This board needs to be mated with
 part number MEC172x 144WFBGA SOLDER DC ASSY 6914 (cpu board) in order to operate.
 MEC172x and MEC152x SPI image formats are not compatible with each other.
 
-.. image:: ./mec172xevb_assy6906.png
-     :width: 600px
+.. image:: mec172xevb_assy6906.jpg
      :align: center
      :alt: MEC172X EVB ASSY 6906
 
@@ -314,8 +313,7 @@ Wiring
 
 #. Connect the SPI Dongle ASSY 6791 to ``J34`` in the EVB.
 
-   .. image:: ./spidongle_assy6791.png
-        :width: 337px
+   .. image:: spidongle_assy6791.jpg
         :align: center
         :alt: SPI DONGLE ASSY 6791 Connected
 
@@ -323,8 +321,7 @@ Wiring
    ``U3``. Make sure that your programmer's offset is 0x0.
    For programming you can use Dediprog SF100 or a similar tool for flashing SPI chips.
 
-   .. image:: ./dediprog_connector.png
-        :width: 800px
+   .. image:: dediprog_connector.jpg
         :align: center
         :alt: SF100 Connected
 
@@ -356,8 +353,7 @@ Wiring
 #. Apply power to the board via a micro-USB cable.
    Configure this option by using a jumper between ``JP30 7-8``.
 
-   .. image:: ./jp30_power_options.png
-        :width: 600px
+   .. image:: jp30_power_options.jpg
         :align: center
         :alt: Power Connection
 
@@ -400,8 +396,7 @@ Flashing
    .. note:: When west process started press Reset button ``S2`` and do not release it
     till the whole west process will not be finished successfully.
 
-   .. image:: ./Reset_Button.png
-        :width: 600px
+   .. image:: Reset_Button.jpg
         :align: center
         :alt: Reset Button
 
diff --git a/boards/arm/mec172xevb_assy6906/doc/jp30_power_options.jpg b/boards/arm/mec172xevb_assy6906/doc/jp30_power_options.jpg
new file mode 100644
index 00000000000..cc4c8ed2c6c
Binary files /dev/null and b/boards/arm/mec172xevb_assy6906/doc/jp30_power_options.jpg differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/jp30_power_options.png b/boards/arm/mec172xevb_assy6906/doc/jp30_power_options.png
deleted file mode 100644
index 18ffe0c64a6..00000000000
Binary files a/boards/arm/mec172xevb_assy6906/doc/jp30_power_options.png and /dev/null differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/mec172xevb_assy6906.jpg b/boards/arm/mec172xevb_assy6906/doc/mec172xevb_assy6906.jpg
new file mode 100644
index 00000000000..9a6758a3eeb
Binary files /dev/null and b/boards/arm/mec172xevb_assy6906/doc/mec172xevb_assy6906.jpg differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/mec172xevb_assy6906.png b/boards/arm/mec172xevb_assy6906/doc/mec172xevb_assy6906.png
deleted file mode 100644
index 360538059cf..00000000000
Binary files a/boards/arm/mec172xevb_assy6906/doc/mec172xevb_assy6906.png and /dev/null differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/spidongle_assy6791.jpg b/boards/arm/mec172xevb_assy6906/doc/spidongle_assy6791.jpg
new file mode 100644
index 00000000000..90c7e5bac68
Binary files /dev/null and b/boards/arm/mec172xevb_assy6906/doc/spidongle_assy6791.jpg differ
diff --git a/boards/arm/mec172xevb_assy6906/doc/spidongle_assy6791.png b/boards/arm/mec172xevb_assy6906/doc/spidongle_assy6791.png
deleted file mode 100644
index 55b7ef06830..00000000000
Binary files a/boards/arm/mec172xevb_assy6906/doc/spidongle_assy6791.png and /dev/null differ
diff --git a/boards/arm/mec2016evb_assy6797/doc/index.rst b/boards/arm/mec2016evb_assy6797/doc/index.rst
index 20f6c9ebb62..0d37d043e6c 100644
--- a/boards/arm/mec2016evb_assy6797/doc/index.rst
+++ b/boards/arm/mec2016evb_assy6797/doc/index.rst
@@ -10,8 +10,7 @@ The MEC2016EVB_ASSY6797 kit is a development platform to evaluate the
 Microchip MEC1701X series microcontrollers. This board needs to be mated with
 part number MEC170X 144WFBA SOLDER DC ASSY 6801(cpu board) in order to operate.
 
-.. image:: ./mec2016evb_assy6797.jpg
-     :width: 500px
+.. image:: mec2016evb_assy6797.jpg
      :align: center
      :alt: MEC2016 EVB ASSY 6797
 
diff --git a/boards/arm/mec2016evb_assy6797/doc/mec2016evb_assy6797.jpg b/boards/arm/mec2016evb_assy6797/doc/mec2016evb_assy6797.jpg
index 277d64f03d9..85e29fc34bb 100644
Binary files a/boards/arm/mec2016evb_assy6797/doc/mec2016evb_assy6797.jpg and b/boards/arm/mec2016evb_assy6797/doc/mec2016evb_assy6797.jpg differ
diff --git a/boards/arm/mikroe_clicker_2/doc/img/clicker-2-stm32f4-thickbox_default-2.jpg b/boards/arm/mikroe_clicker_2/doc/img/clicker-2-stm32f4-thickbox_default-2.jpg
index b65ad4517ff..8e86d3d151a 100644
Binary files a/boards/arm/mikroe_clicker_2/doc/img/clicker-2-stm32f4-thickbox_default-2.jpg and b/boards/arm/mikroe_clicker_2/doc/img/clicker-2-stm32f4-thickbox_default-2.jpg differ
diff --git a/boards/arm/mikroe_mini_m4_for_stm32/doc/img/mikroe_mini_m4_for_stm32.jpg b/boards/arm/mikroe_mini_m4_for_stm32/doc/img/mikroe_mini_m4_for_stm32.jpg
index facc8f1c7e2..f43bc1192bd 100644
Binary files a/boards/arm/mikroe_mini_m4_for_stm32/doc/img/mikroe_mini_m4_for_stm32.jpg and b/boards/arm/mikroe_mini_m4_for_stm32/doc/img/mikroe_mini_m4_for_stm32.jpg differ
diff --git a/boards/arm/mikroe_mini_m4_for_stm32/doc/img/st-linkv2.jpg b/boards/arm/mikroe_mini_m4_for_stm32/doc/img/st-linkv2.jpg
index 6311eed79df..6d4a07c3497 100644
Binary files a/boards/arm/mikroe_mini_m4_for_stm32/doc/img/st-linkv2.jpg and b/boards/arm/mikroe_mini_m4_for_stm32/doc/img/st-linkv2.jpg differ
diff --git a/boards/arm/mikroe_mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst b/boards/arm/mikroe_mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst
index 41dddca2bde..4536296915e 100644
--- a/boards/arm/mikroe_mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst
+++ b/boards/arm/mikroe_mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst
@@ -50,7 +50,6 @@ The board can be flashed by using STLinkV2 with the following connections.
 +------------------+---------------------+
 
 .. image:: img/st-linkv2.jpg
-   :width: 720px
    :align: center
    :alt: ST-Link/V2
 
diff --git a/boards/arm/mimx8mm_evk/doc/img/mimx8mm_evk.jpg b/boards/arm/mimx8mm_evk/doc/img/mimx8mm_evk.jpg
index 1cae9e42e77..b1ec0526df2 100644
Binary files a/boards/arm/mimx8mm_evk/doc/img/mimx8mm_evk.jpg and b/boards/arm/mimx8mm_evk/doc/img/mimx8mm_evk.jpg differ
diff --git a/boards/arm/mimx8mm_evk/doc/index.rst b/boards/arm/mimx8mm_evk/doc/index.rst
index e8bbad2fcbe..b482c28cfaa 100644
--- a/boards/arm/mimx8mm_evk/doc/index.rst
+++ b/boards/arm/mimx8mm_evk/doc/index.rst
@@ -40,9 +40,7 @@ Zephyr OS is ported to run on the Cortex®-M4 core.
     - MicroUSB for UART debug, two COM ports for A53 and M4
 
 .. image:: img/mimx8mm_evk.jpg
-   :width: 720px
    :align: center
-   :height: 405px
    :alt: MIMX8MM EVK
 
 More information about the board can be found at the
diff --git a/boards/arm/mimx8mp_evk/doc/img/I.MX8MPLUS-PLUS-EVK-TOP.jpg b/boards/arm/mimx8mp_evk/doc/img/I.MX8MPLUS-PLUS-EVK-TOP.jpg
new file mode 100644
index 00000000000..d3cc7cb00dd
Binary files /dev/null and b/boards/arm/mimx8mp_evk/doc/img/I.MX8MPLUS-PLUS-EVK-TOP.jpg differ
diff --git a/boards/arm/mimx8mp_evk/doc/img/I.MX8MPLUS-PLUS-EVK-TOP.png b/boards/arm/mimx8mp_evk/doc/img/I.MX8MPLUS-PLUS-EVK-TOP.png
deleted file mode 100644
index 74830f362c8..00000000000
Binary files a/boards/arm/mimx8mp_evk/doc/img/I.MX8MPLUS-PLUS-EVK-TOP.png and /dev/null differ
diff --git a/boards/arm/mimx8mp_evk/doc/index.rst b/boards/arm/mimx8mp_evk/doc/index.rst
index b3456d17d05..9a9d0ff1599 100644
--- a/boards/arm/mimx8mp_evk/doc/index.rst
+++ b/boards/arm/mimx8mp_evk/doc/index.rst
@@ -41,10 +41,8 @@ Zephyr OS is ported to run on the Cortex®-M7 core.
     - JTAG connector
     - MicroUSB for UART debug, two COM ports for A53 and one for M7
 
-.. image:: img/I.MX8MPLUS-PLUS-EVK-TOP.png
-   :width: 720px
+.. image:: img/I.MX8MPLUS-PLUS-EVK-TOP.jpg
    :align: center
-   :height: 405px
    :alt: MIMX8MP EVK
 
 More information about the board can be found at the
diff --git a/boards/arm/mimx8mq_evk/doc/img/mimx8mq_evk.jpg b/boards/arm/mimx8mq_evk/doc/img/mimx8mq_evk.jpg
index ffefd018499..d8de8b87211 100644
Binary files a/boards/arm/mimx8mq_evk/doc/img/mimx8mq_evk.jpg and b/boards/arm/mimx8mq_evk/doc/img/mimx8mq_evk.jpg differ
diff --git a/boards/arm/mimx8mq_evk/doc/index.rst b/boards/arm/mimx8mq_evk/doc/index.rst
index 8c0670465d5..892c6c6422c 100644
--- a/boards/arm/mimx8mq_evk/doc/index.rst
+++ b/boards/arm/mimx8mq_evk/doc/index.rst
@@ -38,9 +38,7 @@ Zephyr OS is ported to run on the Cortex®-M4 core.
     - MicroUSB for UART debug, two COM ports for A53 and M4
 
 .. image:: img/mimx8mq_evk.jpg
-   :width: 720px
    :align: center
-   :height: 405px
    :alt: MIMX8MQ EVK
 
 More information about the board can be found at the
diff --git a/boards/arm/mimxrt1010_evk/doc/index.rst b/boards/arm/mimxrt1010_evk/doc/index.rst
index 625f29ff952..d1fe9c03c15 100644
--- a/boards/arm/mimxrt1010_evk/doc/index.rst
+++ b/boards/arm/mimxrt1010_evk/doc/index.rst
@@ -11,8 +11,7 @@ series by providing the lowest-cost LQFP package option, combined with the
 high performance and ease-of-use known throughout the entire i.MX RT series.
 This device is fully supported by NXP’s MCUXpresso Software and Tools.
 
-.. image:: ./mimxrt1010_evk.jpg
-   :width: 720px
+.. image:: mimxrt1010_evk.jpg
    :align: center
    :alt: MIMXRT1010-EVK
 
diff --git a/boards/arm/mimxrt1010_evk/doc/mimxrt1010_evk.jpg b/boards/arm/mimxrt1010_evk/doc/mimxrt1010_evk.jpg
index b6888052d72..213d8de733b 100644
Binary files a/boards/arm/mimxrt1010_evk/doc/mimxrt1010_evk.jpg and b/boards/arm/mimxrt1010_evk/doc/mimxrt1010_evk.jpg differ
diff --git a/boards/arm/mimxrt1015_evk/doc/index.rst b/boards/arm/mimxrt1015_evk/doc/index.rst
index 44e0314bf3e..ec1b49e0e49 100644
--- a/boards/arm/mimxrt1015_evk/doc/index.rst
+++ b/boards/arm/mimxrt1015_evk/doc/index.rst
@@ -11,8 +11,7 @@ high-performance feature set in low-cost LQFP packages, further simplifying
 board design and layout for customers. The i.MX RT1015 runs on the Arm®
 Cortex®-M7 core at 500 MHz.
 
-.. image:: ./mimxrt1015_evk.jpg
-   :width: 720px
+.. image:: mimxrt1015_evk.jpg
    :align: center
    :alt: MIMXRT1015-EVK
 
diff --git a/boards/arm/mimxrt1015_evk/doc/mimxrt1015_evk.jpg b/boards/arm/mimxrt1015_evk/doc/mimxrt1015_evk.jpg
index 6fe3b61a18d..d692003af78 100644
Binary files a/boards/arm/mimxrt1015_evk/doc/mimxrt1015_evk.jpg and b/boards/arm/mimxrt1015_evk/doc/mimxrt1015_evk.jpg differ
diff --git a/boards/arm/mimxrt1020_evk/doc/index.rst b/boards/arm/mimxrt1020_evk/doc/index.rst
index bd2476db0f6..c419484b543 100644
--- a/boards/arm/mimxrt1020_evk/doc/index.rst
+++ b/boards/arm/mimxrt1020_evk/doc/index.rst
@@ -11,8 +11,7 @@ high-performance feature set in low-cost LQFP packages, further simplifying
 board design and layout for customers. The i.MX RT1020 runs on the Arm®
 Cortex®-M7 core at 500 MHz.
 
-.. image:: ./mimxrt1020_evk.jpg
-   :width: 720px
+.. image:: mimxrt1020_evk.jpg
    :align: center
    :alt: MIMXRT1020-EVK
 
diff --git a/boards/arm/mimxrt1020_evk/doc/mimxrt1020_evk.jpg b/boards/arm/mimxrt1020_evk/doc/mimxrt1020_evk.jpg
index c08fa539873..0e349e6f482 100644
Binary files a/boards/arm/mimxrt1020_evk/doc/mimxrt1020_evk.jpg and b/boards/arm/mimxrt1020_evk/doc/mimxrt1020_evk.jpg differ
diff --git a/boards/arm/mimxrt1024_evk/doc/index.rst b/boards/arm/mimxrt1024_evk/doc/index.rst
index 79701f5b747..0aba97668e7 100644
--- a/boards/arm/mimxrt1024_evk/doc/index.rst
+++ b/boards/arm/mimxrt1024_evk/doc/index.rst
@@ -11,8 +11,7 @@ high-performance feature set in low-cost LQFP packages, further simplifying
 board design and layout for customers. The i.MX RT1024 runs on the Arm®
 Cortex®-M7 core at 500 MHz.
 
-.. image:: ./mimxrt1024_evk.jpg
-   :width: 720px
+.. image:: mimxrt1024_evk.jpg
    :align: center
    :alt: MIMXRT1024-EVK
 
diff --git a/boards/arm/mimxrt1024_evk/doc/mimxrt1024_evk.jpg b/boards/arm/mimxrt1024_evk/doc/mimxrt1024_evk.jpg
index 354e9acb54b..e22a19e5f73 100644
Binary files a/boards/arm/mimxrt1024_evk/doc/mimxrt1024_evk.jpg and b/boards/arm/mimxrt1024_evk/doc/mimxrt1024_evk.jpg differ
diff --git a/boards/arm/mimxrt1050_evk/doc/index.rst b/boards/arm/mimxrt1050_evk/doc/index.rst
index c4bea7c5778..c6170a2eafd 100644
--- a/boards/arm/mimxrt1050_evk/doc/index.rst
+++ b/boards/arm/mimxrt1050_evk/doc/index.rst
@@ -20,8 +20,7 @@ interface, SPDIF, and I2S audio interface.
 The following document refers to the discontinued MIMXRT1050-EVK board. For the
 MIMXRT1050-EVKB board, refer to `Board Revisions`_ section.
 
-.. image:: ./mimxrt1050_evk.jpg
-   :width: 720px
+.. image:: mimxrt1050_evk.jpg
    :align: center
    :alt: MIMXRT1050-EVK
 
diff --git a/boards/arm/mimxrt1050_evk/doc/mimxrt1050_evk.jpg b/boards/arm/mimxrt1050_evk/doc/mimxrt1050_evk.jpg
index 4ca7eed6b64..23ed9ffb6e4 100644
Binary files a/boards/arm/mimxrt1050_evk/doc/mimxrt1050_evk.jpg and b/boards/arm/mimxrt1050_evk/doc/mimxrt1050_evk.jpg differ
diff --git a/boards/arm/mimxrt1060_evk/doc/index.rst b/boards/arm/mimxrt1060_evk/doc/index.rst
index c796a054f8d..90fcdee47be 100644
--- a/boards/arm/mimxrt1060_evk/doc/index.rst
+++ b/boards/arm/mimxrt1060_evk/doc/index.rst
@@ -15,8 +15,7 @@ ideal for real-time applications such as High-Speed GPIO, CAN-FD, and
 synchronous parallel NAND/NOR/PSRAM controller. The i.MX RT1060 runs on the
 Arm® Cortex-M7® core up to 600 MHz.
 
-.. image:: ./mimxrt1060_evk.jpg
-   :width: 720px
+.. image:: mimxrt1060_evk.jpg
    :align: center
    :alt: MIMXRT1060-EVK
 
diff --git a/boards/arm/mimxrt1060_evk/doc/mimxrt1060_evk.jpg b/boards/arm/mimxrt1060_evk/doc/mimxrt1060_evk.jpg
index 4a0b300c8d0..6aecb4dd18f 100644
Binary files a/boards/arm/mimxrt1060_evk/doc/mimxrt1060_evk.jpg and b/boards/arm/mimxrt1060_evk/doc/mimxrt1060_evk.jpg differ
diff --git a/boards/arm/mimxrt1064_evk/doc/index.rst b/boards/arm/mimxrt1064_evk/doc/index.rst
index 1c1af671b60..f7cea23d1af 100644
--- a/boards/arm/mimxrt1064_evk/doc/index.rst
+++ b/boards/arm/mimxrt1064_evk/doc/index.rst
@@ -14,8 +14,7 @@ ideal for real-time applications such as High-Speed GPIO, CAN-FD, and
 synchronous parallel NAND/NOR/PSRAM controller. The i.MX RT1064 runs on the
 Arm® Cortex-M7® core up to 600 MHz.
 
-.. image:: ./mimxrt1064_evk.jpg
-   :width: 600px
+.. image:: mimxrt1064_evk.jpg
    :align: center
    :alt: MIMXRT1064-EVK
 
diff --git a/boards/arm/mimxrt1064_evk/doc/mimxrt1064_evk.jpg b/boards/arm/mimxrt1064_evk/doc/mimxrt1064_evk.jpg
index 9faa1ae13ca..6280656f2c7 100644
Binary files a/boards/arm/mimxrt1064_evk/doc/mimxrt1064_evk.jpg and b/boards/arm/mimxrt1064_evk/doc/mimxrt1064_evk.jpg differ
diff --git a/boards/arm/mimxrt1160_evk/doc/index.rst b/boards/arm/mimxrt1160_evk/doc/index.rst
index 51401d50fc9..bebba604749 100644
--- a/boards/arm/mimxrt1160_evk/doc/index.rst
+++ b/boards/arm/mimxrt1160_evk/doc/index.rst
@@ -11,8 +11,7 @@ Cortex-M4 at 240 MHz. The i.MX RT1160 MCU offers support over a wide
 temperature range and is qualified for consumer, industrial and automotive
 markets.
 
-.. image:: ./mimxrt1160_evk.jpg
-   :width: 600px
+.. image:: mimxrt1160_evk.jpg
    :align: center
    :alt: MIMXRT1160-EVK
 
diff --git a/boards/arm/mimxrt1160_evk/doc/mimxrt1160_evk.jpg b/boards/arm/mimxrt1160_evk/doc/mimxrt1160_evk.jpg
index 7d86fb4e023..752eaca24c5 100644
Binary files a/boards/arm/mimxrt1160_evk/doc/mimxrt1160_evk.jpg and b/boards/arm/mimxrt1160_evk/doc/mimxrt1160_evk.jpg differ
diff --git a/boards/arm/mimxrt1170_evk/doc/index.rst b/boards/arm/mimxrt1170_evk/doc/index.rst
index 18acf04be2b..f88dcea222f 100644
--- a/boards/arm/mimxrt1170_evk/doc/index.rst
+++ b/boards/arm/mimxrt1170_evk/doc/index.rst
@@ -10,8 +10,7 @@ The dual core i.MX RT1170 runs on the Cortex-M7 core at 1 GHz and on the Cortex-
 at 400 MHz. The i.MX RT1170 MCU offers support over a wide temperature range
 and is qualified for consumer, industrial and automotive markets.
 
-.. image:: ./mimxrt1170_evk.jpg
-   :width: 600px
+.. image:: mimxrt1170_evk.jpg
    :align: center
    :alt: MIMXRT1170-EVK
 
diff --git a/boards/arm/mimxrt1170_evk/doc/mimxrt1170_evk.jpg b/boards/arm/mimxrt1170_evk/doc/mimxrt1170_evk.jpg
index 80831955c8c..8d1197f84a5 100644
Binary files a/boards/arm/mimxrt1170_evk/doc/mimxrt1170_evk.jpg and b/boards/arm/mimxrt1170_evk/doc/mimxrt1170_evk.jpg differ
diff --git a/boards/arm/mimxrt595_evk/doc/index.rst b/boards/arm/mimxrt595_evk/doc/index.rst
index c9e64e0c058..eca9029cd9f 100644
--- a/boards/arm/mimxrt595_evk/doc/index.rst
+++ b/boards/arm/mimxrt595_evk/doc/index.rst
@@ -16,8 +16,7 @@ i.MX RT500 MCUs provides up to 5MB of on-chip SRAM and several high-bandwidth in
 to access off-chip flash, including an Octal/Quad SPI interface with an on-the-fly
 decryption engine.
 
-.. image:: ./mimxrt595_evk.png
-   :width: 720px
+.. image:: mimxrt595_evk.jpg
    :align: center
    :alt: MIMXRT595-EVK
 
diff --git a/boards/arm/mimxrt595_evk/doc/mimxrt595_evk.jpg b/boards/arm/mimxrt595_evk/doc/mimxrt595_evk.jpg
new file mode 100644
index 00000000000..9d0cd53c792
Binary files /dev/null and b/boards/arm/mimxrt595_evk/doc/mimxrt595_evk.jpg differ
diff --git a/boards/arm/mimxrt595_evk/doc/mimxrt595_evk.png b/boards/arm/mimxrt595_evk/doc/mimxrt595_evk.png
deleted file mode 100644
index ad487938555..00000000000
Binary files a/boards/arm/mimxrt595_evk/doc/mimxrt595_evk.png and /dev/null differ
diff --git a/boards/arm/mimxrt685_evk/doc/index.rst b/boards/arm/mimxrt685_evk/doc/index.rst
index 02b24599f49..c5f244d08c7 100644
--- a/boards/arm/mimxrt685_evk/doc/index.rst
+++ b/boards/arm/mimxrt685_evk/doc/index.rst
@@ -17,8 +17,7 @@ The i.MX RT600 family provides up to 4.5MB of on-chip SRAM and several
 high-bandwidth interfaces to access off-chip flash, including an Octal/Quad SPI
 interface with an on-the-fly decryption engine.
 
-.. image:: ./mimxrt685_evk.jpg
-   :width: 720px
+.. image:: mimxrt685_evk.jpg
    :align: center
    :alt: MIMXRT685-EVK
 
diff --git a/boards/arm/mimxrt685_evk/doc/mimxrt685_evk.jpg b/boards/arm/mimxrt685_evk/doc/mimxrt685_evk.jpg
index e7c3886641f..1af70430c67 100644
Binary files a/boards/arm/mimxrt685_evk/doc/mimxrt685_evk.jpg and b/boards/arm/mimxrt685_evk/doc/mimxrt685_evk.jpg differ
diff --git a/boards/arm/mm_feather/doc/index.rst b/boards/arm/mm_feather/doc/index.rst
index ba1d2854321..40db41b85e9 100644
--- a/boards/arm/mm_feather/doc/index.rst
+++ b/boards/arm/mm_feather/doc/index.rst
@@ -16,8 +16,7 @@ at:
 - `MadMachine Homepage`_
 - `SwiftIO API Reference`_
 
-.. image:: ./mm_feather.jpg
-   :width: 720px
+.. image:: mm_feather.jpg
    :align: center
    :alt: SwiftIO Feather Board
 
diff --git a/boards/arm/mm_feather/doc/mm_feather.jpg b/boards/arm/mm_feather/doc/mm_feather.jpg
index 43e2ff48eeb..c8ba3003dd2 100644
Binary files a/boards/arm/mm_feather/doc/mm_feather.jpg and b/boards/arm/mm_feather/doc/mm_feather.jpg differ
diff --git a/boards/arm/mm_swiftio/doc/index.rst b/boards/arm/mm_swiftio/doc/index.rst
index ac648e8496e..9d0f66497d0 100644
--- a/boards/arm/mm_swiftio/doc/index.rst
+++ b/boards/arm/mm_swiftio/doc/index.rst
@@ -18,8 +18,7 @@ at:
 
 
 
-.. image:: ./mm_swiftio.jpg
-   :width: 720px
+.. image:: mm_swiftio.jpg
    :align: center
    :alt: SwiftIO Board
 
diff --git a/boards/arm/mm_swiftio/doc/mm_swiftio.jpg b/boards/arm/mm_swiftio/doc/mm_swiftio.jpg
index 1b29928981b..e6ab9901585 100644
Binary files a/boards/arm/mm_swiftio/doc/mm_swiftio.jpg and b/boards/arm/mm_swiftio/doc/mm_swiftio.jpg differ
diff --git a/boards/arm/mps2_an385/doc/img/mps2_an385.jpg b/boards/arm/mps2_an385/doc/img/mps2_an385.jpg
new file mode 100644
index 00000000000..58e42290939
Binary files /dev/null and b/boards/arm/mps2_an385/doc/img/mps2_an385.jpg differ
diff --git a/boards/arm/mps2_an385/doc/img/mps2_an385.png b/boards/arm/mps2_an385/doc/img/mps2_an385.png
deleted file mode 100644
index cbcaa7f99da..00000000000
Binary files a/boards/arm/mps2_an385/doc/img/mps2_an385.png and /dev/null differ
diff --git a/boards/arm/mps2_an385/doc/index.rst b/boards/arm/mps2_an385/doc/index.rst
index fcce3ba127e..1f9d1a59e23 100644
--- a/boards/arm/mps2_an385/doc/index.rst
+++ b/boards/arm/mps2_an385/doc/index.rst
@@ -14,10 +14,8 @@ the following devices:
 - System Tick System Clock (SYSTICK)
 - Cortex-M System Design Kit UART
 
-.. image:: img/mps2_an385.png
-     :width: 442px
+.. image:: img/mps2_an385.jpg
      :align: center
-     :height: 335px
      :alt: ARM V2M MPS2
 
 In addition to enabling actual hardware usage, this board configuration can
diff --git a/boards/arm/mps2_an521/doc/img/mps2_an521.jpg b/boards/arm/mps2_an521/doc/img/mps2_an521.jpg
new file mode 100644
index 00000000000..295c9201824
Binary files /dev/null and b/boards/arm/mps2_an521/doc/img/mps2_an521.jpg differ
diff --git a/boards/arm/mps2_an521/doc/img/mps2_an521.png b/boards/arm/mps2_an521/doc/img/mps2_an521.png
deleted file mode 100644
index 36b54358732..00000000000
Binary files a/boards/arm/mps2_an521/doc/img/mps2_an521.png and /dev/null differ
diff --git a/boards/arm/mps2_an521/doc/index.rst b/boards/arm/mps2_an521/doc/index.rst
index 97355d2162c..935beed3746 100644
--- a/boards/arm/mps2_an521/doc/index.rst
+++ b/boards/arm/mps2_an521/doc/index.rst
@@ -15,10 +15,8 @@ CPU and the following devices:
 - Cortex-M System Design Kit GPIO
 - Cortex-M System Design Kit UART
 
-.. image:: img/mps2_an521.png
-     :width: 666px
+.. image:: img/mps2_an521.jpg
      :align: center
-     :height: 546px
      :alt: ARM MPS2+ AN521
 
 In addition to enabling actual hardware usage, this board configuration can
diff --git a/boards/arm/mps3_an547/doc/img/mps3_an547.jpg b/boards/arm/mps3_an547/doc/img/mps3_an547.jpg
new file mode 100644
index 00000000000..a9938ed3738
Binary files /dev/null and b/boards/arm/mps3_an547/doc/img/mps3_an547.jpg differ
diff --git a/boards/arm/mps3_an547/doc/img/mps3_an547.png b/boards/arm/mps3_an547/doc/img/mps3_an547.png
deleted file mode 100644
index 7770c5cc39f..00000000000
Binary files a/boards/arm/mps3_an547/doc/img/mps3_an547.png and /dev/null differ
diff --git a/boards/arm/mps3_an547/doc/index.rst b/boards/arm/mps3_an547/doc/index.rst
index 347b5afa67d..002c4210f52 100644
--- a/boards/arm/mps3_an547/doc/index.rst
+++ b/boards/arm/mps3_an547/doc/index.rst
@@ -16,10 +16,8 @@ CPU and the following devices:
 - Cortex-M System Design Kit UART
 - Ethos-U55 NPU
 
-.. image:: img/mps3_an547.png
-     :width: 666px
+.. image:: img/mps3_an547.jpg
      :align: center
-     :height: 546px
      :alt: ARM MPS3 AN547
 
 This board configuration also supports using the `Corstone-300 FVP`_ to emulate
diff --git a/boards/arm/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg b/boards/arm/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg
index 5ffde5616b9..4038149ccd0 100644
Binary files a/boards/arm/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg and b/boards/arm/msp_exp432p401r_launchxl/doc/img/msp_exp432p401r_launchxl.jpg differ
diff --git a/boards/arm/npcx7m6fb_evb/doc/index.rst b/boards/arm/npcx7m6fb_evb/doc/index.rst
index cf8617dea6e..71440f797fa 100644
--- a/boards/arm/npcx7m6fb_evb/doc/index.rst
+++ b/boards/arm/npcx7m6fb_evb/doc/index.rst
@@ -10,8 +10,7 @@ The NPCX7M6FB_EVB kit is a development platform to evaluate the
 Nuvoton NPCX7 series microcontrollers. This board needs to be mated with
 part number NPCX796FB.
 
-.. image:: ./npcx7m6fb_evb.png
-     :width: 800px
+.. image:: npcx7m6fb_evb.jpg
      :align: center
      :alt: NPCX7M6FB Evaluation Board
 
diff --git a/boards/arm/npcx7m6fb_evb/doc/npcx7m6fb_evb.jpg b/boards/arm/npcx7m6fb_evb/doc/npcx7m6fb_evb.jpg
new file mode 100644
index 00000000000..369dd8b0150
Binary files /dev/null and b/boards/arm/npcx7m6fb_evb/doc/npcx7m6fb_evb.jpg differ
diff --git a/boards/arm/npcx7m6fb_evb/doc/npcx7m6fb_evb.png b/boards/arm/npcx7m6fb_evb/doc/npcx7m6fb_evb.png
deleted file mode 100644
index ede49b20aaa..00000000000
Binary files a/boards/arm/npcx7m6fb_evb/doc/npcx7m6fb_evb.png and /dev/null differ
diff --git a/boards/arm/npcx9m6f_evb/doc/index.rst b/boards/arm/npcx9m6f_evb/doc/index.rst
index 8e5a42a16cf..859d6d232b5 100644
--- a/boards/arm/npcx9m6f_evb/doc/index.rst
+++ b/boards/arm/npcx9m6f_evb/doc/index.rst
@@ -10,8 +10,7 @@ The NPCX9M6F_EVB kit is a development platform to evaluate the
 Nuvoton NPCX9 series microcontrollers. This board needs to be mated with
 part number NPCX996F.
 
-.. image:: ./npcx9m6f_evb.png
-     :width: 800px
+.. image:: npcx9m6f_evb.jpg
      :align: center
      :alt: NPCX9M6F Evaluation Board
 
diff --git a/boards/arm/npcx9m6f_evb/doc/npcx9m6f_evb.jpg b/boards/arm/npcx9m6f_evb/doc/npcx9m6f_evb.jpg
new file mode 100644
index 00000000000..369dd8b0150
Binary files /dev/null and b/boards/arm/npcx9m6f_evb/doc/npcx9m6f_evb.jpg differ
diff --git a/boards/arm/npcx9m6f_evb/doc/npcx9m6f_evb.png b/boards/arm/npcx9m6f_evb/doc/npcx9m6f_evb.png
deleted file mode 100644
index ede49b20aaa..00000000000
Binary files a/boards/arm/npcx9m6f_evb/doc/npcx9m6f_evb.png and /dev/null differ
diff --git a/boards/arm/nrf21540dk_nrf52840/doc/img/nrf21540dk_nrf52840.jpg b/boards/arm/nrf21540dk_nrf52840/doc/img/nrf21540dk_nrf52840.jpg
index 5f39f708144..82d27868cd7 100644
Binary files a/boards/arm/nrf21540dk_nrf52840/doc/img/nrf21540dk_nrf52840.jpg and b/boards/arm/nrf21540dk_nrf52840/doc/img/nrf21540dk_nrf52840.jpg differ
diff --git a/boards/arm/nrf21540dk_nrf52840/doc/index.rst b/boards/arm/nrf21540dk_nrf52840/doc/index.rst
index 9edf8db5755..8082ed6d637 100644
--- a/boards/arm/nrf21540dk_nrf52840/doc/index.rst
+++ b/boards/arm/nrf21540dk_nrf52840/doc/index.rst
@@ -26,7 +26,6 @@ The CPU provides support for the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf21540dk_nrf52840.jpg
-     :width: 442px
      :align: center
      :alt: nRF21540 DK
 
diff --git a/boards/arm/nrf51_ble400/doc/img/BLE400-size.jpg b/boards/arm/nrf51_ble400/doc/img/BLE400-size.jpg
index b15da99caca..af994adebbc 100644
Binary files a/boards/arm/nrf51_ble400/doc/img/BLE400-size.jpg and b/boards/arm/nrf51_ble400/doc/img/BLE400-size.jpg differ
diff --git a/boards/arm/nrf51_ble400/doc/img/Core51822-Compare.jpg b/boards/arm/nrf51_ble400/doc/img/Core51822-Compare.jpg
index 991f0888046..76216fec769 100644
Binary files a/boards/arm/nrf51_ble400/doc/img/Core51822-Compare.jpg and b/boards/arm/nrf51_ble400/doc/img/Core51822-Compare.jpg differ
diff --git a/boards/arm/nrf51_ble400/doc/img/Core51822-pin.jpg b/boards/arm/nrf51_ble400/doc/img/Core51822-pin.jpg
index 463df87fc37..7f0a28d9872 100644
Binary files a/boards/arm/nrf51_ble400/doc/img/Core51822-pin.jpg and b/boards/arm/nrf51_ble400/doc/img/Core51822-pin.jpg differ
diff --git a/boards/arm/nrf51_ble400/doc/img/nrf51_ble400.jpg b/boards/arm/nrf51_ble400/doc/img/nrf51_ble400.jpg
index 77f0682ea3c..e2cfb4092d1 100644
Binary files a/boards/arm/nrf51_ble400/doc/img/nrf51_ble400.jpg and b/boards/arm/nrf51_ble400/doc/img/nrf51_ble400.jpg differ
diff --git a/boards/arm/nrf51_ble400/doc/index.rst b/boards/arm/nrf51_ble400/doc/index.rst
index 683c7f53336..cfe3d8a547d 100644
--- a/boards/arm/nrf51_ble400/doc/index.rst
+++ b/boards/arm/nrf51_ble400/doc/index.rst
@@ -57,7 +57,6 @@ Core board
 In June of 2015, Core51822 and its variant, Core51822 (B), upgraded the onboard chip to Rev3 (nRF51822_QFAC) that features 32kB RAM.
 
 .. image:: img/Core51822-Compare.jpg
-   :width: 500px
    :align: center
    :alt: Compare
 
@@ -71,7 +70,6 @@ Motherboard
 ------------
 
 .. image:: img/nrf51_ble400.jpg
-   :width: 500px
    :align: center
    :alt: BLE400
 
@@ -95,7 +93,6 @@ Core board
 ----------
 
 .. image:: img/Core51822-pin.jpg
-   :width: 500px
    :align: center
    :alt: Core board pinout
 
@@ -103,7 +100,6 @@ BLE400 dimensions
 =================
 
 .. image:: img/BLE400-size.jpg
-   :width: 500px
    :align: center
    :alt: BLE400 size
 
diff --git a/boards/arm/nrf51_blenano/doc/img/daplink.jpg b/boards/arm/nrf51_blenano/doc/img/daplink.jpg
new file mode 100644
index 00000000000..73ac4b562d2
Binary files /dev/null and b/boards/arm/nrf51_blenano/doc/img/daplink.jpg differ
diff --git a/boards/arm/nrf51_blenano/doc/img/daplink.png b/boards/arm/nrf51_blenano/doc/img/daplink.png
deleted file mode 100644
index b20145f109d..00000000000
Binary files a/boards/arm/nrf51_blenano/doc/img/daplink.png and /dev/null differ
diff --git a/boards/arm/nrf51_blenano/doc/img/nrf51_blenano.jpg b/boards/arm/nrf51_blenano/doc/img/nrf51_blenano.jpg
new file mode 100644
index 00000000000..bd204d86d55
Binary files /dev/null and b/boards/arm/nrf51_blenano/doc/img/nrf51_blenano.jpg differ
diff --git a/boards/arm/nrf51_blenano/doc/img/nrf51_blenano.png b/boards/arm/nrf51_blenano/doc/img/nrf51_blenano.png
deleted file mode 100644
index dc9af74309f..00000000000
Binary files a/boards/arm/nrf51_blenano/doc/img/nrf51_blenano.png and /dev/null differ
diff --git a/boards/arm/nrf51_blenano/doc/index.rst b/boards/arm/nrf51_blenano/doc/index.rst
index 69c5ed0ea83..4caae408e21 100644
--- a/boards/arm/nrf51_blenano/doc/index.rst
+++ b/boards/arm/nrf51_blenano/doc/index.rst
@@ -43,15 +43,13 @@ Connections and IOs
 
 BLE nano pinout
 
-.. image:: img/nrf51_blenano.png
-   :width: 500px
+.. image:: img/nrf51_blenano.jpg
    :align: center
    :alt: BLE Nano
 
 DAPLink board
 
-.. image:: img/daplink.png
-   :width: 500px
+.. image:: img/daplink.jpg
    :align: center
    :alt: DAPLink
 
diff --git a/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51.jpg b/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51.jpg
index 7cf188f5cd4..f780813c123 100644
Binary files a/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51.jpg and b/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51.jpg differ
diff --git a/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51_bot.jpg b/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51_bot.jpg
index a7608e39924..ef724f35376 100644
Binary files a/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51_bot.jpg and b/boards/arm/nrf51_vbluno51/doc/img/nrf51_vbluno51_bot.jpg differ
diff --git a/boards/arm/nrf51_vbluno51/doc/img/vbluno51_frizting.jpg b/boards/arm/nrf51_vbluno51/doc/img/vbluno51_frizting.jpg
new file mode 100644
index 00000000000..ffea17280df
Binary files /dev/null and b/boards/arm/nrf51_vbluno51/doc/img/vbluno51_frizting.jpg differ
diff --git a/boards/arm/nrf51_vbluno51/doc/img/vbluno51_frizting.png b/boards/arm/nrf51_vbluno51/doc/img/vbluno51_frizting.png
deleted file mode 100644
index 8fd93f4fad5..00000000000
Binary files a/boards/arm/nrf51_vbluno51/doc/img/vbluno51_frizting.png and /dev/null differ
diff --git a/boards/arm/nrf51_vbluno51/doc/img/vbluno51_nordic_pinout.jpg b/boards/arm/nrf51_vbluno51/doc/img/vbluno51_nordic_pinout.jpg
new file mode 100644
index 00000000000..464d6feedd5
Binary files /dev/null and b/boards/arm/nrf51_vbluno51/doc/img/vbluno51_nordic_pinout.jpg differ
diff --git a/boards/arm/nrf51_vbluno51/doc/img/vbluno51_nordic_pinout.png b/boards/arm/nrf51_vbluno51/doc/img/vbluno51_nordic_pinout.png
deleted file mode 100644
index 1830443e28f..00000000000
Binary files a/boards/arm/nrf51_vbluno51/doc/img/vbluno51_nordic_pinout.png and /dev/null differ
diff --git a/boards/arm/nrf51_vbluno51/doc/index.rst b/boards/arm/nrf51_vbluno51/doc/index.rst
index 42a0cce685e..4aa8a9532c2 100644
--- a/boards/arm/nrf51_vbluno51/doc/index.rst
+++ b/boards/arm/nrf51_vbluno51/doc/index.rst
@@ -80,13 +80,13 @@ Push buttons
 More details
 ------------
 
-.. figure:: img/vbluno51_nordic_pinout.png
+.. figure:: img/vbluno51_nordic_pinout.jpg
      :align: center
      :alt: nRF51_VBLUno51 Pinout
 
      nrf51_vbluno51 Pinout
 
-.. figure:: img/vbluno51_frizting.png
+.. figure:: img/vbluno51_frizting.jpg
      :align: center
      :alt: nRF51_VBLUno51 Fritzing part
 
diff --git a/boards/arm/nrf51dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg b/boards/arm/nrf51dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg
index fd7e88610c8..dbf1a306bd1 100644
Binary files a/boards/arm/nrf51dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg and b/boards/arm/nrf51dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg differ
diff --git a/boards/arm/nrf51dk_nrf51422/doc/index.rst b/boards/arm/nrf51dk_nrf51422/doc/index.rst
index 3eabcf53daa..5a3b11bf17a 100644
--- a/boards/arm/nrf51dk_nrf51422/doc/index.rst
+++ b/boards/arm/nrf51dk_nrf51422/doc/index.rst
@@ -23,7 +23,6 @@ Semiconductor nRF51422 ARM Cortex-M0 CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf51dk_nrf51422.jpg
-     :width: 442px
      :align: center
      :alt: nRF51 DK
 
diff --git a/boards/arm/nrf51dongle_nrf51422/doc/img/nrf51dongle_nrf51422.jpg b/boards/arm/nrf51dongle_nrf51422/doc/img/nrf51dongle_nrf51422.jpg
index 50b2a53a200..1d949074eba 100644
Binary files a/boards/arm/nrf51dongle_nrf51422/doc/img/nrf51dongle_nrf51422.jpg and b/boards/arm/nrf51dongle_nrf51422/doc/img/nrf51dongle_nrf51422.jpg differ
diff --git a/boards/arm/nrf51dongle_nrf51422/doc/index.rst b/boards/arm/nrf51dongle_nrf51422/doc/index.rst
index 75c9c9732f0..ba846747efd 100644
--- a/boards/arm/nrf51dongle_nrf51422/doc/index.rst
+++ b/boards/arm/nrf51dongle_nrf51422/doc/index.rst
@@ -23,7 +23,6 @@ Semiconductor nRF51822 ARM Cortex-M0 CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf51dongle_nrf51422.jpg
-     :width: 442px
      :align: center
      :alt: nRF51 Dongle
 
diff --git a/boards/arm/nrf52840_blip/doc/img/nrf52840_blip.jpg b/boards/arm/nrf52840_blip/doc/img/nrf52840_blip.jpg
index a8b3a541114..1cf074c0333 100644
Binary files a/boards/arm/nrf52840_blip/doc/img/nrf52840_blip.jpg and b/boards/arm/nrf52840_blip/doc/img/nrf52840_blip.jpg differ
diff --git a/boards/arm/nrf52840_blip/doc/index.rst b/boards/arm/nrf52840_blip/doc/index.rst
index 4e6f9e55de1..d85fa3cf04c 100644
--- a/boards/arm/nrf52840_blip/doc/index.rst
+++ b/boards/arm/nrf52840_blip/doc/index.rst
@@ -26,7 +26,6 @@ nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf52840_blip.jpg
-     :width: 442px
      :align: center
      :alt: Electronut Labs Blip
 
diff --git a/boards/arm/nrf52840_mdk_usb_dongle/doc/index.rst b/boards/arm/nrf52840_mdk_usb_dongle/doc/index.rst
index a1a63a52856..82202ec51ac 100644
--- a/boards/arm/nrf52840_mdk_usb_dongle/doc/index.rst
+++ b/boards/arm/nrf52840_mdk_usb_dongle/doc/index.rst
@@ -15,8 +15,7 @@ Bluetooth5/Tread/802.15.4/ANT/2.4GHz multiprotocol node or development
 board. Alternatively the USB Dongle can be used as a Network Co-Processor(NCP)
 with a simple connection to a PC or other USB enabled device.
 
-.. figure:: nrf52840-mdk-usb-dongle-pinout.png
-     :width: 442px
+.. figure:: nrf52840-mdk-usb-dongle-pinout.jpg
      :align: center
      :alt: nRF52840 MDK USB Dongle
 
diff --git a/boards/arm/nrf52840_mdk_usb_dongle/doc/nrf52840-mdk-usb-dongle-pinout.jpg b/boards/arm/nrf52840_mdk_usb_dongle/doc/nrf52840-mdk-usb-dongle-pinout.jpg
new file mode 100644
index 00000000000..d2443205636
Binary files /dev/null and b/boards/arm/nrf52840_mdk_usb_dongle/doc/nrf52840-mdk-usb-dongle-pinout.jpg differ
diff --git a/boards/arm/nrf52840_mdk_usb_dongle/doc/nrf52840-mdk-usb-dongle-pinout.png b/boards/arm/nrf52840_mdk_usb_dongle/doc/nrf52840-mdk-usb-dongle-pinout.png
deleted file mode 100644
index 57760ec7edd..00000000000
Binary files a/boards/arm/nrf52840_mdk_usb_dongle/doc/nrf52840-mdk-usb-dongle-pinout.png and /dev/null differ
diff --git a/boards/arm/nrf52840_papyr/doc/img/nrf52840_papyr.jpg b/boards/arm/nrf52840_papyr/doc/img/nrf52840_papyr.jpg
index f0daafd116b..04de1062b67 100644
Binary files a/boards/arm/nrf52840_papyr/doc/img/nrf52840_papyr.jpg and b/boards/arm/nrf52840_papyr/doc/img/nrf52840_papyr.jpg differ
diff --git a/boards/arm/nrf52840_papyr/doc/nrf52840_papyr.rst b/boards/arm/nrf52840_papyr/doc/nrf52840_papyr.rst
index b594434b1f4..f1c5b5100e1 100644
--- a/boards/arm/nrf52840_papyr/doc/nrf52840_papyr.rst
+++ b/boards/arm/nrf52840_papyr/doc/nrf52840_papyr.rst
@@ -28,7 +28,6 @@ the following devices:
 * COUNTER
 
 .. figure:: img/nrf52840_papyr.jpg
-     :width: 442px
      :align: center
      :alt: Electronut Labs Papyr
 
diff --git a/boards/arm/nrf52840dk_nrf52840/doc/img/nrf52840dk_nrf52840.jpg b/boards/arm/nrf52840dk_nrf52840/doc/img/nrf52840dk_nrf52840.jpg
index 68662e80a52..566c2879015 100644
Binary files a/boards/arm/nrf52840dk_nrf52840/doc/img/nrf52840dk_nrf52840.jpg and b/boards/arm/nrf52840dk_nrf52840/doc/img/nrf52840dk_nrf52840.jpg differ
diff --git a/boards/arm/nrf52840dk_nrf52840/doc/index.rst b/boards/arm/nrf52840dk_nrf52840/doc/index.rst
index 93d6c4b92f9..c6155fdffbd 100644
--- a/boards/arm/nrf52840dk_nrf52840/doc/index.rst
+++ b/boards/arm/nrf52840dk_nrf52840/doc/index.rst
@@ -26,7 +26,6 @@ Nordic Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf52840dk_nrf52840.jpg
-     :width: 442px
      :align: center
      :alt: nRF52840 DK
 
diff --git a/boards/arm/nrf52840dongle_nrf52840/doc/img/nrf52840dongle_nrf52840.jpg b/boards/arm/nrf52840dongle_nrf52840/doc/img/nrf52840dongle_nrf52840.jpg
index dd3a747b34b..eab80fe53b8 100644
Binary files a/boards/arm/nrf52840dongle_nrf52840/doc/img/nrf52840dongle_nrf52840.jpg and b/boards/arm/nrf52840dongle_nrf52840/doc/img/nrf52840dongle_nrf52840.jpg differ
diff --git a/boards/arm/nrf52840dongle_nrf52840/doc/index.rst b/boards/arm/nrf52840dongle_nrf52840/doc/index.rst
index b821771c98e..6a28927b188 100644
--- a/boards/arm/nrf52840dongle_nrf52840/doc/index.rst
+++ b/boards/arm/nrf52840dongle_nrf52840/doc/index.rst
@@ -25,7 +25,6 @@ Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf52840dongle_nrf52840.jpg
-     :width: 442px
      :align: center
      :alt: nRF52840 Dongle
 
diff --git a/boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg b/boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg
new file mode 100644
index 00000000000..21b5de26160
Binary files /dev/null and b/boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.jpg differ
diff --git a/boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.png b/boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.png
deleted file mode 100644
index 6bb4e839135..00000000000
Binary files a/boards/arm/nrf52_adafruit_feather/doc/img/nrf52_adafruit_feather.png and /dev/null differ
diff --git a/boards/arm/nrf52_adafruit_feather/doc/index.rst b/boards/arm/nrf52_adafruit_feather/doc/index.rst
index 9d3b0eba46d..ff1f767c4c7 100644
--- a/boards/arm/nrf52_adafruit_feather/doc/index.rst
+++ b/boards/arm/nrf52_adafruit_feather/doc/index.rst
@@ -18,8 +18,7 @@ the following devices:
 * RADIO (Bluetooth Low Energy)
 * Segger RTT (RTT Console)
 
-.. figure:: img/nrf52_adafruit_feather.png
-     :width: 442px
+.. figure:: img/nrf52_adafruit_feather.jpg
      :align: center
      :alt: nRF52 Adafruit Feather Board
 
diff --git a/boards/arm/nrf52_blenano2/doc/dap.jpg b/boards/arm/nrf52_blenano2/doc/dap.jpg
index 2af496f4c11..bb6cc091ad0 100644
Binary files a/boards/arm/nrf52_blenano2/doc/dap.jpg and b/boards/arm/nrf52_blenano2/doc/dap.jpg differ
diff --git a/boards/arm/nrf52_blenano2/doc/index.rst b/boards/arm/nrf52_blenano2/doc/index.rst
index e04a9009547..6c32b4f3d77 100644
--- a/boards/arm/nrf52_blenano2/doc/index.rst
+++ b/boards/arm/nrf52_blenano2/doc/index.rst
@@ -43,15 +43,13 @@ Connections and IOs
 
 BLE nano v2 pinout
 
-.. image:: ./nrf52_blenano2.png
-   :width: 680px
+.. image:: nrf52_blenano2.jpg
    :align: center
    :alt: NANO2
 
 DAPLink board
 
 .. image:: dap.jpg
-   :width: 680px
    :align: center
    :alt: DAP
 
diff --git a/boards/arm/nrf52_blenano2/doc/nrf52_blenano2.jpg b/boards/arm/nrf52_blenano2/doc/nrf52_blenano2.jpg
new file mode 100644
index 00000000000..05ab6c4603c
Binary files /dev/null and b/boards/arm/nrf52_blenano2/doc/nrf52_blenano2.jpg differ
diff --git a/boards/arm/nrf52_blenano2/doc/nrf52_blenano2.png b/boards/arm/nrf52_blenano2/doc/nrf52_blenano2.png
deleted file mode 100644
index e245aa880c6..00000000000
Binary files a/boards/arm/nrf52_blenano2/doc/nrf52_blenano2.png and /dev/null differ
diff --git a/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.jpg b/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.jpg
new file mode 100644
index 00000000000..d7f2496c50c
Binary files /dev/null and b/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.jpg differ
diff --git a/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.png b/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.png
deleted file mode 100644
index fad575c8f35..00000000000
Binary files a/boards/arm/nrf52_vbluno52/doc/img/nrf52_vbluno52.png and /dev/null differ
diff --git a/boards/arm/nrf52_vbluno52/doc/index.rst b/boards/arm/nrf52_vbluno52/doc/index.rst
index 071ce737e3e..38292648581 100644
--- a/boards/arm/nrf52_vbluno52/doc/index.rst
+++ b/boards/arm/nrf52_vbluno52/doc/index.rst
@@ -18,7 +18,7 @@ the following devices:
 * FLASH
 * RADIO (Bluetooth Low Energy 5.0)
 
-.. figure:: img/nrf52_vbluno52.png
+.. figure:: img/nrf52_vbluno52.jpg
      :align: center
      :alt: nRF52 VBLUno52
 
diff --git a/boards/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg b/boards/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg
index 0e1af257dd0..315bba1c9b7 100644
Binary files a/boards/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg and b/boards/arm/nrf52dk_nrf52832/doc/img/nrf52dk_nrf52832.jpg differ
diff --git a/boards/arm/nrf52dk_nrf52832/doc/index.rst b/boards/arm/nrf52dk_nrf52832/doc/index.rst
index ee5607d73f2..77bf7df995b 100644
--- a/boards/arm/nrf52dk_nrf52832/doc/index.rst
+++ b/boards/arm/nrf52dk_nrf52832/doc/index.rst
@@ -26,7 +26,6 @@ the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf52dk_nrf52832.jpg
-     :width: 442px
      :align: center
      :alt: nRF52 DK
 
diff --git a/boards/arm/nrf5340dk_nrf5340/doc/img/nrf5340dk.jpg b/boards/arm/nrf5340dk_nrf5340/doc/img/nrf5340dk.jpg
index c9ac685e4a1..139409b279e 100644
Binary files a/boards/arm/nrf5340dk_nrf5340/doc/img/nrf5340dk.jpg and b/boards/arm/nrf5340dk_nrf5340/doc/img/nrf5340dk.jpg differ
diff --git a/boards/arm/nrf5340dk_nrf5340/doc/index.rst b/boards/arm/nrf5340dk_nrf5340/doc/index.rst
index 02012368e88..5e5711b8c95 100644
--- a/boards/arm/nrf5340dk_nrf5340/doc/index.rst
+++ b/boards/arm/nrf5340dk_nrf5340/doc/index.rst
@@ -41,7 +41,6 @@ nRF5340 SoC provides support for the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/nrf5340dk.jpg
-     :width: 711px
      :align: center
      :alt: nRF5340 DK
 
diff --git a/boards/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.jpg b/boards/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.jpg
new file mode 100644
index 00000000000..9a469b9cac6
Binary files /dev/null and b/boards/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.jpg differ
diff --git a/boards/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.png b/boards/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.png
deleted file mode 100644
index 142fcc1eede..00000000000
Binary files a/boards/arm/nrf9160_innblue21/doc/img/nrf9160_innblue21.png and /dev/null differ
diff --git a/boards/arm/nrf9160_innblue21/doc/index.rst b/boards/arm/nrf9160_innblue21/doc/index.rst
index 4a2040c60f4..9ded085dc6f 100644
--- a/boards/arm/nrf9160_innblue21/doc/index.rst
+++ b/boards/arm/nrf9160_innblue21/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The nRF9160 innblue21 is a cellular IoT sensor development board, which
 is based on the nRF9160 SiP, and features NB-IoT and LTE-M connectivity.
 
-.. figure:: img/nrf9160_innblue21.png
-	 :width: 716px
+.. figure:: img/nrf9160_innblue21.jpg
 	 :align: center
 	 :alt: nRF9160 innblue21
 
diff --git a/boards/arm/nrf9160_innblue22/doc/img/nrf9160_innblue22.jpg b/boards/arm/nrf9160_innblue22/doc/img/nrf9160_innblue22.jpg
new file mode 100644
index 00000000000..cc11e6ace71
Binary files /dev/null and b/boards/arm/nrf9160_innblue22/doc/img/nrf9160_innblue22.jpg differ
diff --git a/boards/arm/nrf9160_innblue22/doc/img/nrf9160_innblue22.png b/boards/arm/nrf9160_innblue22/doc/img/nrf9160_innblue22.png
deleted file mode 100644
index 36d545d9875..00000000000
Binary files a/boards/arm/nrf9160_innblue22/doc/img/nrf9160_innblue22.png and /dev/null differ
diff --git a/boards/arm/nrf9160_innblue22/doc/index.rst b/boards/arm/nrf9160_innblue22/doc/index.rst
index dc3d2c13fdc..06f6b6326f8 100644
--- a/boards/arm/nrf9160_innblue22/doc/index.rst
+++ b/boards/arm/nrf9160_innblue22/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The nRF9160 innblue22 is a cellular IoT sensor development board, which
 is based on the nRF9160 SiP, and features NB-IoT and LTE-M connectivity.
 
-.. figure:: img/nrf9160_innblue22.png
-	 :width: 1024px
+.. figure:: img/nrf9160_innblue22.jpg
 	 :align: center
 	 :alt: nRF9160 innblue22
 
diff --git a/boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.jpg b/boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.jpg
new file mode 100644
index 00000000000..17104179293
Binary files /dev/null and b/boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.jpg differ
diff --git a/boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.png b/boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.png
deleted file mode 100644
index cfd235792dd..00000000000
Binary files a/boards/arm/nrf9160dk_nrf9160/doc/img/nrf9160dk_nrf9160.png and /dev/null differ
diff --git a/boards/arm/nrf9160dk_nrf9160/doc/index.rst b/boards/arm/nrf9160dk_nrf9160/doc/index.rst
index 2694229bcb5..6b2473c1050 100644
--- a/boards/arm/nrf9160dk_nrf9160/doc/index.rst
+++ b/boards/arm/nrf9160dk_nrf9160/doc/index.rst
@@ -26,8 +26,7 @@ Cortex-M33F CPU with ARMv8-M Security Extension and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 * :abbr:`IDAU (Implementation Defined Attribution Unit)`
 
-.. figure:: img/nrf9160dk_nrf9160.png
-     :width: 711px
+.. figure:: img/nrf9160dk_nrf9160.jpg
      :align: center
      :alt: nRF9160 DK
 
diff --git a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg b/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg
index 141cac97730..addc9b79d97 100644
Binary files a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg and b/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8.jpg differ
diff --git a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg b/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg
new file mode 100644
index 00000000000..6ff3b64cac2
Binary files /dev/null and b/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.jpg differ
diff --git a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.png b/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.png
deleted file mode 100644
index c665681c30c..00000000000
Binary files a/boards/arm/nucleo_f030r8/doc/img/nucleo_f030r8_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f030r8/doc/index.rst b/boards/arm/nucleo_f030r8/doc/index.rst
index 837f41aa357..91eef722fa3 100644
--- a/boards/arm/nucleo_f030r8/doc/index.rst
+++ b/boards/arm/nucleo_f030r8/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_f030r8.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F030R8
 
@@ -111,10 +109,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f030r8_connectors.png
-   :width: 800px
+.. image:: img/nucleo_f030r8_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F030R8 connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6.jpg b/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6.jpg
index 58453503b76..183a4e1aab1 100644
Binary files a/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6.jpg and b/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6.jpg differ
diff --git a/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6_connectors.jpg b/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6_connectors.jpg
new file mode 100644
index 00000000000..6786d76a40e
Binary files /dev/null and b/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6_connectors.jpg differ
diff --git a/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6_connectors.png b/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6_connectors.png
deleted file mode 100644
index 3e097350440..00000000000
Binary files a/boards/arm/nucleo_f031k6/doc/img/nucleo_f031k6_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f031k6/doc/index.rst b/boards/arm/nucleo_f031k6/doc/index.rst
index 32149bf165a..baff6aadc42 100644
--- a/boards/arm/nucleo_f031k6/doc/index.rst
+++ b/boards/arm/nucleo_f031k6/doc/index.rst
@@ -17,8 +17,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_f031k6.jpg
-   :width: 250px
-   :height: 250px
    :align: center
    :alt: Nucleo F031k6
 
@@ -87,10 +85,8 @@ GPIO pins are shared with digital or analog alternate functions.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f031k6_connectors.png
-   :width: 960px
+.. image:: img/nucleo_f031k6_connectors.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo F031K6 connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb.jpg b/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb.jpg
index 141cac97730..addc9b79d97 100644
Binary files a/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb.jpg and b/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb.jpg differ
diff --git a/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_connectors.jpg b/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_connectors.jpg
new file mode 100644
index 00000000000..9773b27441c
Binary files /dev/null and b/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_connectors.jpg differ
diff --git a/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_connectors.png b/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_connectors.png
deleted file mode 100644
index d62ac2151e5..00000000000
Binary files a/boards/arm/nucleo_f070rb/doc/img/nucleo_f070rb_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f070rb/doc/index.rst b/boards/arm/nucleo_f070rb/doc/index.rst
index b30a587d048..d609c743919 100644
--- a/boards/arm/nucleo_f070rb/doc/index.rst
+++ b/boards/arm/nucleo_f070rb/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_f070rb.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F070RB
 
@@ -112,10 +110,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f070rb_connectors.png
-   :width: 800px
+.. image:: img/nucleo_f070rb_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F070RB connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc.jpg b/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc.jpg
index 141cac97730..addc9b79d97 100644
Binary files a/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc.jpg and b/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc.jpg differ
diff --git a/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_connectors.jpg b/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_connectors.jpg
new file mode 100644
index 00000000000..2429be97e0f
Binary files /dev/null and b/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_connectors.jpg differ
diff --git a/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_connectors.png b/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_connectors.png
deleted file mode 100644
index 60763d8fc7d..00000000000
Binary files a/boards/arm/nucleo_f091rc/doc/img/nucleo_f091rc_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f091rc/doc/index.rst b/boards/arm/nucleo_f091rc/doc/index.rst
index f6da1987955..136b935790f 100644
--- a/boards/arm/nucleo_f091rc/doc/index.rst
+++ b/boards/arm/nucleo_f091rc/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_f091rc.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F091RC
 
@@ -124,10 +122,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f091rc_connectors.png
-   :width: 800px
+.. image:: img/nucleo_f091rc_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F091RC connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg b/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg
index 141cac97730..addc9b79d97 100644
Binary files a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg and b/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb.jpg differ
diff --git a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg b/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg
new file mode 100644
index 00000000000..4fc3a037b64
Binary files /dev/null and b/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.jpg differ
diff --git a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.png b/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.png
deleted file mode 100644
index 8e25636a0f3..00000000000
Binary files a/boards/arm/nucleo_f103rb/doc/img/nucleo_f103rb_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f103rb/doc/index.rst b/boards/arm/nucleo_f103rb/doc/index.rst
index 802d48a4610..01bba89c089 100644
--- a/boards/arm/nucleo_f103rb/doc/index.rst
+++ b/boards/arm/nucleo_f103rb/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_f103rb.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F103RB
 
@@ -115,10 +113,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f103rb_connectors.png
-   :width: 800px
+.. image:: img/nucleo_f103rb_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F103RB connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.jpg b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.jpg
new file mode 100644
index 00000000000..8cba49cd4dd
Binary files /dev/null and b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.jpg differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.png b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.png
deleted file mode 100644
index 126841bb7bc..00000000000
Binary files a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg.png and /dev/null differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_left.jpg b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_left.jpg
new file mode 100644
index 00000000000..09e927c018b
Binary files /dev/null and b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_left.jpg differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_left.png b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_left.png
deleted file mode 100644
index d221f1e0ce7..00000000000
Binary files a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_right.jpg b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_right.jpg
new file mode 100644
index 00000000000..2c51055d4e0
Binary files /dev/null and b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_right.jpg differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_right.png b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_right.png
deleted file mode 100644
index e72c3f5b770..00000000000
Binary files a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_morpho_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_left.jpg b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_left.jpg
new file mode 100644
index 00000000000..a0af2294a0c
Binary files /dev/null and b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_left.jpg differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_left.png b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_left.png
deleted file mode 100644
index 02dd89a23d0..00000000000
Binary files a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_right.jpg b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_right.jpg
new file mode 100644
index 00000000000..bf3a8f0b029
Binary files /dev/null and b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_right.jpg differ
diff --git a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_right.png b/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_right.png
deleted file mode 100644
index 9a5532498c4..00000000000
Binary files a/boards/arm/nucleo_f207zg/doc/img/nucleo_f207zg_zio_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f207zg/doc/index.rst b/boards/arm/nucleo_f207zg/doc/index.rst
index 668e09e2ef7..d4ae50dd7f6 100644
--- a/boards/arm/nucleo_f207zg/doc/index.rst
+++ b/boards/arm/nucleo_f207zg/doc/index.rst
@@ -29,7 +29,7 @@ some highlights of the Nucleo F207ZG board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f207zg.png
+.. image:: img/nucleo_f207zg.jpg
    :align: center
    :alt: Nucleo F207ZG
 
@@ -123,25 +123,17 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f207zg_zio_left.png
-   :width: 720px
+.. image:: img/nucleo_f207zg_zio_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F207ZG ZIO connectors (left)
-.. image:: img/nucleo_f207zg_zio_right.png
-   :width: 720px
+.. image:: img/nucleo_f207zg_zio_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F207ZG ZIO connectors (right)
-.. image:: img/nucleo_f207zg_morpho_left.png
-   :width: 720px
+.. image:: img/nucleo_f207zg_morpho_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F207ZG Morpho connectors (left)
-.. image:: img/nucleo_f207zg_morpho_right.png
-   :width: 720px
+.. image:: img/nucleo_f207zg_morpho_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F207ZG Morpho connectors (right)
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
diff --git a/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8.jpg b/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8.jpg
index 8cec14f83d8..484a0ee7b40 100644
Binary files a/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8.jpg and b/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8.jpg differ
diff --git a/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_connectors.jpg b/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_connectors.jpg
new file mode 100644
index 00000000000..1ec6a5a5d6e
Binary files /dev/null and b/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_connectors.jpg differ
diff --git a/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_connectors.png b/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_connectors.png
deleted file mode 100644
index 149b244c8fa..00000000000
Binary files a/boards/arm/nucleo_f302r8/doc/img/nucleo_f302r8_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f302r8/doc/index.rst b/boards/arm/nucleo_f302r8/doc/index.rst
index f85976aba08..e774c8282c9 100644
--- a/boards/arm/nucleo_f302r8/doc/index.rst
+++ b/boards/arm/nucleo_f302r8/doc/index.rst
@@ -28,8 +28,6 @@ Here are some highlights of the Nucleo F302R8 board:
 - Two push-buttons: USER and RESET
 
 .. image:: img/nucleo_f302r8.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F302R8
 
@@ -113,10 +111,8 @@ responsible for pin muxing, input/output, pull-up, etc.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f302r8_connectors.png
-   :width: 800px
+.. image:: img/nucleo_f302r8_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F302R8 connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8.jpg b/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8.jpg
index 94626b4ad6f..5c738d19cf5 100644
Binary files a/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8.jpg and b/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8.jpg differ
diff --git a/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8_pinout.jpg b/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8_pinout.jpg
new file mode 100644
index 00000000000..275dfd0e13a
Binary files /dev/null and b/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8_pinout.jpg differ
diff --git a/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8_pinout.png b/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8_pinout.png
deleted file mode 100644
index 8cb167a146e..00000000000
Binary files a/boards/arm/nucleo_f303k8/doc/img/nucleo_f303k8_pinout.png and /dev/null differ
diff --git a/boards/arm/nucleo_f303k8/doc/index.rst b/boards/arm/nucleo_f303k8/doc/index.rst
index 2f17685d7db..78cf267a1be 100644
--- a/boards/arm/nucleo_f303k8/doc/index.rst
+++ b/boards/arm/nucleo_f303k8/doc/index.rst
@@ -25,8 +25,6 @@ Here are some highlights of the Nucleo F303K8 board:
 - One push-buttons: RESET
 
 .. image:: img/nucleo_f303k8.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F303K8
 
@@ -109,10 +107,8 @@ for input/output, pull-up, etc.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f303k8_pinout.png
-   :width: 800px
+.. image:: img/nucleo_f303k8_pinout.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F303K8 connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f303re/doc/img/nucleo_connectors.jpg b/boards/arm/nucleo_f303re/doc/img/nucleo_connectors.jpg
new file mode 100644
index 00000000000..c53ea578287
Binary files /dev/null and b/boards/arm/nucleo_f303re/doc/img/nucleo_connectors.jpg differ
diff --git a/boards/arm/nucleo_f303re/doc/img/nucleo_connectors.png b/boards/arm/nucleo_f303re/doc/img/nucleo_connectors.png
deleted file mode 100644
index 68c23ff4c16..00000000000
Binary files a/boards/arm/nucleo_f303re/doc/img/nucleo_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f303re/doc/img/nucleo_f303re.jpg b/boards/arm/nucleo_f303re/doc/img/nucleo_f303re.jpg
index 09b55adfcf5..28a804c367c 100644
Binary files a/boards/arm/nucleo_f303re/doc/img/nucleo_f303re.jpg and b/boards/arm/nucleo_f303re/doc/img/nucleo_f303re.jpg differ
diff --git a/boards/arm/nucleo_f303re/doc/index.rst b/boards/arm/nucleo_f303re/doc/index.rst
index 53bb9a276de..4fc6c911a7d 100644
--- a/boards/arm/nucleo_f303re/doc/index.rst
+++ b/boards/arm/nucleo_f303re/doc/index.rst
@@ -28,8 +28,6 @@ Here are some highlights of the Nucleo F303RE board:
 - Two push-buttons: USER and RESET
 
 .. image:: img/nucleo_f303re.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F303RE
 
@@ -112,10 +110,8 @@ responsible for pin muxing, input/output, pull-up, etc.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_connectors.png
-   :width: 800px
+.. image:: img/nucleo_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F303RE connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8.jpg b/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8.jpg
index 8cec14f83d8..484a0ee7b40 100644
Binary files a/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8.jpg and b/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8.jpg differ
diff --git a/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_connectors.jpg b/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_connectors.jpg
new file mode 100644
index 00000000000..e12bd3b97be
Binary files /dev/null and b/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_connectors.jpg differ
diff --git a/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_connectors.png b/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_connectors.png
deleted file mode 100644
index 1708aa1dd40..00000000000
Binary files a/boards/arm/nucleo_f334r8/doc/img/nucleo_f334r8_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_f334r8/doc/index.rst b/boards/arm/nucleo_f334r8/doc/index.rst
index 3ba734c90ce..422f9f86ba1 100644
--- a/boards/arm/nucleo_f334r8/doc/index.rst
+++ b/boards/arm/nucleo_f334r8/doc/index.rst
@@ -22,8 +22,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_f334r8.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo F334R8
 
@@ -109,10 +107,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_f334r8_connectors.png
-   :width: 800px
+.. image:: img/nucleo_f334r8_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo F334R8 connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re.jpg b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re.jpg
new file mode 100644
index 00000000000..25a44602f19
Binary files /dev/null and b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re.jpg differ
diff --git a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re.png b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re.png
deleted file mode 100644
index cd71f8f6835..00000000000
Binary files a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re.png and /dev/null differ
diff --git a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_arduino.jpg b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_arduino.jpg
new file mode 100644
index 00000000000..8926b10d664
Binary files /dev/null and b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_arduino.jpg differ
diff --git a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_arduino.png b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_arduino.png
deleted file mode 100644
index 922e3f2501d..00000000000
Binary files a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_arduino.png and /dev/null differ
diff --git a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_morpho.jpg b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_morpho.jpg
new file mode 100644
index 00000000000..549ecaf0302
Binary files /dev/null and b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_morpho.jpg differ
diff --git a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_morpho.png b/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_morpho.png
deleted file mode 100644
index 6951a3287cd..00000000000
Binary files a/boards/arm/nucleo_f401re/doc/img/nucleo_f401re_morpho.png and /dev/null differ
diff --git a/boards/arm/nucleo_f401re/doc/index.rst b/boards/arm/nucleo_f401re/doc/index.rst
index fa9892cda26..c4aaff7c73f 100644
--- a/boards/arm/nucleo_f401re/doc/index.rst
+++ b/boards/arm/nucleo_f401re/doc/index.rst
@@ -25,10 +25,8 @@ some highlights of the Nucleo F401RE board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f401re.png
-   :width: 720px
+.. image:: img/nucleo_f401re.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo F401RE
 
 More information about the board can be found at the `Nucleo F401RE website`_.
@@ -104,15 +102,11 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f401re_arduino.png
-   :width: 720px
+.. image:: img/nucleo_f401re_arduino.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F401RE Arduino connectors
-.. image:: img/nucleo_f401re_morpho.png
-   :width: 720px
+.. image:: img/nucleo_f401re_morpho.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F401RE Morpho connectors
 
 For mode details please refer to `STM32 Nucleo-64 board User Manual`_.
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb.jpg b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb.jpg
new file mode 100644
index 00000000000..6aca60dfb74
Binary files /dev/null and b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb.jpg differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb.png b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb.png
deleted file mode 100644
index 01e8af58170..00000000000
Binary files a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb.png and /dev/null differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_left.jpg b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_left.jpg
new file mode 100644
index 00000000000..e1841ce5a0c
Binary files /dev/null and b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_left.jpg differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_left.png b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_left.png
deleted file mode 100644
index 06c6d04a5dc..00000000000
Binary files a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_right.jpg b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_right.jpg
new file mode 100644
index 00000000000..a0faa6600ac
Binary files /dev/null and b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_right.jpg differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_right.png b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_right.png
deleted file mode 100644
index da44a370fc0..00000000000
Binary files a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_arduino_top_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_left.jpg b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_left.jpg
new file mode 100644
index 00000000000..bc9084a9d17
Binary files /dev/null and b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_left.jpg differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_left.png b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_left.png
deleted file mode 100644
index 6b6bc52cfd9..00000000000
Binary files a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_right.jpg b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_right.jpg
new file mode 100644
index 00000000000..d12ba5c3a50
Binary files /dev/null and b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_right.jpg differ
diff --git a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_right.png b/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_right.png
deleted file mode 100644
index 02e959a39e5..00000000000
Binary files a/boards/arm/nucleo_f410rb/doc/img/nucleo_f410rb_morpho_top_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f410rb/doc/index.rst b/boards/arm/nucleo_f410rb/doc/index.rst
index 68f1fa46dd8..d629044fc11 100644
--- a/boards/arm/nucleo_f410rb/doc/index.rst
+++ b/boards/arm/nucleo_f410rb/doc/index.rst
@@ -25,10 +25,8 @@ some highlights of the Nucleo F410RB board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f410rb.png
-   :width: 720px
+.. image:: img/nucleo_f410rb.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo F410RB
 
 More information about the board can be found at the `Nucleo F410RB website`_.
@@ -109,25 +107,17 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f410rb_arduino_top_left.png
-   :width: 720px
+.. image:: img/nucleo_f410rb_arduino_top_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F410RB Arduino connectors (top left)
-.. image:: img/nucleo_f410rb_arduino_top_right.png
-   :width: 720px
+.. image:: img/nucleo_f410rb_arduino_top_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F410RB Arduino connectors (top right)
-.. image:: img/nucleo_f410rb_morpho_top_left.png
-   :width: 720px
+.. image:: img/nucleo_f410rb_morpho_top_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F410RB Morpho connectors (top left)
-.. image:: img/nucleo_f410rb_morpho_top_right.png
-   :width: 720px
+.. image:: img/nucleo_f410rb_morpho_top_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F410RB Morpho connectors (top right)
 
 For mode details please refer to `STM32 Nucleo-64 board User Manual`_.
diff --git a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re.jpg b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re.jpg
new file mode 100644
index 00000000000..25a44602f19
Binary files /dev/null and b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re.jpg differ
diff --git a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re.png b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re.png
deleted file mode 100644
index cd71f8f6835..00000000000
Binary files a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re.png and /dev/null differ
diff --git a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_arduino.jpg b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_arduino.jpg
new file mode 100644
index 00000000000..0d724c9ed67
Binary files /dev/null and b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_arduino.jpg differ
diff --git a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_arduino.png b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_arduino.png
deleted file mode 100644
index 2803578a83d..00000000000
Binary files a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_arduino.png and /dev/null differ
diff --git a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_morpho.jpg b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_morpho.jpg
new file mode 100644
index 00000000000..46450793e81
Binary files /dev/null and b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_morpho.jpg differ
diff --git a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_morpho.png b/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_morpho.png
deleted file mode 100644
index 616883eb3bc..00000000000
Binary files a/boards/arm/nucleo_f411re/doc/img/nucleo_f411re_morpho.png and /dev/null differ
diff --git a/boards/arm/nucleo_f411re/doc/index.rst b/boards/arm/nucleo_f411re/doc/index.rst
index c60f5407273..48e4813eb77 100644
--- a/boards/arm/nucleo_f411re/doc/index.rst
+++ b/boards/arm/nucleo_f411re/doc/index.rst
@@ -25,10 +25,8 @@ some highlights of the Nucleo F411RE board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f411re.png
-   :width: 720px
+.. image:: img/nucleo_f411re.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo F411RE
 
 More information about the board can be found at the `Nucleo F411RE website`_.
@@ -102,15 +100,11 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f411re_arduino.png
-   :width: 720px
+.. image:: img/nucleo_f411re_arduino.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F411RE Arduino connectors
-.. image:: img/nucleo_f411re_morpho.png
-   :width: 720px
+.. image:: img/nucleo_f411re_morpho.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F411RE Morpho connectors
 
 For mode details please refer to `STM32 Nucleo-64 board User Manual`_.
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.jpg b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.jpg
new file mode 100644
index 00000000000..8cba49cd4dd
Binary files /dev/null and b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.jpg differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.png b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.png
deleted file mode 100644
index 126841bb7bc..00000000000
Binary files a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg.png and /dev/null differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_left.jpg b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_left.jpg
new file mode 100644
index 00000000000..dc111e91885
Binary files /dev/null and b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_left.jpg differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_left.png b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_left.png
deleted file mode 100644
index 8d1eb23519e..00000000000
Binary files a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_right.jpg b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_right.jpg
new file mode 100644
index 00000000000..656cb3ea017
Binary files /dev/null and b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_right.jpg differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_right.png b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_right.png
deleted file mode 100644
index cb045527a42..00000000000
Binary files a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_morpho_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_left.jpg b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_left.jpg
new file mode 100644
index 00000000000..812968b8a80
Binary files /dev/null and b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_left.jpg differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_left.png b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_left.png
deleted file mode 100644
index 23d0facf821..00000000000
Binary files a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_right.jpg b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_right.jpg
new file mode 100644
index 00000000000..d8327da59dd
Binary files /dev/null and b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_right.jpg differ
diff --git a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_right.png b/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_right.png
deleted file mode 100644
index 0e8d2622a19..00000000000
Binary files a/boards/arm/nucleo_f412zg/doc/img/nucleo_f412zg_zio_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f412zg/doc/index.rst b/boards/arm/nucleo_f412zg/doc/index.rst
index c67e8d29f5d..024382af888 100644
--- a/boards/arm/nucleo_f412zg/doc/index.rst
+++ b/boards/arm/nucleo_f412zg/doc/index.rst
@@ -28,7 +28,7 @@ some highlights of the Nucleo F412ZG board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f412zg.png
+.. image:: img/nucleo_f412zg.jpg
    :align: center
    :alt: Nucleo F412ZG
 
@@ -104,25 +104,17 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f412zg_zio_left.png
-   :width: 720px
+.. image:: img/nucleo_f412zg_zio_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F412ZG ZIO connectors (left)
-.. image:: img/nucleo_f412zg_zio_right.png
-   :width: 720px
+.. image:: img/nucleo_f412zg_zio_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F412ZG ZIO connectors (right)
-.. image:: img/nucleo_f412zg_morpho_left.png
-   :width: 720px
+.. image:: img/nucleo_f412zg_morpho_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F412ZG Morpho connectors (left)
-.. image:: img/nucleo_f412zg_morpho_right.png
-   :width: 720px
+.. image:: img/nucleo_f412zg_morpho_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F412ZG Morpho connectors (right)
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.jpg b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.jpg
new file mode 100644
index 00000000000..cf1adcf2739
Binary files /dev/null and b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.jpg differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.png b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.png
deleted file mode 100644
index d6e91821b96..00000000000
Binary files a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh.png and /dev/null differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_left.jpg b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_left.jpg
new file mode 100644
index 00000000000..a34ee7aa978
Binary files /dev/null and b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_left.jpg differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_left.png b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_left.png
deleted file mode 100644
index e70f4104631..00000000000
Binary files a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_right.jpg b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_right.jpg
new file mode 100644
index 00000000000..961df3b4325
Binary files /dev/null and b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_right.jpg differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_right.png b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_right.png
deleted file mode 100644
index 962459b7b3d..00000000000
Binary files a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_morpho_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_left.jpg b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_left.jpg
new file mode 100644
index 00000000000..f506076defc
Binary files /dev/null and b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_left.jpg differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_left.png b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_left.png
deleted file mode 100644
index 1a87689b14b..00000000000
Binary files a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_right.jpg b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_right.jpg
new file mode 100644
index 00000000000..858a4255278
Binary files /dev/null and b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_right.jpg differ
diff --git a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_right.png b/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_right.png
deleted file mode 100644
index 82f8c27f01e..00000000000
Binary files a/boards/arm/nucleo_f413zh/doc/img/nucleo_f413zh_zio_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f413zh/doc/index.rst b/boards/arm/nucleo_f413zh/doc/index.rst
index 6269270ce4b..ca6bfd52a15 100644
--- a/boards/arm/nucleo_f413zh/doc/index.rst
+++ b/boards/arm/nucleo_f413zh/doc/index.rst
@@ -28,10 +28,8 @@ some highlights of the Nucleo F413ZH board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f413zh.png
-   :width: 720px
+.. image:: img/nucleo_f413zh.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo F413ZH
 
 More information about the board can be found at the `Nucleo F413ZH website`_.
@@ -106,25 +104,17 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f413zh_zio_left.png
-   :width: 720px
+.. image:: img/nucleo_f413zh_zio_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F413ZH ZIO connectors (left)
-.. image:: img/nucleo_f413zh_zio_right.png
-   :width: 720px
+.. image:: img/nucleo_f413zh_zio_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F413ZH ZIO connectors (right)
-.. image:: img/nucleo_f413zh_morpho_left.png
-   :width: 720px
+.. image:: img/nucleo_f413zh_morpho_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F413ZH Morpho connectors (left)
-.. image:: img/nucleo_f413zh_morpho_right.png
-   :width: 720px
+.. image:: img/nucleo_f413zh_morpho_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F413ZH Morpho connectors (right)
 
 For mode details please refer to `STM32 Nucleo-144 board User Manual`_.
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.jpg b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.jpg
new file mode 100644
index 00000000000..1fb864721eb
Binary files /dev/null and b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.jpg differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.png b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.png
deleted file mode 100644
index 8eaab419616..00000000000
Binary files a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi.png and /dev/null differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn11.jpg b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn11.jpg
new file mode 100644
index 00000000000..ee2e1a0db01
Binary files /dev/null and b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn11.jpg differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn11.png b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn11.png
deleted file mode 100644
index af6c4919642..00000000000
Binary files a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn11.png and /dev/null differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn12.jpg b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn12.jpg
new file mode 100644
index 00000000000..be5d68dc5f0
Binary files /dev/null and b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn12.jpg differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn12.png b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn12.png
deleted file mode 100644
index f1216b67673..00000000000
Binary files a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn12.png and /dev/null differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn7.jpg b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn7.jpg
new file mode 100644
index 00000000000..e754eb03141
Binary files /dev/null and b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn7.jpg differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn7.png b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn7.png
deleted file mode 100644
index 0b497834987..00000000000
Binary files a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn7.png and /dev/null differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn8.jpg b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn8.jpg
new file mode 100644
index 00000000000..f5917b433c0
Binary files /dev/null and b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn8.jpg differ
diff --git a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn8.png b/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn8.png
deleted file mode 100644
index a44ef825fca..00000000000
Binary files a/boards/arm/nucleo_f429zi/doc/img/nucleo_f429zi_cn8.png and /dev/null differ
diff --git a/boards/arm/nucleo_f429zi/doc/index.rst b/boards/arm/nucleo_f429zi/doc/index.rst
index 58b5b9bb748..8bb1d0fee85 100644
--- a/boards/arm/nucleo_f429zi/doc/index.rst
+++ b/boards/arm/nucleo_f429zi/doc/index.rst
@@ -31,10 +31,8 @@ some highlights of the Nucleo F429ZI board:
 - Three user LEDs
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f429zi.png
-   :width: 720px
+.. image:: img/nucleo_f429zi.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo F429ZI
 
 More information about the board can be found at the `Nucleo F429ZI website`_.
@@ -128,25 +126,17 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f429zi_cn8.png
-   :width: 720px
+.. image:: img/nucleo_f429zi_cn8.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F429ZI ZIO connectors (left)
-.. image:: img/nucleo_f429zi_cn7.png
-   :width: 720px
+.. image:: img/nucleo_f429zi_cn7.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F429ZI ZIO connectors (right)
-.. image:: img/nucleo_f429zi_cn11.png
-   :width: 720px
+.. image:: img/nucleo_f429zi_cn11.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F429ZI Morpho connectors (left)
-.. image:: img/nucleo_f429zi_cn12.png
-   :width: 720px
+.. image:: img/nucleo_f429zi_cn12.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F429ZI Morpho connectors (right)
 
 For mode details please refer to `STM32 Nucleo-144 board User Manual`_.
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re.jpg b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re.jpg
new file mode 100644
index 00000000000..6aca60dfb74
Binary files /dev/null and b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re.jpg differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re.png b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re.png
deleted file mode 100644
index 01e8af58170..00000000000
Binary files a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_left.jpg b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_left.jpg
new file mode 100644
index 00000000000..276b8f3b228
Binary files /dev/null and b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_left.jpg differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_left.png b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_left.png
deleted file mode 100644
index b0b7f5dda5e..00000000000
Binary files a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_right.jpg b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_right.jpg
new file mode 100644
index 00000000000..260d8e88f2b
Binary files /dev/null and b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_right.jpg differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_right.png b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_right.png
deleted file mode 100644
index 1abddbc9a43..00000000000
Binary files a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_arduino_top_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_left.jpg b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_left.jpg
new file mode 100644
index 00000000000..0f6d4f3cb9b
Binary files /dev/null and b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_left.jpg differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_left.png b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_left.png
deleted file mode 100644
index 0b1e6179a15..00000000000
Binary files a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_left.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_right.jpg b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_right.jpg
new file mode 100644
index 00000000000..946ce6927fe
Binary files /dev/null and b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_right.jpg differ
diff --git a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_right.png b/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_right.png
deleted file mode 100644
index 1ad1a70b10c..00000000000
Binary files a/boards/arm/nucleo_f446re/doc/img/nucleo_f446re_morpho_top_right.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446re/doc/index.rst b/boards/arm/nucleo_f446re/doc/index.rst
index 81be80ee940..07005c58cda 100644
--- a/boards/arm/nucleo_f446re/doc/index.rst
+++ b/boards/arm/nucleo_f446re/doc/index.rst
@@ -25,10 +25,8 @@ some highlights of the Nucleo F446RE board:
 - Three LEDs: USB communication (LD1), user LED (LD2), power LED (LD3)
 - Two push-buttons: USER and RESET
 
-.. image:: img/nucleo_f446re.png
-   :width: 720px
+.. image:: img/nucleo_f446re.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo F446RE
 
 More information about the board can be found at the `Nucleo F446RE website`_.
@@ -107,25 +105,17 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f446re_arduino_top_left.png
-   :width: 720px
+.. image:: img/nucleo_f446re_arduino_top_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446RE Arduino connectors (top left)
-.. image:: img/nucleo_f446re_arduino_top_right.png
-   :width: 720px
+.. image:: img/nucleo_f446re_arduino_top_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446RE Arduino connectors (top right)
-.. image:: img/nucleo_f446re_morpho_top_left.png
-   :width: 720px
+.. image:: img/nucleo_f446re_morpho_top_left.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446RE Morpho connectors (top left)
-.. image:: img/nucleo_f446re_morpho_top_right.png
-   :width: 720px
+.. image:: img/nucleo_f446re_morpho_top_right.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446RE Morpho connectors (top right)
 
 For mode details please refer to `STM32 Nucleo-64 board User Manual`_.
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze.jpg b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze.jpg
index b25f4b96b11..05f137f0e2e 100644
Binary files a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze.jpg and b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze.jpg differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_left_2019_8_29.jpg b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_left_2019_8_29.jpg
new file mode 100644
index 00000000000..302ea584611
Binary files /dev/null and b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_left_2019_8_29.jpg differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_left_2019_8_29.png b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_left_2019_8_29.png
deleted file mode 100644
index eaccabfe3f1..00000000000
Binary files a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_left_2019_8_29.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_right_2019_8_29.jpg b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_right_2019_8_29.jpg
new file mode 100644
index 00000000000..2f1f8daf35c
Binary files /dev/null and b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_right_2019_8_29.jpg differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_right_2019_8_29.png b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_right_2019_8_29.png
deleted file mode 100644
index c398a1677f2..00000000000
Binary files a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_morpho_right_2019_8_29.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_left_2019_8_29.jpg b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_left_2019_8_29.jpg
new file mode 100644
index 00000000000..3563a738883
Binary files /dev/null and b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_left_2019_8_29.jpg differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_left_2019_8_29.png b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_left_2019_8_29.png
deleted file mode 100644
index e3234b101ad..00000000000
Binary files a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_left_2019_8_29.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_right_2019_8_29.jpg b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_right_2019_8_29.jpg
new file mode 100644
index 00000000000..4f39dc8b2f6
Binary files /dev/null and b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_right_2019_8_29.jpg differ
diff --git a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_right_2019_8_29.png b/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_right_2019_8_29.png
deleted file mode 100644
index 4213a53ef47..00000000000
Binary files a/boards/arm/nucleo_f446ze/doc/img/nucleo_f446ze_zio_right_2019_8_29.png and /dev/null differ
diff --git a/boards/arm/nucleo_f446ze/doc/index.rst b/boards/arm/nucleo_f446ze/doc/index.rst
index 65e1abe4e4b..0c7b4fcb874 100644
--- a/boards/arm/nucleo_f446ze/doc/index.rst
+++ b/boards/arm/nucleo_f446ze/doc/index.rst
@@ -31,9 +31,7 @@ some highlights of the Nucleo F446ZE board:
 - Two push-buttons: USER and RESET
 
 .. image:: img/nucleo_f446ze.jpg
-   :width: 720px
    :align: center
-   :height: 720px
    :alt: Nucleo F446ZE
 
 More information about the board can be found at the `Nucleo F446ZE website`_.
@@ -118,25 +116,17 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_f446ze_zio_left_2019_8_29.png
-   :width: 720px
+.. image:: img/nucleo_f446ze_zio_left_2019_8_29.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446ZE Zio/Arduino connectors (left)
-.. image:: img/nucleo_f446ze_zio_right_2019_8_29.png
-   :width: 720px
+.. image:: img/nucleo_f446ze_zio_right_2019_8_29.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446ZE Zio/Arduino connectors (right)
-.. image:: img/nucleo_f446ze_morpho_left_2019_8_29.png
-   :width: 720px
+.. image:: img/nucleo_f446ze_morpho_left_2019_8_29.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446ZE Morpho connectors (left)
-.. image:: img/nucleo_f446ze_morpho_right_2019_8_29.png
-   :width: 720px
+.. image:: img/nucleo_f446ze_morpho_right_2019_8_29.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo F446ZE Morpho connectors (right)
 
 For mode details please refer to `STM32 Nucleo-144 board User Manual`_.
diff --git a/boards/arm/nucleo_f746zg/doc/img/nucleo_f746zg.jpg b/boards/arm/nucleo_f746zg/doc/img/nucleo_f746zg.jpg
index da87faff187..ce1f3f09121 100644
Binary files a/boards/arm/nucleo_f746zg/doc/img/nucleo_f746zg.jpg and b/boards/arm/nucleo_f746zg/doc/img/nucleo_f746zg.jpg differ
diff --git a/boards/arm/nucleo_f746zg/doc/index.rst b/boards/arm/nucleo_f746zg/doc/index.rst
index ba4dabe3098..bc419c612c4 100644
--- a/boards/arm/nucleo_f746zg/doc/index.rst
+++ b/boards/arm/nucleo_f746zg/doc/index.rst
@@ -45,9 +45,7 @@ Key Features
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
 .. image:: img/nucleo_f746zg.jpg
-   :width: 720px
    :align: center
-   :height: 720px
    :alt: Nucleo F746ZG
 
 More information about the board can be found at the `Nucleo F746ZG website`_.
diff --git a/boards/arm/nucleo_f756zg/doc/img/nucleo_f756zg.jpg b/boards/arm/nucleo_f756zg/doc/img/nucleo_f756zg.jpg
index da87faff187..ce1f3f09121 100644
Binary files a/boards/arm/nucleo_f756zg/doc/img/nucleo_f756zg.jpg and b/boards/arm/nucleo_f756zg/doc/img/nucleo_f756zg.jpg differ
diff --git a/boards/arm/nucleo_f756zg/doc/index.rst b/boards/arm/nucleo_f756zg/doc/index.rst
index ed7d2a339f5..299eb9e4c7b 100644
--- a/boards/arm/nucleo_f756zg/doc/index.rst
+++ b/boards/arm/nucleo_f756zg/doc/index.rst
@@ -45,9 +45,7 @@ Key Features
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
 .. image:: img/nucleo_f756zg.jpg
-   :width: 720px
    :align: center
-   :height: 720px
    :alt: Nucleo F756ZG
 
 More information about the board can be found at the `Nucleo F756ZG website`_.
diff --git a/boards/arm/nucleo_f767zi/doc/img/nucleo_f767zi.jpg b/boards/arm/nucleo_f767zi/doc/img/nucleo_f767zi.jpg
index da87faff187..ce1f3f09121 100644
Binary files a/boards/arm/nucleo_f767zi/doc/img/nucleo_f767zi.jpg and b/boards/arm/nucleo_f767zi/doc/img/nucleo_f767zi.jpg differ
diff --git a/boards/arm/nucleo_f767zi/doc/index.rst b/boards/arm/nucleo_f767zi/doc/index.rst
index 1bd38ad492c..bf6f1c68b92 100644
--- a/boards/arm/nucleo_f767zi/doc/index.rst
+++ b/boards/arm/nucleo_f767zi/doc/index.rst
@@ -45,9 +45,7 @@ Key Features
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
 .. image:: img/nucleo_f767zi.jpg
-   :width: 720px
    :align: center
-   :height: 720px
    :alt: Nucleo F767ZI
 
 More information about the board can be found at the `Nucleo F767ZI website`_.
diff --git a/boards/arm/nucleo_g031k8/doc/img/nucleo_g031k8.jpg b/boards/arm/nucleo_g031k8/doc/img/nucleo_g031k8.jpg
index 9d1a48567ac..77ba56f1723 100644
Binary files a/boards/arm/nucleo_g031k8/doc/img/nucleo_g031k8.jpg and b/boards/arm/nucleo_g031k8/doc/img/nucleo_g031k8.jpg differ
diff --git a/boards/arm/nucleo_g031k8/doc/index.rst b/boards/arm/nucleo_g031k8/doc/index.rst
index d416fcfee7a..1b32a1fb59e 100644
--- a/boards/arm/nucleo_g031k8/doc/index.rst
+++ b/boards/arm/nucleo_g031k8/doc/index.rst
@@ -22,8 +22,6 @@ libraries and examples available with the STM32Cube MCU Package.
 
 
 .. image:: img/nucleo_g031k8.jpg
-   :width: 426px
-   :height: 653px
    :align: center
    :alt: Nucleo G031K8
 
diff --git a/boards/arm/nucleo_g071rb/doc/img/nucleo_g071rb.jpg b/boards/arm/nucleo_g071rb/doc/img/nucleo_g071rb.jpg
index 88abf814bcc..f45d9debdc1 100644
Binary files a/boards/arm/nucleo_g071rb/doc/img/nucleo_g071rb.jpg and b/boards/arm/nucleo_g071rb/doc/img/nucleo_g071rb.jpg differ
diff --git a/boards/arm/nucleo_g071rb/doc/index.rst b/boards/arm/nucleo_g071rb/doc/index.rst
index 55f040a117f..81d05439ef8 100644
--- a/boards/arm/nucleo_g071rb/doc/index.rst
+++ b/boards/arm/nucleo_g071rb/doc/index.rst
@@ -25,8 +25,6 @@ some highlights of the Nucleo G071RB board:
 - Two push-buttons: USER and RESET
 
 .. image:: img/nucleo_g071rb.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo G071RB
 
diff --git a/boards/arm/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg b/boards/arm/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg
index 7d4ffc53443..527c667160c 100644
Binary files a/boards/arm/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg and b/boards/arm/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg differ
diff --git a/boards/arm/nucleo_g0b1re/doc/index.rst b/boards/arm/nucleo_g0b1re/doc/index.rst
index 5d16853684f..1e59c160467 100644
--- a/boards/arm/nucleo_g0b1re/doc/index.rst
+++ b/boards/arm/nucleo_g0b1re/doc/index.rst
@@ -29,8 +29,6 @@ some highlights of the Nucleo G0B1RE board:
 - 32.768 kHz crystal oscillator
 
 .. image:: img/nucleo_g0b1re.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo G0B1RE
 
diff --git a/boards/arm/nucleo_g431rb/doc/img/nucleo_g431rb.jpg b/boards/arm/nucleo_g431rb/doc/img/nucleo_g431rb.jpg
index 12ba6142db9..a10e6784967 100644
Binary files a/boards/arm/nucleo_g431rb/doc/img/nucleo_g431rb.jpg and b/boards/arm/nucleo_g431rb/doc/img/nucleo_g431rb.jpg differ
diff --git a/boards/arm/nucleo_g431rb/doc/index.rst b/boards/arm/nucleo_g431rb/doc/index.rst
index c3a2141bbae..db18f702cdc 100644
--- a/boards/arm/nucleo_g431rb/doc/index.rst
+++ b/boards/arm/nucleo_g431rb/doc/index.rst
@@ -22,9 +22,7 @@ some highlights of the Nucleo G431RB board:
 - Two push-buttons: RESET and USER
 
 .. image:: img/nucleo_g431rb.jpg
-  :width: 426px
   :align: center
-  :height: 256px
   :alt: Nucleo G431RB
 
 More information about the board can be found at the `Nucleo G431RB website`_.
diff --git a/boards/arm/nucleo_g474re/doc/img/nucleo_g474re.jpg b/boards/arm/nucleo_g474re/doc/img/nucleo_g474re.jpg
index 12ba6142db9..a10e6784967 100644
Binary files a/boards/arm/nucleo_g474re/doc/img/nucleo_g474re.jpg and b/boards/arm/nucleo_g474re/doc/img/nucleo_g474re.jpg differ
diff --git a/boards/arm/nucleo_g474re/doc/index.rst b/boards/arm/nucleo_g474re/doc/index.rst
index a1a88007ca2..b21265795be 100644
--- a/boards/arm/nucleo_g474re/doc/index.rst
+++ b/boards/arm/nucleo_g474re/doc/index.rst
@@ -22,9 +22,7 @@ some highlights of the Nucleo G474RE board:
 - Two push-buttons: RESET and USER
 
 .. image:: img/nucleo_g474re.jpg
-  :width: 426px
   :align: center
-  :height: 256px
   :alt: Nucleo G474RE
 
 More information about the board can be found at the `Nucleo G474RE website`_.
diff --git a/boards/arm/nucleo_h723zg/doc/img/nucleo_h723zg.jpg b/boards/arm/nucleo_h723zg/doc/img/nucleo_h723zg.jpg
index ae9b6ba7300..c9816742a86 100644
Binary files a/boards/arm/nucleo_h723zg/doc/img/nucleo_h723zg.jpg and b/boards/arm/nucleo_h723zg/doc/img/nucleo_h723zg.jpg differ
diff --git a/boards/arm/nucleo_h723zg/doc/index.rst b/boards/arm/nucleo_h723zg/doc/index.rst
index 4bf531006b8..d27c7367aca 100644
--- a/boards/arm/nucleo_h723zg/doc/index.rst
+++ b/boards/arm/nucleo_h723zg/doc/index.rst
@@ -43,9 +43,7 @@ Key Features
 - USB OTG full speed or device only
 
 .. image:: img/nucleo_h723zg.jpg
-   :width: 720px
    :align: center
-   :height: 560px
    :alt: Nucleo H723ZG
 
 More information about the board can be found at the `Nucleo H723ZG website`_.
diff --git a/boards/arm/nucleo_h743zi/doc/img/nucleo_h743zi.jpg b/boards/arm/nucleo_h743zi/doc/img/nucleo_h743zi.jpg
index da87faff187..ce1f3f09121 100644
Binary files a/boards/arm/nucleo_h743zi/doc/img/nucleo_h743zi.jpg and b/boards/arm/nucleo_h743zi/doc/img/nucleo_h743zi.jpg differ
diff --git a/boards/arm/nucleo_h743zi/doc/index.rst b/boards/arm/nucleo_h743zi/doc/index.rst
index c20e84051e0..b2c2b7e6d4f 100644
--- a/boards/arm/nucleo_h743zi/doc/index.rst
+++ b/boards/arm/nucleo_h743zi/doc/index.rst
@@ -45,9 +45,7 @@ Key Features
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
 .. image:: img/nucleo_h743zi.jpg
-   :width: 720px
    :align: center
-   :height: 720px
    :alt: Nucleo H743ZI
 
 More information about the board can be found at the `Nucleo H743ZI website`_.
diff --git a/boards/arm/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg b/boards/arm/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg
index f97400174ae..2294319b97b 100644
Binary files a/boards/arm/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg and b/boards/arm/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg differ
diff --git a/boards/arm/nucleo_h745zi_q/doc/index.rst b/boards/arm/nucleo_h745zi_q/doc/index.rst
index 6ddce2382fa..99afb70898d 100644
--- a/boards/arm/nucleo_h745zi_q/doc/index.rst
+++ b/boards/arm/nucleo_h745zi_q/doc/index.rst
@@ -46,9 +46,7 @@ Key Features
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
 .. image:: img/nucleo_h745zi_q.jpg
-   :width: 720px
    :align: center
-   :height: 560px
    :alt: Nucleo H745ZI-Q
 
 More information about the board can be found at the `Nucleo H745ZI-Q website`_.
diff --git a/boards/arm/nucleo_h753zi/doc/img/nucleo_h753zi.jpg b/boards/arm/nucleo_h753zi/doc/img/nucleo_h753zi.jpg
index f97400174ae..2294319b97b 100644
Binary files a/boards/arm/nucleo_h753zi/doc/img/nucleo_h753zi.jpg and b/boards/arm/nucleo_h753zi/doc/img/nucleo_h753zi.jpg differ
diff --git a/boards/arm/nucleo_h753zi/doc/index.rst b/boards/arm/nucleo_h753zi/doc/index.rst
index f591ec54f78..8c52f7a4a27 100644
--- a/boards/arm/nucleo_h753zi/doc/index.rst
+++ b/boards/arm/nucleo_h753zi/doc/index.rst
@@ -45,9 +45,7 @@ Key Features
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
 .. image:: img/nucleo_h753zi.jpg
-   :width: 720px
    :align: center
-   :height: 533px
    :alt: Nucleo H753ZI
 
 More information about the board can be found at the `Nucleo H753ZI website`_.
diff --git a/boards/arm/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg b/boards/arm/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg
index 2cb1ad2e6b7..f3a22eefae8 100644
Binary files a/boards/arm/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg and b/boards/arm/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg differ
diff --git a/boards/arm/nucleo_h7a3zi_q/doc/index.rst b/boards/arm/nucleo_h7a3zi_q/doc/index.rst
index de1461e8c69..92dfbd98deb 100644
--- a/boards/arm/nucleo_h7a3zi_q/doc/index.rst
+++ b/boards/arm/nucleo_h7a3zi_q/doc/index.rst
@@ -43,9 +43,7 @@ Key Features
 - Arm* Mbed Enabled* compliant (only for some Nucleo part numbers)
 
 .. image:: img/nucleo_h7a3zi_q.jpg
-   :width: 1000px
    :align: center
-   :height: 1498px
    :alt: Nucleo H7A3ZI-Q
 
 More information about the board can be found at the `Nucleo H7A3ZI-Q website`_.
diff --git a/boards/arm/nucleo_l011k4/doc/img/nucleo_l011k4.jpg b/boards/arm/nucleo_l011k4/doc/img/nucleo_l011k4.jpg
index ca0471e4fa3..9ecc2ced2e7 100644
Binary files a/boards/arm/nucleo_l011k4/doc/img/nucleo_l011k4.jpg and b/boards/arm/nucleo_l011k4/doc/img/nucleo_l011k4.jpg differ
diff --git a/boards/arm/nucleo_l011k4/doc/index.rst b/boards/arm/nucleo_l011k4/doc/index.rst
index d6bb446fff3..6d5831a37b0 100644
--- a/boards/arm/nucleo_l011k4/doc/index.rst
+++ b/boards/arm/nucleo_l011k4/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_l011k4.jpg
-   :width: 426px
-   :height: 319px
    :align: center
    :alt: Nucleo L011K4
 
diff --git a/boards/arm/nucleo_l031k6/doc/img/nucleo_l031k6.jpg b/boards/arm/nucleo_l031k6/doc/img/nucleo_l031k6.jpg
index ca0471e4fa3..9ecc2ced2e7 100644
Binary files a/boards/arm/nucleo_l031k6/doc/img/nucleo_l031k6.jpg and b/boards/arm/nucleo_l031k6/doc/img/nucleo_l031k6.jpg differ
diff --git a/boards/arm/nucleo_l031k6/doc/index.rst b/boards/arm/nucleo_l031k6/doc/index.rst
index de456941dd6..cc9803e7857 100644
--- a/boards/arm/nucleo_l031k6/doc/index.rst
+++ b/boards/arm/nucleo_l031k6/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_l031k6.jpg
-   :width: 426px
-   :height: 319px
    :align: center
    :alt: Nucleo L031K6
 
diff --git a/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8.jpg b/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8.jpg
index 88abf814bcc..f45d9debdc1 100644
Binary files a/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8.jpg and b/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8.jpg differ
diff --git a/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_connectors.jpg b/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_connectors.jpg
new file mode 100644
index 00000000000..2a3d64cc6e3
Binary files /dev/null and b/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_connectors.jpg differ
diff --git a/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_connectors.png b/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_connectors.png
deleted file mode 100644
index 5aeccdcbf71..00000000000
Binary files a/boards/arm/nucleo_l053r8/doc/img/nucleo_l053r8_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_l053r8/doc/index.rst b/boards/arm/nucleo_l053r8/doc/index.rst
index 0a5fe45cb22..5e55da0fbd2 100644
--- a/boards/arm/nucleo_l053r8/doc/index.rst
+++ b/boards/arm/nucleo_l053r8/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_l053r8.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo L053R8
 
@@ -110,10 +108,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_l053r8_connectors.png
-   :width: 800px
+.. image:: img/nucleo_l053r8_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo L053R8 connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz.jpg b/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz.jpg
index 9d1ef3df992..1cd53f4471d 100644
Binary files a/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz.jpg and b/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz.jpg differ
diff --git a/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_connectors.jpg b/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_connectors.jpg
new file mode 100644
index 00000000000..92b15ce656d
Binary files /dev/null and b/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_connectors.jpg differ
diff --git a/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_connectors.png b/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_connectors.png
deleted file mode 100644
index 7e86d0382f5..00000000000
Binary files a/boards/arm/nucleo_l073rz/doc/img/nucleo_l073rz_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_l073rz/doc/index.rst b/boards/arm/nucleo_l073rz/doc/index.rst
index a9c6fb7f109..7d38c0e9102 100644
--- a/boards/arm/nucleo_l073rz/doc/index.rst
+++ b/boards/arm/nucleo_l073rz/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_l073rz.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: Nucleo L073RZ
 
@@ -120,10 +118,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_l073rz_connectors.png
-   :width: 800px
+.. image:: img/nucleo_l073rz_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo L073RZ connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_l152re/doc/img/nucleo_l152re.jpg b/boards/arm/nucleo_l152re/doc/img/nucleo_l152re.jpg
index 9d1ef3df992..1cd53f4471d 100644
Binary files a/boards/arm/nucleo_l152re/doc/img/nucleo_l152re.jpg and b/boards/arm/nucleo_l152re/doc/img/nucleo_l152re.jpg differ
diff --git a/boards/arm/nucleo_l152re/doc/img/nucleo_l152re_connectors.jpg b/boards/arm/nucleo_l152re/doc/img/nucleo_l152re_connectors.jpg
new file mode 100644
index 00000000000..7eb69f7e9ef
Binary files /dev/null and b/boards/arm/nucleo_l152re/doc/img/nucleo_l152re_connectors.jpg differ
diff --git a/boards/arm/nucleo_l152re/doc/img/nucleo_l152re_connectors.png b/boards/arm/nucleo_l152re/doc/img/nucleo_l152re_connectors.png
deleted file mode 100644
index 3c4b7cb084a..00000000000
Binary files a/boards/arm/nucleo_l152re/doc/img/nucleo_l152re_connectors.png and /dev/null differ
diff --git a/boards/arm/nucleo_l152re/doc/index.rst b/boards/arm/nucleo_l152re/doc/index.rst
index ea2835befd6..15af9807494 100644
--- a/boards/arm/nucleo_l152re/doc/index.rst
+++ b/boards/arm/nucleo_l152re/doc/index.rst
@@ -21,8 +21,6 @@ The STM32 Nucleo board comes with the STM32 comprehensive software HAL library t
 with various packaged software examples.
 
 .. image:: img/nucleo_l152re.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: NUCLEO-L152RE
 
@@ -118,10 +116,8 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/nucleo_l152re_connectors.png
-   :width: 800px
+.. image:: img/nucleo_l152re_connectors.jpg
    :align: center
-   :height: 619px
    :alt: Nucleo L152RE connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p.jpg b/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p.jpg
index 9259256906f..fb52d5757f5 100644
Binary files a/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p.jpg and b/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p.jpg differ
diff --git a/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p_pinout.jpg b/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p_pinout.jpg
new file mode 100644
index 00000000000..4bfec41a364
Binary files /dev/null and b/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p_pinout.jpg differ
diff --git a/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p_pinout.png b/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p_pinout.png
deleted file mode 100644
index 5026ebea47a..00000000000
Binary files a/boards/arm/nucleo_l412rb_p/doc/img/nucleo_l412rb_p_pinout.png and /dev/null differ
diff --git a/boards/arm/nucleo_l412rb_p/doc/index.rst b/boards/arm/nucleo_l412rb_p/doc/index.rst
index 1d81371fd4d..007ae04379d 100644
--- a/boards/arm/nucleo_l412rb_p/doc/index.rst
+++ b/boards/arm/nucleo_l412rb_p/doc/index.rst
@@ -38,9 +38,7 @@ some highlights of the Nucleo L412RB board:
   - Arm® Mbed Enabled |trade| compliant
 
 .. image:: img/nucleo_l412rb_p.jpg
-  :width: 1000px
   :align: center
-  :height: 742px
   :alt: Nucleo L412RB
 
 More information about the board can be found at the `Nucleo L412RB-P website`_.
@@ -174,10 +172,8 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_l412rb_p_pinout.png
-   :width: 960px
+.. image:: img/nucleo_l412rb_p_pinout.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo L412RB-P
 
 For mode details please refer to `ST Nucleo L412RB-P User Manual`_.
diff --git a/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc.jpg b/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc.jpg
index 6be9bdb367e..23d964cfd3a 100644
Binary files a/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc.jpg and b/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc.jpg differ
diff --git a/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc_arduino_nano.jpg b/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc_arduino_nano.jpg
new file mode 100644
index 00000000000..4c18279c43d
Binary files /dev/null and b/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc_arduino_nano.jpg differ
diff --git a/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc_arduino_nano.png b/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc_arduino_nano.png
deleted file mode 100644
index 95e9e97c62c..00000000000
Binary files a/boards/arm/nucleo_l432kc/doc/img/nucleo_l432kc_arduino_nano.png and /dev/null differ
diff --git a/boards/arm/nucleo_l432kc/doc/index.rst b/boards/arm/nucleo_l432kc/doc/index.rst
index 7fadf13c268..fc9bfc51d08 100644
--- a/boards/arm/nucleo_l432kc/doc/index.rst
+++ b/boards/arm/nucleo_l432kc/doc/index.rst
@@ -22,9 +22,7 @@ some highlights of the Nucleo L432KC board:
 - One push-button: RESET
 
 .. image:: img/nucleo_l432kc.jpg
-  :width: 250px
   :align: center
-  :height: 188px
   :alt: Nucleo L432KC
 
 More information about the board can be found at the `Nucleo L432KC website`_.
@@ -135,10 +133,8 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_l432kc_arduino_nano.png
-   :width: 960px
+.. image:: img/nucleo_l432kc_arduino_nano.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo L432KC Arduino connectors
 
 For mode details please refer to `STM32 Nucleo-32 board User Manual`_.
diff --git a/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p.jpg b/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p.jpg
new file mode 100644
index 00000000000..f37956c8cea
Binary files /dev/null and b/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p.jpg differ
diff --git a/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p.png b/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p.png
deleted file mode 100644
index e10e778fc1b..00000000000
Binary files a/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p.png and /dev/null differ
diff --git a/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p_pinout.jpg b/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p_pinout.jpg
new file mode 100644
index 00000000000..4bfec41a364
Binary files /dev/null and b/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p_pinout.jpg differ
diff --git a/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p_pinout.png b/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p_pinout.png
deleted file mode 100644
index 5026ebea47a..00000000000
Binary files a/boards/arm/nucleo_l433rc_p/doc/img/nucleo_l433rc_p_pinout.png and /dev/null differ
diff --git a/boards/arm/nucleo_l433rc_p/doc/index.rst b/boards/arm/nucleo_l433rc_p/doc/index.rst
index 9f01827259b..f4903d59b16 100644
--- a/boards/arm/nucleo_l433rc_p/doc/index.rst
+++ b/boards/arm/nucleo_l433rc_p/doc/index.rst
@@ -21,10 +21,8 @@ some highlights of the Nucleo L433RC board:
 - Three LEDs: USB communication (LD1), power LED (LD3), user LED (LD4)
 - One push-button: RESET
 
-.. image:: img/nucleo_l433rc_p.png
-  :width: 250px
+.. image:: img/nucleo_l433rc_p.jpg
   :align: center
-  :height: 188px
   :alt: Nucleo L433RC
 
 More information about the board can be found at the `Nucleo L433RC-P website`_.
@@ -138,10 +136,8 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_l433rc_p_pinout.png
-   :width: 960px
+.. image:: img/nucleo_l433rc_p_pinout.jpg
    :align: center
-   :height: 720px
    :alt: Nucleo L433RC-P
 
 For mode details please refer to `ST Nucleo L433RC-P User Manual`_.
diff --git a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p.jpg b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p.jpg
index 173eb5b6a68..74bf55c1ad9 100644
Binary files a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p.jpg and b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p.jpg differ
diff --git a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p_pinout.jpg b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p_pinout.jpg
new file mode 100644
index 00000000000..f999efbf6cf
Binary files /dev/null and b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p_pinout.jpg differ
diff --git a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p_pinout.png b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p_pinout.png
deleted file mode 100644
index 54a64e8901c..00000000000
Binary files a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_p_pinout.png and /dev/null differ
diff --git a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_pinout.jpg b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_pinout.jpg
new file mode 100644
index 00000000000..ea2bcb9663c
Binary files /dev/null and b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_pinout.jpg differ
diff --git a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_pinout.png b/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_pinout.png
deleted file mode 100644
index 174538ace64..00000000000
Binary files a/boards/arm/nucleo_l452re/doc/img/nucleo_l452re_pinout.png and /dev/null differ
diff --git a/boards/arm/nucleo_l452re/doc/index.rst b/boards/arm/nucleo_l452re/doc/index.rst
index c779e028746..4b68d032be1 100644
--- a/boards/arm/nucleo_l452re/doc/index.rst
+++ b/boards/arm/nucleo_l452re/doc/index.rst
@@ -26,9 +26,7 @@ Here some highlights of these boards:
 - One push-button: RESET
 
 .. image:: img/nucleo_l452re_p.jpg
-  :width: 363px
   :align: center
-  :height: 408px
   :alt: Nucleo L452RE-P
 
 The main difference between the ST Nucleo L452RE and the L452RE-P (note the missing
@@ -145,16 +143,12 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_l452re_pinout.png
-   :width: 496px
+.. image:: img/nucleo_l452re_pinout.jpg
    :align: center
-   :height: 446px
    :alt: Nucleo L452RE Pinout
 
-.. image:: img/nucleo_l452re_p_pinout.png
-   :width: 537px
+.. image:: img/nucleo_l452re_p_pinout.jpg
    :align: center
-   :height: 446px
    :alt: Nucleo L452RE-P Pinout
 
 For more details please refer to `ST Nucleo L452RE User Manual`_ or
diff --git a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg.jpg b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg.jpg
index eb5648cef14..6de319b24ee 100644
Binary files a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg.jpg and b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg.jpg differ
diff --git a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.jpg b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.jpg
new file mode 100644
index 00000000000..f2ddb42dbe3
Binary files /dev/null and b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.jpg differ
diff --git a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.png b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.png
deleted file mode 100644
index f1014ba5a22..00000000000
Binary files a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.png and /dev/null differ
diff --git a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.jpg b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.jpg
new file mode 100644
index 00000000000..885d7dfa974
Binary files /dev/null and b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.jpg differ
diff --git a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.png b/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.png
deleted file mode 100644
index 7dd69bb76a8..00000000000
Binary files a/boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.png and /dev/null differ
diff --git a/boards/arm/nucleo_l476rg/doc/index.rst b/boards/arm/nucleo_l476rg/doc/index.rst
index 7f96d46ceeb..765657b6a9e 100644
--- a/boards/arm/nucleo_l476rg/doc/index.rst
+++ b/boards/arm/nucleo_l476rg/doc/index.rst
@@ -27,9 +27,7 @@ some highlights of the Nucleo L476RG board:
 - Two push-buttons: USER and RESET
 
 .. image:: img/nucleo_l476rg.jpg
-   :width: 250px
    :align: center
-   :height: 250px
    :alt: Nucleo L476RG
 
 More information about the board can be found at the `Nucleo L476RG website`_.
@@ -140,15 +138,11 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_l476rg_arduino.png
-   :width: 720px
+.. image:: img/nucleo_l476rg_arduino.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo L476RG Arduino connectors
-.. image:: img/nucleo_l476rg_morpho.png
-   :width: 720px
+.. image:: img/nucleo_l476rg_morpho.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo L476RG Morpho connectors
 
 For mode details please refer to `STM32 Nucleo-64 board User Manual`_.
diff --git a/boards/arm/nucleo_l496zg/doc/img/nucleo_l496zg.jpg b/boards/arm/nucleo_l496zg/doc/img/nucleo_l496zg.jpg
index 683fec72d8a..214eca0b43c 100644
Binary files a/boards/arm/nucleo_l496zg/doc/img/nucleo_l496zg.jpg and b/boards/arm/nucleo_l496zg/doc/img/nucleo_l496zg.jpg differ
diff --git a/boards/arm/nucleo_l496zg/doc/index.rst b/boards/arm/nucleo_l496zg/doc/index.rst
index e9330f4ab26..9f7c9959717 100644
--- a/boards/arm/nucleo_l496zg/doc/index.rst
+++ b/boards/arm/nucleo_l496zg/doc/index.rst
@@ -29,9 +29,7 @@ some highlights of the Nucleo L476ZG board:
 - 2 push buttons: USER and RESET
 
 .. image:: img/nucleo_l496zg.jpg
-   :width: 250px
    :align: center
-   :height: 250px
    :alt: Nucleo L496ZG
 
 More information about the board can be found at the `Nucleo L496ZG website`_.
diff --git a/boards/arm/nucleo_l4r5zi/doc/img/nucleo144_layout.jpg b/boards/arm/nucleo_l4r5zi/doc/img/nucleo144_layout.jpg
index db147253626..934e5949bb7 100644
Binary files a/boards/arm/nucleo_l4r5zi/doc/img/nucleo144_layout.jpg and b/boards/arm/nucleo_l4r5zi/doc/img/nucleo144_layout.jpg differ
diff --git a/boards/arm/nucleo_l4r5zi/doc/img/nucleo_l4r5zi.jpg b/boards/arm/nucleo_l4r5zi/doc/img/nucleo_l4r5zi.jpg
index 683fec72d8a..214eca0b43c 100644
Binary files a/boards/arm/nucleo_l4r5zi/doc/img/nucleo_l4r5zi.jpg and b/boards/arm/nucleo_l4r5zi/doc/img/nucleo_l4r5zi.jpg differ
diff --git a/boards/arm/nucleo_l4r5zi/doc/index.rst b/boards/arm/nucleo_l4r5zi/doc/index.rst
index 9fc3b182fd1..f2d27399913 100644
--- a/boards/arm/nucleo_l4r5zi/doc/index.rst
+++ b/boards/arm/nucleo_l4r5zi/doc/index.rst
@@ -27,9 +27,7 @@ some highlights of the Nucleo L4R5ZI board:
 - Two push-buttons: USER and RESET
 
 .. image:: img/nucleo_l4r5zi.jpg
-     :width: 250px
      :align: center
-     :height: 250px
      :alt: Nucleo L4R5ZI
 
 More information about the board can be found at the `Nucleo L4R5ZI website`_.
@@ -159,9 +157,7 @@ responsible for pin muxing, input/output, pull-up, etc.
 Available pins:
 ---------------
 .. image:: img/nucleo144_layout.jpg
-     :width: 720px
      :align: center
-     :height: 540px
      :alt: Nucleo L4R5ZI Arduino connectors
 
 For mode details please refer to `STM32 Nucleo-144 board User Manual`_.
diff --git a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q.jpg b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q.jpg
index 12903b5682d..eeaa0295405 100644
Binary files a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q.jpg and b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q.jpg differ
diff --git a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_left_2020_2_11.jpg b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_left_2020_2_11.jpg
new file mode 100644
index 00000000000..8d3aa68a12b
Binary files /dev/null and b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_left_2020_2_11.jpg differ
diff --git a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_left_2020_2_11.png b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_left_2020_2_11.png
deleted file mode 100644
index 6ffbdaddbb9..00000000000
Binary files a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_left_2020_2_11.png and /dev/null differ
diff --git a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_right_2020_2_11.jpg b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_right_2020_2_11.jpg
new file mode 100644
index 00000000000..c039b3fe255
Binary files /dev/null and b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_right_2020_2_11.jpg differ
diff --git a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_right_2020_2_11.png b/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_right_2020_2_11.png
deleted file mode 100644
index addb782a86a..00000000000
Binary files a/boards/arm/nucleo_l552ze_q/doc/img/nucleo_l552ze_q_zio_right_2020_2_11.png and /dev/null differ
diff --git a/boards/arm/nucleo_l552ze_q/doc/nucleol552ze_q.rst b/boards/arm/nucleo_l552ze_q/doc/nucleol552ze_q.rst
index 5f730357a6d..de2a4b4b558 100644
--- a/boards/arm/nucleo_l552ze_q/doc/nucleol552ze_q.rst
+++ b/boards/arm/nucleo_l552ze_q/doc/nucleol552ze_q.rst
@@ -31,9 +31,7 @@ board:
 - USB OTG full speed or device only
 
 .. image:: img/nucleo_l552ze_q.jpg
-   :width: 250px
    :align: center
-   :height: 250px
    :alt: Nucleo L552ZE Q
 
 More information about the board can be found at the `Nucleo L552ZE Q website`_.
@@ -229,15 +227,11 @@ input/output, pull-up, etc.
 
 Available pins:
 ---------------
-.. image:: img/nucleo_l552ze_q_zio_left_2020_2_11.png
-   :width: 720px
+.. image:: img/nucleo_l552ze_q_zio_left_2020_2_11.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo L552ZE Q Zio left connector
-.. image:: img/nucleo_l552ze_q_zio_right_2020_2_11.png
-   :width: 720px
+.. image:: img/nucleo_l552ze_q_zio_right_2020_2_11.jpg
    :align: center
-   :height: 540px
    :alt: Nucleo L552ZE Q Zio right connector
 
 For mode details please refer to `STM32 Nucleo-144 board User Manual`_.
diff --git a/boards/arm/nucleo_wb55rg/doc/img/nucleowb55rg.jpg b/boards/arm/nucleo_wb55rg/doc/img/nucleowb55rg.jpg
index ef408f43224..88d795d9292 100644
Binary files a/boards/arm/nucleo_wb55rg/doc/img/nucleowb55rg.jpg and b/boards/arm/nucleo_wb55rg/doc/img/nucleowb55rg.jpg differ
diff --git a/boards/arm/nucleo_wb55rg/doc/nucleo_wb55rg.rst b/boards/arm/nucleo_wb55rg/doc/nucleo_wb55rg.rst
index c9124bad979..fe03035e9e8 100644
--- a/boards/arm/nucleo_wb55rg/doc/nucleo_wb55rg.rst
+++ b/boards/arm/nucleo_wb55rg/doc/nucleo_wb55rg.rst
@@ -30,9 +30,7 @@ Low Energy (BLE) SIG specification v5.0 and with IEEE 802.15.4-2011.
   mass storage, virtual COM port and debug port
 
 .. image:: img/nucleowb55rg.jpg
-   :width: 670px
    :align: center
-   :height: 339px
    :alt: Nucleo WB55RG
 
 More information about the board can be found at the `Nucleo WB55RG website`_.
diff --git a/boards/arm/nucleo_wl55jc/doc/img/nucleo_wl55jc.jpg b/boards/arm/nucleo_wl55jc/doc/img/nucleo_wl55jc.jpg
index 539ffc3f8a7..7fba96b71f7 100644
Binary files a/boards/arm/nucleo_wl55jc/doc/img/nucleo_wl55jc.jpg and b/boards/arm/nucleo_wl55jc/doc/img/nucleo_wl55jc.jpg differ
diff --git a/boards/arm/nucleo_wl55jc/doc/nucleo_wl55jc.rst b/boards/arm/nucleo_wl55jc/doc/nucleo_wl55jc.rst
index 301c88e9725..4b0a2937b05 100644
--- a/boards/arm/nucleo_wl55jc/doc/nucleo_wl55jc.rst
+++ b/boards/arm/nucleo_wl55jc/doc/nucleo_wl55jc.rst
@@ -44,9 +44,7 @@ power consumption, and features.
 
 
 .. image:: img/nucleo_wl55jc.jpg
-   :width: 426px
    :align: center
-   :height: 683px
    :alt: Nucleo WL55JC
 
 More information about the board can be found at the `Nucleo WL55JC website`_.
diff --git a/boards/arm/nuvoton_pfm_m487/doc/index.rst b/boards/arm/nuvoton_pfm_m487/doc/index.rst
index fc70a417a60..e5d30c7b764 100644
--- a/boards/arm/nuvoton_pfm_m487/doc/index.rst
+++ b/boards/arm/nuvoton_pfm_m487/doc/index.rst
@@ -10,8 +10,7 @@ The NuMaker PFM M487 is an Internet of Things (IoT) application focused platform
 specially developed by Nuvoton. The PFM-M487 is based on the NuMicro® M487
 Ethernet series MCU with ARM® -Cortex®-M4F core.
 
-.. image:: ./pfm_m487.jpeg
-   :width: 720px
+.. image:: pfm_m487.jpg
    :align: center
    :alt: PFM-M487
 
diff --git a/boards/arm/nuvoton_pfm_m487/doc/pfm_m487.jpeg b/boards/arm/nuvoton_pfm_m487/doc/pfm_m487.jpeg
deleted file mode 100644
index e8d755a3d1e..00000000000
Binary files a/boards/arm/nuvoton_pfm_m487/doc/pfm_m487.jpeg and /dev/null differ
diff --git a/boards/arm/nuvoton_pfm_m487/doc/pfm_m487.jpg b/boards/arm/nuvoton_pfm_m487/doc/pfm_m487.jpg
new file mode 100644
index 00000000000..c4afe2a9d03
Binary files /dev/null and b/boards/arm/nuvoton_pfm_m487/doc/pfm_m487.jpg differ
diff --git a/boards/arm/olimex_lora_stm32wl_devkit/doc/olimex-stm32wl-devkit.jpg b/boards/arm/olimex_lora_stm32wl_devkit/doc/olimex-stm32wl-devkit.jpg
index 1ffa862c894..fb006670900 100644
Binary files a/boards/arm/olimex_lora_stm32wl_devkit/doc/olimex-stm32wl-devkit.jpg and b/boards/arm/olimex_lora_stm32wl_devkit/doc/olimex-stm32wl-devkit.jpg differ
diff --git a/boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407-front.jpg b/boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407-front.jpg
new file mode 100644
index 00000000000..d7e27e662f2
Binary files /dev/null and b/boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407-front.jpg differ
diff --git a/boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407-front.png b/boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407-front.png
deleted file mode 100644
index 206c7e1a736..00000000000
Binary files a/boards/arm/olimex_stm32_e407/doc/img/olimex-stm32-e407-front.png and /dev/null differ
diff --git a/boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.jpg b/boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.jpg
new file mode 100644
index 00000000000..ee39a677d1d
Binary files /dev/null and b/boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.jpg differ
diff --git a/boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.png b/boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.png
deleted file mode 100644
index a5607dac20c..00000000000
Binary files a/boards/arm/olimex_stm32_e407/doc/img/olimex_stm32_e407.png and /dev/null differ
diff --git a/boards/arm/olimex_stm32_e407/doc/index.rst b/boards/arm/olimex_stm32_e407/doc/index.rst
index 1ed630cbff5..de5393f4b11 100644
--- a/boards/arm/olimex_stm32_e407/doc/index.rst
+++ b/boards/arm/olimex_stm32_e407/doc/index.rst
@@ -9,10 +9,8 @@ Overview
 The OLIMEX-STM32-E407 board is open source hardware and is based on
 the STMicroelectronics STM32F407ZG ARM Cortex-M4 CPU.
 
-.. figure:: img/olimex_stm32_e407.png
-     :width: 540px
+.. figure:: img/olimex_stm32_e407.jpg
      :align: center
-     :height: 454px
      :alt: OLIMEX-STM32-E407
 
      OLIMEX-STM32-E407
@@ -53,10 +51,8 @@ Other hardware features have not been enabled yet for this board.
 Pin Mapping
 ===========
 
-.. figure:: img/olimex-stm32-e407-front.png
-     :width: 739px
+.. figure:: img/olimex-stm32-e407-front.jpg
      :align: center
-     :height: 530px
      :alt: OLIMEX-STM32-E407 connectors
 
      OLIMEX-STM32-E407 connectors
diff --git a/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_bottom.jpg b/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_bottom.jpg
index e48e08dcec1..829a9b3396a 100644
Binary files a/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_bottom.jpg and b/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_bottom.jpg differ
diff --git a/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_top.jpg b/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_top.jpg
index fbf0e21f121..71f8600080e 100644
Binary files a/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_top.jpg and b/boards/arm/olimex_stm32_h103/doc/img/olimex_stm32_h103_top.jpg differ
diff --git a/boards/arm/olimex_stm32_h103/doc/index.rst b/boards/arm/olimex_stm32_h103/doc/index.rst
index 35e6506e9d2..702bff46d61 100644
--- a/boards/arm/olimex_stm32_h103/doc/index.rst
+++ b/boards/arm/olimex_stm32_h103/doc/index.rst
@@ -11,12 +11,10 @@ STMicroelectronics STM32F103RBT6 ARM Cortex-M3 CPU, with all the MCU pins
 populated and accessible through two male 26-pin connectors.
 
 .. figure:: img/olimex_stm32_h103_top.jpg
-   :width: 800px
    :align: center
    :alt: OLIMEX-STM32-H103 top
 
 .. figure:: img/olimex_stm32_h103_bottom.jpg
-   :width: 800px
    :align: center
    :alt: OLIMEX-STM32-H103 bottom
 
diff --git a/boards/arm/olimex_stm32_h405/doc/index.rst b/boards/arm/olimex_stm32_h405/doc/index.rst
index 52da7454ea1..ab051345b9c 100644
--- a/boards/arm/olimex_stm32_h405/doc/index.rst
+++ b/boards/arm/olimex_stm32_h405/doc/index.rst
@@ -10,14 +10,12 @@ The OLIMEX-STM32-H405 board is based on the STMicroelectronics STM32F405RG ARM
 Cortex-M4 CPU.
 
 .. figure:: olimex_stm32_h405_top.jpg
-     :width: 540px
      :align: center
      :alt: OLIMEX-STM32-H405
 
      OLIMEX-STM32-H405 top
 
 .. figure:: olimex_stm32_h405_bottom.jpg
-     :width: 540px
      :align: center
      :alt: OLIMEX-STM32-H405
 
diff --git a/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg b/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg
index bb0e0ae3b18..8c275f128bf 100644
Binary files a/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg and b/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg differ
diff --git a/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg b/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg
index 86370609eab..24cdfd3efdd 100644
Binary files a/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg and b/boards/arm/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg differ
diff --git a/boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.jpg b/boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.jpg
new file mode 100644
index 00000000000..b6efcb37bd6
Binary files /dev/null and b/boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.jpg differ
diff --git a/boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.png b/boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.png
deleted file mode 100644
index be1a0a67dcc..00000000000
Binary files a/boards/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.png and /dev/null differ
diff --git a/boards/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg b/boards/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg
index 16b9b0cd110..4cf1124ff1e 100644
Binary files a/boards/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg and b/boards/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg differ
diff --git a/boards/arm/olimex_stm32_h407/doc/index.rst b/boards/arm/olimex_stm32_h407/doc/index.rst
index 327e3364269..25cd752612e 100644
--- a/boards/arm/olimex_stm32_h407/doc/index.rst
+++ b/boards/arm/olimex_stm32_h407/doc/index.rst
@@ -10,9 +10,7 @@ The OLIMEX-STM32-H407 is open source hardware and is based on
 the STMicroelectronics STM32F407ZG ARM Cortex-M4 CPU.
 
 .. figure:: img/olimex_stm32_h407.jpg
-     :width: 540px
      :align: center
-     :height: 454px
      :alt: OLIMEX-STM32-H407
 
      OLIMEX-STM32-H407
@@ -49,10 +47,8 @@ Other hardware features have not been enabled yet for this board.
 Pin Mapping
 ===========
 
-.. figure:: img/olimex-stm32-h407-front.png
-     :width: 739px
+.. figure:: img/olimex-stm32-h407-front.jpg
      :align: center
-     :height: 530px
      :alt: OLIMEX-STM32-H407 connectors
 
      OLIMEX-STM32-H407 connectors
diff --git a/boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405-front.jpg b/boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405-front.jpg
new file mode 100644
index 00000000000..354a407620f
Binary files /dev/null and b/boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405-front.jpg differ
diff --git a/boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405-front.png b/boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405-front.png
deleted file mode 100644
index 428f19110ec..00000000000
Binary files a/boards/arm/olimex_stm32_p405/doc/img/olimex-stm32-p405-front.png and /dev/null differ
diff --git a/boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.jpg b/boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.jpg
new file mode 100644
index 00000000000..b5c27e0e508
Binary files /dev/null and b/boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.jpg differ
diff --git a/boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.png b/boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.png
deleted file mode 100644
index e0ab16aff60..00000000000
Binary files a/boards/arm/olimex_stm32_p405/doc/img/olimex_stm32_p405.png and /dev/null differ
diff --git a/boards/arm/olimex_stm32_p405/doc/index.rst b/boards/arm/olimex_stm32_p405/doc/index.rst
index fd038195ec5..9aa053e90a0 100644
--- a/boards/arm/olimex_stm32_p405/doc/index.rst
+++ b/boards/arm/olimex_stm32_p405/doc/index.rst
@@ -9,10 +9,8 @@ Overview
 The OLIMEX-STM32-P405 board is based on the STMicroelectronics STM32F405RG ARM
 Cortex-M4 CPU.
 
-.. figure:: img/olimex_stm32_p405.png
-     :width: 540px
+.. figure:: img/olimex_stm32_p405.jpg
      :align: center
-     :height: 454px
      :alt: OLIMEX-STM32-P405
 
      OLIMEX-STM32-P405
@@ -49,10 +47,8 @@ Other hardware features have not been enabled yet for this board.
 Pin Mapping
 ===========
 
-.. figure:: img/olimex-stm32-p405-front.png
-     :width: 739px
+.. figure:: img/olimex-stm32-p405-front.jpg
      :align: center
-     :height: 530px
      :alt: OLIMEX-STM32-P405 connectors
 
      OLIMEX-STM32-P405 connectors
diff --git a/boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.jpg b/boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.jpg
new file mode 100644
index 00000000000..a1cb6449ff1
Binary files /dev/null and b/boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.jpg differ
diff --git a/boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.png b/boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.png
deleted file mode 100644
index 8ca0bc35279..00000000000
Binary files a/boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.png and /dev/null differ
diff --git a/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.jpg b/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.jpg
new file mode 100644
index 00000000000..40247d8bd3e
Binary files /dev/null and b/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.jpg differ
diff --git a/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.png b/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.png
deleted file mode 100644
index aaf10a1c26e..00000000000
Binary files a/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.png and /dev/null differ
diff --git a/boards/arm/olimexino_stm32/doc/index.rst b/boards/arm/olimexino_stm32/doc/index.rst
index f1150452c25..ce5a2407ac9 100644
--- a/boards/arm/olimexino_stm32/doc/index.rst
+++ b/boards/arm/olimexino_stm32/doc/index.rst
@@ -9,10 +9,8 @@ Overview
 The OLIMEXINO-STM32 board is based on the STMicroelectronics STM32F103RB ARM
 Cortex-M3 CPU.
 
-.. figure:: img/olimexino_stm32.png
-     :width: 540px
+.. figure:: img/olimexino_stm32.jpg
      :align: center
-     :height: 454px
      :alt: OLIMEXINO-STM32
 
      OLIMEXINO-STM32
@@ -56,10 +54,8 @@ Other hardware features have not been enabled yet for this board.
 Pin Mapping
 ===========
 
-.. figure:: img/olimexino-stm32-front.png
-     :width: 739px
+.. figure:: img/olimexino-stm32-front.jpg
      :align: center
-     :height: 530px
      :alt: OLIMEXINO-STM32 connectors
 
      OLIMEXINO-STM32 connectors
diff --git a/boards/arm/pan1770_evb/doc/index.rst b/boards/arm/pan1770_evb/doc/index.rst
index 07d3be49736..dd0efd1c8c4 100644
--- a/boards/arm/pan1770_evb/doc/index.rst
+++ b/boards/arm/pan1770_evb/doc/index.rst
@@ -13,8 +13,7 @@ It is basically a clone of the official nRF52840 development kit (PCA10056)
 from Nordic Semiconductor. Please refer to :ref:`nrf52840dk_nrf52840` for
 further information.
 
-.. figure:: pan1770_evaluation_board.png
-     :width: 400px
+.. figure:: pan1770_evaluation_board.jpg
      :align: center
      :alt: PAN1770 Evaluation Board
 
diff --git a/boards/arm/pan1770_evb/doc/pan1770_evaluation_board.jpg b/boards/arm/pan1770_evb/doc/pan1770_evaluation_board.jpg
new file mode 100644
index 00000000000..45b398b8501
Binary files /dev/null and b/boards/arm/pan1770_evb/doc/pan1770_evaluation_board.jpg differ
diff --git a/boards/arm/pan1770_evb/doc/pan1770_evaluation_board.png b/boards/arm/pan1770_evb/doc/pan1770_evaluation_board.png
deleted file mode 100644
index 7515d8c79fc..00000000000
Binary files a/boards/arm/pan1770_evb/doc/pan1770_evaluation_board.png and /dev/null differ
diff --git a/boards/arm/pan1780_evb/doc/index.rst b/boards/arm/pan1780_evb/doc/index.rst
index eac03f741ae..714b7b870f4 100644
--- a/boards/arm/pan1780_evb/doc/index.rst
+++ b/boards/arm/pan1780_evb/doc/index.rst
@@ -13,8 +13,7 @@ It is basically a clone of the official nRF52840 development kit (PCA10056)
 from Nordic Semiconductor. Please refer to :ref:`nrf52840dk_nrf52840` for
 further information.
 
-.. figure:: pan1780_evaluation_board.png
-     :width: 400px
+.. figure:: pan1780_evaluation_board.jpg
      :align: center
      :alt: PAN1780 Evaluation Board
 
diff --git a/boards/arm/pan1780_evb/doc/pan1780_evaluation_board.jpg b/boards/arm/pan1780_evb/doc/pan1780_evaluation_board.jpg
new file mode 100644
index 00000000000..6d1f2c4ee2f
Binary files /dev/null and b/boards/arm/pan1780_evb/doc/pan1780_evaluation_board.jpg differ
diff --git a/boards/arm/pan1780_evb/doc/pan1780_evaluation_board.png b/boards/arm/pan1780_evb/doc/pan1780_evaluation_board.png
deleted file mode 100644
index 516b2b8e53b..00000000000
Binary files a/boards/arm/pan1780_evb/doc/pan1780_evaluation_board.png and /dev/null differ
diff --git a/boards/arm/pan1781_evb/doc/index.rst b/boards/arm/pan1781_evb/doc/index.rst
index 1284ce6400b..312aa581e01 100644
--- a/boards/arm/pan1781_evb/doc/index.rst
+++ b/boards/arm/pan1781_evb/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The PAN1781 Evaluation Board is a development tool for the PAN1781 module
 which is based on the nRF52820 chipset from Nordic Semiconductor.
 
-.. figure:: pan1781_evaluation_board.png
-     :width: 400px
+.. figure:: pan1781_evaluation_board.jpg
      :align: center
      :alt: PAN1781 Evaluation Board
 
diff --git a/boards/arm/pan1781_evb/doc/pan1781_evaluation_board.jpg b/boards/arm/pan1781_evb/doc/pan1781_evaluation_board.jpg
new file mode 100644
index 00000000000..d6a2a92f208
Binary files /dev/null and b/boards/arm/pan1781_evb/doc/pan1781_evaluation_board.jpg differ
diff --git a/boards/arm/pan1781_evb/doc/pan1781_evaluation_board.png b/boards/arm/pan1781_evb/doc/pan1781_evaluation_board.png
deleted file mode 100644
index f69858b6944..00000000000
Binary files a/boards/arm/pan1781_evb/doc/pan1781_evaluation_board.png and /dev/null differ
diff --git a/boards/arm/pan1782_evb/doc/index.rst b/boards/arm/pan1782_evb/doc/index.rst
index 051071ea647..c69b23c7bdc 100644
--- a/boards/arm/pan1782_evb/doc/index.rst
+++ b/boards/arm/pan1782_evb/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The PAN1782 Evaluation Board is a development tool for the PAN1782 module
 which is based on the nRF52833 chipset from Nordic Semiconductor.
 
-.. figure:: pan1782_evaluation_board.png
-     :width: 400px
+.. figure:: pan1782_evaluation_board.jpg
      :align: center
      :alt: PAN1782 Evaluation Board
 
diff --git a/boards/arm/pan1782_evb/doc/pan1782_evaluation_board.jpg b/boards/arm/pan1782_evb/doc/pan1782_evaluation_board.jpg
new file mode 100644
index 00000000000..348dee314e9
Binary files /dev/null and b/boards/arm/pan1782_evb/doc/pan1782_evaluation_board.jpg differ
diff --git a/boards/arm/pan1782_evb/doc/pan1782_evaluation_board.png b/boards/arm/pan1782_evb/doc/pan1782_evaluation_board.png
deleted file mode 100644
index 6c6e9c59427..00000000000
Binary files a/boards/arm/pan1782_evb/doc/pan1782_evaluation_board.png and /dev/null differ
diff --git a/boards/arm/particle_argon/doc/img/particle_argon.jpg b/boards/arm/particle_argon/doc/img/particle_argon.jpg
new file mode 100644
index 00000000000..76eb0fa4705
Binary files /dev/null and b/boards/arm/particle_argon/doc/img/particle_argon.jpg differ
diff --git a/boards/arm/particle_argon/doc/img/particle_argon.png b/boards/arm/particle_argon/doc/img/particle_argon.png
deleted file mode 100644
index d25589436ba..00000000000
Binary files a/boards/arm/particle_argon/doc/img/particle_argon.png and /dev/null differ
diff --git a/boards/arm/particle_argon/doc/index.rst b/boards/arm/particle_argon/doc/index.rst
index 33662c88627..446b0a349dd 100644
--- a/boards/arm/particle_argon/doc/index.rst
+++ b/boards/arm/particle_argon/doc/index.rst
@@ -29,8 +29,7 @@ Hardware
 On the front of the board are RGB-LED, LED and LIPO circuitry.
 The RGB-LED is controlled by the nRF52840 via GPIO pins.
 
-.. figure:: img/particle_argon.png
-     :width: 150px
+.. figure:: img/particle_argon.jpg
      :align: center
      :alt: Particle Argon
 
diff --git a/boards/arm/particle_boron/doc/img/particle_boron.jpg b/boards/arm/particle_boron/doc/img/particle_boron.jpg
new file mode 100644
index 00000000000..2238ab9a9f7
Binary files /dev/null and b/boards/arm/particle_boron/doc/img/particle_boron.jpg differ
diff --git a/boards/arm/particle_boron/doc/img/particle_boron.png b/boards/arm/particle_boron/doc/img/particle_boron.png
deleted file mode 100644
index ae814bb7748..00000000000
Binary files a/boards/arm/particle_boron/doc/img/particle_boron.png and /dev/null differ
diff --git a/boards/arm/particle_boron/doc/index.rst b/boards/arm/particle_boron/doc/index.rst
index 020b51f77f4..1f26fc09b6c 100644
--- a/boards/arm/particle_boron/doc/index.rst
+++ b/boards/arm/particle_boron/doc/index.rst
@@ -29,8 +29,7 @@ Hardware
 On the front of the board are RGB-LED, LED and LIPO circuitry.
 The RGB-LED is controlled by the nRF52840 via GPIO pins.
 
-.. figure:: img/particle_boron.png
-     :width: 150px
+.. figure:: img/particle_boron.jpg
      :align: center
      :alt: Particle Boron
 
diff --git a/boards/arm/particle_xenon/doc/img/particle_xenon.jpg b/boards/arm/particle_xenon/doc/img/particle_xenon.jpg
new file mode 100644
index 00000000000..d8eeb2b506d
Binary files /dev/null and b/boards/arm/particle_xenon/doc/img/particle_xenon.jpg differ
diff --git a/boards/arm/particle_xenon/doc/img/particle_xenon.png b/boards/arm/particle_xenon/doc/img/particle_xenon.png
deleted file mode 100644
index 5f24c773b8a..00000000000
Binary files a/boards/arm/particle_xenon/doc/img/particle_xenon.png and /dev/null differ
diff --git a/boards/arm/particle_xenon/doc/index.rst b/boards/arm/particle_xenon/doc/index.rst
index 87a123eb19f..5d011b0de0d 100644
--- a/boards/arm/particle_xenon/doc/index.rst
+++ b/boards/arm/particle_xenon/doc/index.rst
@@ -28,8 +28,7 @@ Hardware
 On the front of the board are RGB-LED, LED and LIPO circuitry.
 The RGB-LED is controlled by the nRF52840 via GPIO pins.
 
-.. figure:: img/particle_xenon.png
-     :width: 150px
+.. figure:: img/particle_xenon.jpg
      :align: center
      :alt: Particle Xenon
 
diff --git a/boards/arm/pico_pi_m4/doc/index.rst b/boards/arm/pico_pi_m4/doc/index.rst
index 7a34b2315ab..8e3c4e832c8 100644
--- a/boards/arm/pico_pi_m4/doc/index.rst
+++ b/boards/arm/pico_pi_m4/doc/index.rst
@@ -12,8 +12,7 @@ Zephyr was ported to run on the M4 core. In a later release, it will also
 communicate with the A7 core (running Linux) via RPmsg.
 
 
-.. image:: ./pico_pi_m4.png
-   :width: 470px
+.. image:: pico_pi_m4.jpg
    :align: center
    :alt: Pico-Pi i.MX7D
 
diff --git a/boards/arm/pico_pi_m4/doc/pico_pi_m4.jpg b/boards/arm/pico_pi_m4/doc/pico_pi_m4.jpg
new file mode 100644
index 00000000000..0a4c3974a00
Binary files /dev/null and b/boards/arm/pico_pi_m4/doc/pico_pi_m4.jpg differ
diff --git a/boards/arm/pico_pi_m4/doc/pico_pi_m4.png b/boards/arm/pico_pi_m4/doc/pico_pi_m4.png
deleted file mode 100644
index 297c223e968..00000000000
Binary files a/boards/arm/pico_pi_m4/doc/pico_pi_m4.png and /dev/null differ
diff --git a/boards/arm/pinetime_devkit0/doc/img/PineTime_DevKit0.jpg b/boards/arm/pinetime_devkit0/doc/img/PineTime_DevKit0.jpg
index 6c5f2dcec51..a32a22c6f0a 100644
Binary files a/boards/arm/pinetime_devkit0/doc/img/PineTime_DevKit0.jpg and b/boards/arm/pinetime_devkit0/doc/img/PineTime_DevKit0.jpg differ
diff --git a/boards/arm/pinetime_devkit0/doc/img/PineTime_SWD_location.jpg b/boards/arm/pinetime_devkit0/doc/img/PineTime_SWD_location.jpg
index bdb3a03a1bd..ca44559933e 100644
Binary files a/boards/arm/pinetime_devkit0/doc/img/PineTime_SWD_location.jpg and b/boards/arm/pinetime_devkit0/doc/img/PineTime_SWD_location.jpg differ
diff --git a/boards/arm/pinetime_devkit0/doc/img/PineTime_leaflet.jpg b/boards/arm/pinetime_devkit0/doc/img/PineTime_leaflet.jpg
index 3b48af59a51..8077093ac83 100644
Binary files a/boards/arm/pinetime_devkit0/doc/img/PineTime_leaflet.jpg and b/boards/arm/pinetime_devkit0/doc/img/PineTime_leaflet.jpg differ
diff --git a/boards/arm/pinetime_devkit0/doc/index.rst b/boards/arm/pinetime_devkit0/doc/index.rst
index 93f5d1f9bfa..0a50bf07f60 100644
--- a/boards/arm/pinetime_devkit0/doc/index.rst
+++ b/boards/arm/pinetime_devkit0/doc/index.rst
@@ -7,7 +7,6 @@ Overview
 ********
 
 .. figure:: img/PineTime_leaflet.jpg
-   :width: 600px
    :align: center
    :alt: Pine64 PineTime
 
@@ -19,7 +18,6 @@ for an open source smartwatch in collaboration with wearable RTOS and Linux
 app developers/communities.
 
 .. figure:: img/PineTime_DevKit0.jpg
-   :width: 600px
    :align: center
    :alt: Pine64 PineTime
 
@@ -153,7 +151,6 @@ contact with the programming cable.
 The pinout is:
 
 .. figure:: img/PineTime_SWD_location.jpg
-   :width: 300px
    :align: center
    :alt: PineTime SWD location
 
diff --git a/boards/arm/pinnacle_100_dvk/doc/img/pinnacle_100_dvk.jpg b/boards/arm/pinnacle_100_dvk/doc/img/pinnacle_100_dvk.jpg
index 0da7273786f..a5070161312 100644
Binary files a/boards/arm/pinnacle_100_dvk/doc/img/pinnacle_100_dvk.jpg and b/boards/arm/pinnacle_100_dvk/doc/img/pinnacle_100_dvk.jpg differ
diff --git a/boards/arm/pinnacle_100_dvk/doc/index.rst b/boards/arm/pinnacle_100_dvk/doc/index.rst
index f07ce468c3e..7b5028a8f77 100644
--- a/boards/arm/pinnacle_100_dvk/doc/index.rst
+++ b/boards/arm/pinnacle_100_dvk/doc/index.rst
@@ -50,7 +50,6 @@ and the following devices:
 * :abbr:`HL7800 (Sierra Wireless HL7800 LTE-M1/NB-IoT modem)`
 
 .. figure:: img/pinnacle_100_dvk.jpg
-     :width: 1000px
      :align: center
      :alt: Pinnacle 100 DVK
 
diff --git a/boards/arm/quick_feather/doc/img/feather-board.jpg b/boards/arm/quick_feather/doc/img/feather-board.jpg
new file mode 100644
index 00000000000..34a568e94bf
Binary files /dev/null and b/boards/arm/quick_feather/doc/img/feather-board.jpg differ
diff --git a/boards/arm/quick_feather/doc/img/feather-board.png b/boards/arm/quick_feather/doc/img/feather-board.png
deleted file mode 100644
index cd821341941..00000000000
Binary files a/boards/arm/quick_feather/doc/img/feather-board.png and /dev/null differ
diff --git a/boards/arm/quick_feather/doc/index.rst b/boards/arm/quick_feather/doc/index.rst
index 92ca212f332..dd79c8c8f74 100644
--- a/boards/arm/quick_feather/doc/index.rst
+++ b/boards/arm/quick_feather/doc/index.rst
@@ -10,8 +10,7 @@ The QuickFeather development board is a platform with an on-board QuickLogic
 EOS S3 Sensor Processing Platform.
 
 
-.. figure:: img/feather-board.png
-   :width: 500px
+.. figure:: img/feather-board.jpg
    :align: center
    :alt: QuickFeather
 
diff --git a/boards/arm/rak4631_nrf52840/doc/img/rak4631-front-parts.jpg b/boards/arm/rak4631_nrf52840/doc/img/rak4631-front-parts.jpg
index 4ee9193bad5..21d882536e6 100644
Binary files a/boards/arm/rak4631_nrf52840/doc/img/rak4631-front-parts.jpg and b/boards/arm/rak4631_nrf52840/doc/img/rak4631-front-parts.jpg differ
diff --git a/boards/arm/rak4631_nrf52840/doc/index.rst b/boards/arm/rak4631_nrf52840/doc/index.rst
index 63b330e68b8..e25593816d5 100644
--- a/boards/arm/rak4631_nrf52840/doc/index.rst
+++ b/boards/arm/rak4631_nrf52840/doc/index.rst
@@ -17,7 +17,6 @@ power communication solution. RAK4631 can be comfortably
 programmed with ZephyrRTOS.
 
 .. image:: img/rak4631-front-parts.jpg
-     :width: 500px
      :align: center
      :alt: RAK4631-NRF52840
 
diff --git a/boards/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpeg b/boards/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpeg
deleted file mode 100644
index 62b7e283ebe..00000000000
Binary files a/boards/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpeg and /dev/null differ
diff --git a/boards/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpg b/boards/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpg
new file mode 100644
index 00000000000..f61be06f19c
Binary files /dev/null and b/boards/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpg differ
diff --git a/boards/arm/rak5010_nrf52840/doc/index.rst b/boards/arm/rak5010_nrf52840/doc/index.rst
index 1e81e3c38c4..9ca09035d00 100644
--- a/boards/arm/rak5010_nrf52840/doc/index.rst
+++ b/boards/arm/rak5010_nrf52840/doc/index.rst
@@ -24,8 +24,7 @@ quick testing and prototyping tool for applications
 requiring NB-IoT connectivity. Application development
 supports the GCC environment.
 
-.. image:: img/rak5010-front-parts.jpeg
-     :width: 500px
+.. image:: img/rak5010-front-parts.jpg
      :align: center
      :alt: RAK5010-NRF52840
 
diff --git a/boards/arm/rcar_h3_salvatorx/doc/img/r-car-h3-salvator-x-connections.jpg b/boards/arm/rcar_h3_salvatorx/doc/img/r-car-h3-salvator-x-connections.jpg
index 8916127a5a8..c85ed1908df 100644
Binary files a/boards/arm/rcar_h3_salvatorx/doc/img/r-car-h3-salvator-x-connections.jpg and b/boards/arm/rcar_h3_salvatorx/doc/img/r-car-h3-salvator-x-connections.jpg differ
diff --git a/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_features.jpg b/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_features.jpg
index 330b279e6b7..3f788baf486 100644
Binary files a/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_features.jpg and b/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_features.jpg differ
diff --git a/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_salvatorx.jpg b/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_salvatorx.jpg
index 002a774fcc5..31b725981ff 100644
Binary files a/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_salvatorx.jpg and b/boards/arm/rcar_h3_salvatorx/doc/img/rcar_h3_salvatorx.jpg differ
diff --git a/boards/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst b/boards/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst
index 391b3bba0f2..d3b9b292867 100644
--- a/boards/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst
+++ b/boards/arm/rcar_h3_salvatorx/doc/rcar_h3_salvatorx.rst
@@ -15,9 +15,7 @@ Overview
   via 440pin connector on bottom side.
 
 .. figure:: img/rcar_h3_salvatorx.jpg
-   :width: 460px
    :align: center
-   :height: 288px
    :alt: R-Car Salvator-X kit
 
 More information about the board can be found at `Renesas R-Car Development Support website`_.
@@ -29,9 +27,7 @@ Hardware capabilities for the H3 Salvator-X for can be found on the `eLinux H3 S
 of the board.
 
 .. figure:: img/rcar_h3_features.jpg
-   :width: 286px
    :align: center
-   :height: 280px
    :alt: R-Car Salvator-X features
 
 .. note:: Zephyr will be booted on the CR7 processor provided for RTOS purpose.
diff --git a/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_features.jpg b/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_features.jpg
index 330b279e6b7..3f788baf486 100644
Binary files a/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_features.jpg and b/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_features.jpg differ
diff --git a/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg b/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg
index a9b6411076c..84c60727810 100644
Binary files a/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg and b/boards/arm/rcar_h3ulcb/doc/img/rcar_h3ulcb_starter_kit.jpg differ
diff --git a/boards/arm/rcar_h3ulcb/doc/rcar_h3ulcb.rst b/boards/arm/rcar_h3ulcb/doc/rcar_h3ulcb.rst
index f196e8e7cd9..5705248f15b 100644
--- a/boards/arm/rcar_h3ulcb/doc/rcar_h3ulcb.rst
+++ b/boards/arm/rcar_h3ulcb/doc/rcar_h3ulcb.rst
@@ -12,9 +12,7 @@ Overview
 It is possible to order 2 different types of H3 Starter Kit Boards, one with Ethernet connection onboard and one with Ethernet connection on ComExpress.
 
 .. figure:: img/rcar_h3ulcb_starter_kit.jpg
-   :width: 460px
    :align: center
-   :height: 288px
    :alt: R-Car starter kit
 
 .. note:: The H3ULCB board can be plugged on a Renesas Kingfisher Infotainment daughter board through COM Express connector in order to physically access more I/O. CAUTION: In this case, power supply is managed by the daughter board.
@@ -27,9 +25,7 @@ Hardware
 Hardware capabilities for the H3ULCB for can be found on the `eLinux H3SK page`_ of the board.
 
 .. figure:: img/rcar_h3ulcb_features.jpg
-   :width: 286px
    :align: center
-   :height: 280px
    :alt: R-Car starter kit features
 
 .. note:: Zephyr will be booted on the CR7 processor provided for RTOS purpose.
diff --git a/boards/arm/rddrone_fmuk66/doc/index.rst b/boards/arm/rddrone_fmuk66/doc/index.rst
index 78385d5ad1b..7c348cc6e97 100644
--- a/boards/arm/rddrone_fmuk66/doc/index.rst
+++ b/boards/arm/rddrone_fmuk66/doc/index.rst
@@ -11,8 +11,7 @@ connectors and a Kinetis K66 on board.
 
 - Comes with a J-Link Edu Mini for programming and UART console.
 
-.. image:: ./rddrone_fmuk66.jpg
-   :width: 720px
+.. image:: rddrone_fmuk66.jpg
    :align: center
    :alt: RDDRONE-FMUK66
 
diff --git a/boards/arm/rddrone_fmuk66/doc/rddrone_fmuk66.jpg b/boards/arm/rddrone_fmuk66/doc/rddrone_fmuk66.jpg
index 9e6f68fc8e3..9afcb929224 100644
Binary files a/boards/arm/rddrone_fmuk66/doc/rddrone_fmuk66.jpg and b/boards/arm/rddrone_fmuk66/doc/rddrone_fmuk66.jpg differ
diff --git a/boards/arm/reel_board/doc/img/link_board_base.jpg b/boards/arm/reel_board/doc/img/link_board_base.jpg
new file mode 100644
index 00000000000..b458e7a35b3
Binary files /dev/null and b/boards/arm/reel_board/doc/img/link_board_base.jpg differ
diff --git a/boards/arm/reel_board/doc/img/link_board_base.png b/boards/arm/reel_board/doc/img/link_board_base.png
deleted file mode 100644
index 183a38e3acf..00000000000
Binary files a/boards/arm/reel_board/doc/img/link_board_base.png and /dev/null differ
diff --git a/boards/arm/reel_board/doc/img/rb_lb_shield.jpg b/boards/arm/reel_board/doc/img/rb_lb_shield.jpg
new file mode 100644
index 00000000000..959e257076b
Binary files /dev/null and b/boards/arm/reel_board/doc/img/rb_lb_shield.jpg differ
diff --git a/boards/arm/reel_board/doc/img/rb_lb_shield.png b/boards/arm/reel_board/doc/img/rb_lb_shield.png
deleted file mode 100644
index 4380df8d49c..00000000000
Binary files a/boards/arm/reel_board/doc/img/rb_lb_shield.png and /dev/null differ
diff --git a/boards/arm/reel_board/doc/img/reel_board.jpg b/boards/arm/reel_board/doc/img/reel_board.jpg
new file mode 100644
index 00000000000..e7628e56588
Binary files /dev/null and b/boards/arm/reel_board/doc/img/reel_board.jpg differ
diff --git a/boards/arm/reel_board/doc/img/reel_board.png b/boards/arm/reel_board/doc/img/reel_board.png
deleted file mode 100644
index cffa9e306bf..00000000000
Binary files a/boards/arm/reel_board/doc/img/reel_board.png and /dev/null differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_debug.jpg b/boards/arm/reel_board/doc/img/reel_board_debug.jpg
new file mode 100644
index 00000000000..a17516561f2
Binary files /dev/null and b/boards/arm/reel_board/doc/img/reel_board_debug.jpg differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_debug.png b/boards/arm/reel_board/doc/img/reel_board_debug.png
deleted file mode 100644
index 069af7bfda3..00000000000
Binary files a/boards/arm/reel_board/doc/img/reel_board_debug.png and /dev/null differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_descr_back.jpg b/boards/arm/reel_board/doc/img/reel_board_descr_back.jpg
new file mode 100644
index 00000000000..697e2be2fe3
Binary files /dev/null and b/boards/arm/reel_board/doc/img/reel_board_descr_back.jpg differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_descr_back.png b/boards/arm/reel_board/doc/img/reel_board_descr_back.png
deleted file mode 100644
index 3ec24848f78..00000000000
Binary files a/boards/arm/reel_board/doc/img/reel_board_descr_back.png and /dev/null differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_excon.jpg b/boards/arm/reel_board/doc/img/reel_board_excon.jpg
new file mode 100644
index 00000000000..cbe102a1a58
Binary files /dev/null and b/boards/arm/reel_board/doc/img/reel_board_excon.jpg differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_excon.png b/boards/arm/reel_board/doc/img/reel_board_excon.png
deleted file mode 100644
index eeaa5b8d58f..00000000000
Binary files a/boards/arm/reel_board/doc/img/reel_board_excon.png and /dev/null differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_tp.jpg b/boards/arm/reel_board/doc/img/reel_board_tp.jpg
new file mode 100644
index 00000000000..98faeee0b31
Binary files /dev/null and b/boards/arm/reel_board/doc/img/reel_board_tp.jpg differ
diff --git a/boards/arm/reel_board/doc/img/reel_board_tp.png b/boards/arm/reel_board/doc/img/reel_board_tp.png
deleted file mode 100644
index 81dfdc96528..00000000000
Binary files a/boards/arm/reel_board/doc/img/reel_board_tp.png and /dev/null differ
diff --git a/boards/arm/reel_board/doc/index.rst b/boards/arm/reel_board/doc/index.rst
index 0ecc004c62e..2dfe60ffeff 100644
--- a/boards/arm/reel_board/doc/index.rst
+++ b/boards/arm/reel_board/doc/index.rst
@@ -48,15 +48,13 @@ MMA8652FC is a 12-bit Digital Accelerometer.
 All sensors are connected to the I2C bus and one GPIO pin each,
 which can be used as an interrupt source.
 
-.. figure:: img/reel_board.png
-     :width: 442px
+.. figure:: img/reel_board.jpg
      :align: center
      :alt: reel board front
 
      reel board front (Credit: PHYTEC)
 
-.. figure:: img/reel_board_descr_back.png
-     :width: 442px
+.. figure:: img/reel_board_descr_back.jpg
      :align: center
      :alt: reel board back
 
@@ -268,8 +266,7 @@ There are several labeled solder jumpers on the board.
 These can be used to connect a logic analyzer to check the behavior of a
 driver or to measure the voltage of a signal.
 
-.. figure:: img/reel_board_tp.png
-     :width: 442px
+.. figure:: img/reel_board_tp.jpg
      :align: center
      :alt: reel board Jumper and Testpoints
 
@@ -338,8 +335,7 @@ reel board can be flashed and debugged, powered either from battery or USB.
 If the Adapter is powered via USB, the Adapter circuit heats the board
 slightly and the temperature sensor can output values up to 1.5 degrees higher.
 
-.. figure:: img/reel_board_debug.png
-     :width: 442px
+.. figure:: img/reel_board_debug.jpg
      :align: center
      :alt: reel board Debug Adapter
 
@@ -387,8 +383,7 @@ The expansion connector has the same dimensions and similar pinout
 as the BBC MicroBit edge connector. The expansion components that are
 designed especially for the reel board are called link boards.
 
-.. figure:: img/reel_board_excon.png
-     :width: 442px
+.. figure:: img/reel_board_excon.jpg
      :align: center
      :alt: reel board Expansion Connector
 
@@ -402,8 +397,7 @@ third party shields in Arduino UNO R3 format to be connected to the reel board.
 In addition, it includes a NOTM.2 connector and more powerful DCDC converter
 then reel board.
 
-.. figure:: img/rb_lb_shield.png
-     :width: 442px
+.. figure:: img/rb_lb_shield.jpg
      :align: center
      :alt: reel board and link board BASE
 
@@ -429,8 +423,7 @@ third party shields in two ways:
         power provided by the reel board is not enough,
         or for prototypes in the field.
 
-.. figure:: img/link_board_base.png
-     :width: 442px
+.. figure:: img/link_board_base.jpg
      :align: center
      :alt: link board BASE
 
diff --git a/boards/arm/rm1xx_dvk/doc/img/RM186-DVK.jpg b/boards/arm/rm1xx_dvk/doc/img/RM186-DVK.jpg
new file mode 100644
index 00000000000..2f01f08359d
Binary files /dev/null and b/boards/arm/rm1xx_dvk/doc/img/RM186-DVK.jpg differ
diff --git a/boards/arm/rm1xx_dvk/doc/img/RM186-DVK.png b/boards/arm/rm1xx_dvk/doc/img/RM186-DVK.png
deleted file mode 100644
index ae0f3ebd82b..00000000000
Binary files a/boards/arm/rm1xx_dvk/doc/img/RM186-DVK.png and /dev/null differ
diff --git a/boards/arm/rm1xx_dvk/doc/img/RM186-SM.jpg b/boards/arm/rm1xx_dvk/doc/img/RM186-SM.jpg
index 73e4a6be9fe..bf47036d864 100644
Binary files a/boards/arm/rm1xx_dvk/doc/img/RM186-SM.jpg and b/boards/arm/rm1xx_dvk/doc/img/RM186-SM.jpg differ
diff --git a/boards/arm/rm1xx_dvk/doc/index.rst b/boards/arm/rm1xx_dvk/doc/index.rst
index 1cef6fdf07d..694ec3719e5 100644
--- a/boards/arm/rm1xx_dvk/doc/index.rst
+++ b/boards/arm/rm1xx_dvk/doc/index.rst
@@ -28,15 +28,13 @@ This development kit has the following features:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/RM186-DVK.png
-     :width: 500px
+.. figure:: img/RM186-DVK.jpg
      :align: center
      :alt: RM1xx development kit (DVK)
 
      RM1xx development kit (DVK) (Credit: Laird Connectivity)
 
 .. figure:: img/RM186-SM.jpg
-     :width: 185px
      :align: center
      :alt: RM1xx module
 
diff --git a/boards/arm/ronoth_lodev/doc/img/acsip_s76s.jpg b/boards/arm/ronoth_lodev/doc/img/acsip_s76s.jpg
new file mode 100644
index 00000000000..b12bdb711ac
Binary files /dev/null and b/boards/arm/ronoth_lodev/doc/img/acsip_s76s.jpg differ
diff --git a/boards/arm/ronoth_lodev/doc/img/acsip_s76s.png b/boards/arm/ronoth_lodev/doc/img/acsip_s76s.png
deleted file mode 100644
index c2f6af822fa..00000000000
Binary files a/boards/arm/ronoth_lodev/doc/img/acsip_s76s.png and /dev/null differ
diff --git a/boards/arm/ronoth_lodev/doc/img/lodev.jpg b/boards/arm/ronoth_lodev/doc/img/lodev.jpg
new file mode 100644
index 00000000000..4c6031c5670
Binary files /dev/null and b/boards/arm/ronoth_lodev/doc/img/lodev.jpg differ
diff --git a/boards/arm/ronoth_lodev/doc/img/lodev.png b/boards/arm/ronoth_lodev/doc/img/lodev.png
deleted file mode 100644
index 9096909f3df..00000000000
Binary files a/boards/arm/ronoth_lodev/doc/img/lodev.png and /dev/null differ
diff --git a/boards/arm/ronoth_lodev/doc/img/pinout.jpg b/boards/arm/ronoth_lodev/doc/img/pinout.jpg
new file mode 100644
index 00000000000..06032b737de
Binary files /dev/null and b/boards/arm/ronoth_lodev/doc/img/pinout.jpg differ
diff --git a/boards/arm/ronoth_lodev/doc/img/pinout.png b/boards/arm/ronoth_lodev/doc/img/pinout.png
deleted file mode 100644
index 58ccd3da685..00000000000
Binary files a/boards/arm/ronoth_lodev/doc/img/pinout.png and /dev/null differ
diff --git a/boards/arm/ronoth_lodev/doc/index.rst b/boards/arm/ronoth_lodev/doc/index.rst
index 4ca8165ec9b..7866dc1dafd 100644
--- a/boards/arm/ronoth_lodev/doc/index.rst
+++ b/boards/arm/ronoth_lodev/doc/index.rst
@@ -16,10 +16,8 @@ and a +20 dBm power amplifier.  Refer to `AcSIP S76S Product Information Brief`_
 
 Zephyr applications may use the **ronoth_lodev** configuration to run on this board.
 
-.. figure:: img/lodev.png
-     :width: 291px
+.. figure:: img/lodev.jpg
      :align: center
-     :height: 217px
      :alt: Image of Ronoth LoDev open source development board containing S76S system on a chip
 
      Ronoth LoDev
@@ -55,8 +53,7 @@ PA9 and PA10 are unavailable for I/Os.
 
 A helpful silkscreen legend is provided on the board.
 
-.. figure:: img/pinout.png
-     :width: 600px
+.. figure:: img/pinout.jpg
      :align: center
      :alt: Ronoth LoDev sketch with pinout
 
diff --git a/boards/arm/ronoth_lodev/doc/s76s.rst b/boards/arm/ronoth_lodev/doc/s76s.rst
index f731242bedc..998a6f0052f 100644
--- a/boards/arm/ronoth_lodev/doc/s76s.rst
+++ b/boards/arm/ronoth_lodev/doc/s76s.rst
@@ -14,10 +14,8 @@ from the `AcSIP Product Data Download`_ site (may need login). The parts are `av
 
 Zephyr applications may use the **acsip_s76s** configuration to use this SiP.
 
-.. figure:: img/acsip_s76s.png
-     :width: 189px
+.. figure:: img/acsip_s76s.jpg
      :align: center
-     :height: 115px
      :alt: AcSIP S76S system on a chip, containing STMicro STM32L073RZ and Semtech SX1276
 
      AcSIP S76S
diff --git a/boards/arm/rpi_pico/doc/img/rpi_pico.jpg b/boards/arm/rpi_pico/doc/img/rpi_pico.jpg
new file mode 100644
index 00000000000..4fadbe158fe
Binary files /dev/null and b/boards/arm/rpi_pico/doc/img/rpi_pico.jpg differ
diff --git a/boards/arm/rpi_pico/doc/img/rpi_pico.png b/boards/arm/rpi_pico/doc/img/rpi_pico.png
deleted file mode 100644
index 0b223bb334b..00000000000
Binary files a/boards/arm/rpi_pico/doc/img/rpi_pico.png and /dev/null differ
diff --git a/boards/arm/rpi_pico/doc/index.rst b/boards/arm/rpi_pico/doc/index.rst
index 60fa7816fab..4d629fa313a 100644
--- a/boards/arm/rpi_pico/doc/index.rst
+++ b/boards/arm/rpi_pico/doc/index.rst
@@ -30,8 +30,7 @@ Hardware
 - 1 Watchdog timer peripheral
 
 
-.. figure:: img/rpi_pico.png
-     :width: 150px
+.. figure:: img/rpi_pico.jpg
      :align: center
      :alt: Raspberry Pi Pico
 
diff --git a/boards/arm/ruuvi_ruuvitag/doc/img/pinout.jpg b/boards/arm/ruuvi_ruuvitag/doc/img/pinout.jpg
index 43e13227471..c1b06ee34be 100644
Binary files a/boards/arm/ruuvi_ruuvitag/doc/img/pinout.jpg and b/boards/arm/ruuvi_ruuvitag/doc/img/pinout.jpg differ
diff --git a/boards/arm/ruuvi_ruuvitag/doc/img/ruuvitag.jpg b/boards/arm/ruuvi_ruuvitag/doc/img/ruuvitag.jpg
index ced2abf8f21..db8264fbb77 100644
Binary files a/boards/arm/ruuvi_ruuvitag/doc/img/ruuvitag.jpg and b/boards/arm/ruuvi_ruuvitag/doc/img/ruuvitag.jpg differ
diff --git a/boards/arm/ruuvi_ruuvitag/doc/index.rst b/boards/arm/ruuvi_ruuvitag/doc/index.rst
index 85f41df79b0..9e827c0941b 100644
--- a/boards/arm/ruuvi_ruuvitag/doc/index.rst
+++ b/boards/arm/ruuvi_ruuvitag/doc/index.rst
@@ -11,7 +11,6 @@ enabled sensor beacon platform capable of sending temperature, humidity,
 pressure, and motion information over Bluetooth Low Energy.
 
 .. figure:: img/ruuvitag.jpg
-     :width: 442px
      :align: center
      :alt: RUUVI RuuviTag
 
@@ -89,7 +88,6 @@ Pin descriptions
 ----------------
 
 .. figure:: img/pinout.jpg
-     :width: 442px
      :align: center
      :alt: RUUVI Pinout
 
diff --git a/boards/arm/sam4e_xpro/doc/img/sam4e_xpro.jpg b/boards/arm/sam4e_xpro/doc/img/sam4e_xpro.jpg
index 30a5450bd2d..661ead46fd5 100644
Binary files a/boards/arm/sam4e_xpro/doc/img/sam4e_xpro.jpg and b/boards/arm/sam4e_xpro/doc/img/sam4e_xpro.jpg differ
diff --git a/boards/arm/sam4e_xpro/doc/index.rst b/boards/arm/sam4e_xpro/doc/index.rst
index 8dadd1d8b72..e4fac875d7b 100644
--- a/boards/arm/sam4e_xpro/doc/index.rst
+++ b/boards/arm/sam4e_xpro/doc/index.rst
@@ -10,7 +10,6 @@ The SAM4E Xplained Pro evaluation kit is a development platform to evaluate the
 Atmel SAM4E series microcontrollers.
 
 .. image:: img/sam4e_xpro.jpg
-     :width: 500px
      :align: center
      :alt: SAM4E Xplained Pro
 
diff --git a/boards/arm/sam4l_ek/doc/img/atmel-sam4l-ek-callouts.jpeg b/boards/arm/sam4l_ek/doc/img/atmel-sam4l-ek-callouts.jpeg
deleted file mode 100644
index 9cd04e49a29..00000000000
Binary files a/boards/arm/sam4l_ek/doc/img/atmel-sam4l-ek-callouts.jpeg and /dev/null differ
diff --git a/boards/arm/sam4l_ek/doc/img/atmel-sam4l-ek-callouts.jpg b/boards/arm/sam4l_ek/doc/img/atmel-sam4l-ek-callouts.jpg
new file mode 100644
index 00000000000..2a5e0dd694b
Binary files /dev/null and b/boards/arm/sam4l_ek/doc/img/atmel-sam4l-ek-callouts.jpg differ
diff --git a/boards/arm/sam4l_ek/doc/index.rst b/boards/arm/sam4l_ek/doc/index.rst
index 6bc5e39900e..ee5d7120171 100644
--- a/boards/arm/sam4l_ek/doc/index.rst
+++ b/boards/arm/sam4l_ek/doc/index.rst
@@ -22,8 +22,7 @@ The kit is equipped with a rich set of peripherals that make the ATSAM4L-EK a
 perfect evaluation platform.  Download the `SAM4L-EK Online User Guide`_ for
 more details.
 
-.. image:: img/atmel-sam4l-ek-callouts.jpeg
-     :width: 500px
+.. image:: img/atmel-sam4l-ek-callouts.jpg
      :align: center
      :alt: SAM4L-EK
 
diff --git a/boards/arm/sam4s_xplained/doc/img/sam4s_xplained.jpg b/boards/arm/sam4s_xplained/doc/img/sam4s_xplained.jpg
new file mode 100644
index 00000000000..a558742a67b
Binary files /dev/null and b/boards/arm/sam4s_xplained/doc/img/sam4s_xplained.jpg differ
diff --git a/boards/arm/sam4s_xplained/doc/img/sam4s_xplained.png b/boards/arm/sam4s_xplained/doc/img/sam4s_xplained.png
deleted file mode 100644
index bdc8048532d..00000000000
Binary files a/boards/arm/sam4s_xplained/doc/img/sam4s_xplained.png and /dev/null differ
diff --git a/boards/arm/sam4s_xplained/doc/index.rst b/boards/arm/sam4s_xplained/doc/index.rst
index dd1b7d647de..b84fd85e7a8 100644
--- a/boards/arm/sam4s_xplained/doc/index.rst
+++ b/boards/arm/sam4s_xplained/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The SAM4S Xplained evaluation kit is a development platform to evaluate the
 Atmel SAM4S series microcontrollers.
 
-.. image:: img/sam4s_xplained.png
-     :width: 500px
+.. image:: img/sam4s_xplained.jpg
      :align: center
      :alt: SAM4S Xplained
 
diff --git a/boards/arm/sam_e70_xplained/doc/img/sam_e70_xplained.jpg b/boards/arm/sam_e70_xplained/doc/img/sam_e70_xplained.jpg
new file mode 100644
index 00000000000..dbc80a6381c
Binary files /dev/null and b/boards/arm/sam_e70_xplained/doc/img/sam_e70_xplained.jpg differ
diff --git a/boards/arm/sam_e70_xplained/doc/img/sam_e70_xplained.png b/boards/arm/sam_e70_xplained/doc/img/sam_e70_xplained.png
deleted file mode 100644
index 519df522afc..00000000000
Binary files a/boards/arm/sam_e70_xplained/doc/img/sam_e70_xplained.png and /dev/null differ
diff --git a/boards/arm/sam_e70_xplained/doc/index.rst b/boards/arm/sam_e70_xplained/doc/index.rst
index c8d5e087ca3..7a71c3a4b44 100644
--- a/boards/arm/sam_e70_xplained/doc/index.rst
+++ b/boards/arm/sam_e70_xplained/doc/index.rst
@@ -10,8 +10,7 @@ The SAM E70 Xplained evaluation kit is a development platform to evaluate the
 Atmel SAM E70 series microcontrollers. The current version allows to use both
 IC variations ATSAME70Q21A(B).
 
-.. image:: img/sam_e70_xplained.png
-     :width: 500px
+.. image:: img/sam_e70_xplained.jpg
      :align: center
      :alt: SAM E70 Xplained
 
diff --git a/boards/arm/sam_v71_xult/doc/img/sam_v71_xult.jpg b/boards/arm/sam_v71_xult/doc/img/sam_v71_xult.jpg
index cee4255e6b4..f9c94f175cc 100644
Binary files a/boards/arm/sam_v71_xult/doc/img/sam_v71_xult.jpg and b/boards/arm/sam_v71_xult/doc/img/sam_v71_xult.jpg differ
diff --git a/boards/arm/sam_v71_xult/doc/index.rst b/boards/arm/sam_v71_xult/doc/index.rst
index ae58e0a21ce..9875de9cb93 100644
--- a/boards/arm/sam_v71_xult/doc/index.rst
+++ b/boards/arm/sam_v71_xult/doc/index.rst
@@ -11,7 +11,6 @@ evaluate the Atmel SAM V71 series microcontrollers. The current version
 allows to use both IC variations ATSAMV71Q21A(B).
 
 .. image:: img/sam_v71_xult.jpg
-     :width: 500px
      :align: center
      :alt: SAM V71 Xplained Ultra
 
diff --git a/boards/arm/scobc_module1/doc/index.rst b/boards/arm/scobc_module1/doc/index.rst
index ac7ad48d95a..fd6f82e0b8e 100644
--- a/boards/arm/scobc_module1/doc/index.rst
+++ b/boards/arm/scobc_module1/doc/index.rst
@@ -10,8 +10,7 @@ Overview
 especially for 3U CubeSats.  The board is based on Xilinx Artix-7 FPGA and
 implements ARM Cortex M3 as the main CPU.
 
-.. figure:: ./scobc.jpg
-   :width: 442px
+.. figure:: scobc.jpg
    :align: center
    :alt: Space Cubics OBC module 1
 
diff --git a/boards/arm/scobc_module1/doc/scobc.jpg b/boards/arm/scobc_module1/doc/scobc.jpg
index 95b6f409318..6b70c0e8b38 100644
Binary files a/boards/arm/scobc_module1/doc/scobc.jpg and b/boards/arm/scobc_module1/doc/scobc.jpg differ
diff --git a/boards/arm/seeeduino_xiao/doc/img/seeeduino_xiao.jpg b/boards/arm/seeeduino_xiao/doc/img/seeeduino_xiao.jpg
new file mode 100644
index 00000000000..3b715c66929
Binary files /dev/null and b/boards/arm/seeeduino_xiao/doc/img/seeeduino_xiao.jpg differ
diff --git a/boards/arm/seeeduino_xiao/doc/img/seeeduino_xiao.png b/boards/arm/seeeduino_xiao/doc/img/seeeduino_xiao.png
deleted file mode 100644
index 910a9f08a3b..00000000000
Binary files a/boards/arm/seeeduino_xiao/doc/img/seeeduino_xiao.png and /dev/null differ
diff --git a/boards/arm/seeeduino_xiao/doc/index.rst b/boards/arm/seeeduino_xiao/doc/index.rst
index 8b0c48e4e68..d94473e3f65 100644
--- a/boards/arm/seeeduino_xiao/doc/index.rst
+++ b/boards/arm/seeeduino_xiao/doc/index.rst
@@ -10,8 +10,7 @@ The Seeeduino XIAO is a tiny (20 mm x 17.5 mm) ARM development
 board with onboard LEDs, USB port, and range of I/O broken out
 onto 14 pins.
 
-.. image:: img/seeeduino_xiao.png
-     :width: 500px
+.. image:: img/seeeduino_xiao.jpg
      :align: center
      :alt: Seeeduino XIAO
 
diff --git a/boards/arm/segger_trb_stm32f407/doc/img/segger_trb_stm32f407.jpg b/boards/arm/segger_trb_stm32f407/doc/img/segger_trb_stm32f407.jpg
new file mode 100644
index 00000000000..239cda718d3
Binary files /dev/null and b/boards/arm/segger_trb_stm32f407/doc/img/segger_trb_stm32f407.jpg differ
diff --git a/boards/arm/segger_trb_stm32f407/doc/img/segger_trb_stm32f407.png b/boards/arm/segger_trb_stm32f407/doc/img/segger_trb_stm32f407.png
deleted file mode 100644
index 4d026b1dfd7..00000000000
Binary files a/boards/arm/segger_trb_stm32f407/doc/img/segger_trb_stm32f407.png and /dev/null differ
diff --git a/boards/arm/segger_trb_stm32f407/doc/index.rst b/boards/arm/segger_trb_stm32f407/doc/index.rst
index 6b240b247a7..83fb6924e7a 100644
--- a/boards/arm/segger_trb_stm32f407/doc/index.rst
+++ b/boards/arm/segger_trb_stm32f407/doc/index.rst
@@ -12,10 +12,8 @@ ARM Cortex-M4 CPU, to test hardware tracing with the SEGGER Trace-Pro
 debuggers. It is not meant for general prototype development because
 it is extremely limited when it comes to IO, and only has 3 LEDs.
 
-.. figure:: img/segger_trb_stm32f407.png
-     :width: 500px
+.. figure:: img/segger_trb_stm32f407.jpg
      :align: center
-     :height: 365px
      :alt: SEGGER-TRB-STM32F407
 
      SEGGER-TRB-STM32F407
diff --git a/boards/arm/sensortile_box/doc/img/sensortile_box.jpg b/boards/arm/sensortile_box/doc/img/sensortile_box.jpg
index 7291f51ce67..56f1bc7d939 100644
Binary files a/boards/arm/sensortile_box/doc/img/sensortile_box.jpg and b/boards/arm/sensortile_box/doc/img/sensortile_box.jpg differ
diff --git a/boards/arm/sensortile_box/doc/index.rst b/boards/arm/sensortile_box/doc/index.rst
index 77071ff483e..a6cabf9b359 100644
--- a/boards/arm/sensortile_box/doc/index.rst
+++ b/boards/arm/sensortile_box/doc/index.rst
@@ -14,9 +14,7 @@ battery, and communicates with a standard smartphone through its Bluetooth inter
 providing data coming from the sensors.
 
 .. image:: img/sensortile_box.jpg
-     :width: 784px
      :align: center
-     :height: 643px
      :alt: SensorTile.box
 
 More information about the board can be found at the `SensorTile.box website`_.
diff --git a/boards/arm/serpente/doc/img/serpente.jpg b/boards/arm/serpente/doc/img/serpente.jpg
index e2cd4b52304..62cb6a0596d 100644
Binary files a/boards/arm/serpente/doc/img/serpente.jpg and b/boards/arm/serpente/doc/img/serpente.jpg differ
diff --git a/boards/arm/serpente/doc/index.rst b/boards/arm/serpente/doc/index.rst
index 29a9475055c..79e014898bb 100644
--- a/boards/arm/serpente/doc/index.rst
+++ b/boards/arm/serpente/doc/index.rst
@@ -12,7 +12,6 @@ The board comes with 3 different USB connector options: USB Type-C plug,
 USB Type-C socket and USB Type-A plug.
 
 .. image:: img/serpente.jpg
-     :width: 640px
      :align: center
      :alt: Serpente Boards
 
diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/doc/img/sparkfun_thing_plus_nrf9160.jpeg b/boards/arm/sparkfun_thing_plus_nrf9160/doc/img/sparkfun_thing_plus_nrf9160.jpeg
deleted file mode 100644
index 268b9983bbf..00000000000
Binary files a/boards/arm/sparkfun_thing_plus_nrf9160/doc/img/sparkfun_thing_plus_nrf9160.jpeg and /dev/null differ
diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/doc/img/sparkfun_thing_plus_nrf9160.jpg b/boards/arm/sparkfun_thing_plus_nrf9160/doc/img/sparkfun_thing_plus_nrf9160.jpg
new file mode 100644
index 00000000000..9a660ea0d56
Binary files /dev/null and b/boards/arm/sparkfun_thing_plus_nrf9160/doc/img/sparkfun_thing_plus_nrf9160.jpg differ
diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/doc/index.rst b/boards/arm/sparkfun_thing_plus_nrf9160/doc/index.rst
index 5c828299dc1..6e89811a5af 100644
--- a/boards/arm/sparkfun_thing_plus_nrf9160/doc/index.rst
+++ b/boards/arm/sparkfun_thing_plus_nrf9160/doc/index.rst
@@ -3,8 +3,7 @@
 nRF9160 Thing Plus
 ##################
 
-.. figure:: img/sparkfun_thing_plus_nrf9160.jpeg
-     :width: 600px
+.. figure:: img/sparkfun_thing_plus_nrf9160.jpg
      :align: center
      :alt: Sparkfun nRF9160 Thing Plus
 
diff --git a/boards/arm/steval_fcu001v1/doc/img/steval_fcu001v1.jpg b/boards/arm/steval_fcu001v1/doc/img/steval_fcu001v1.jpg
index 90d92506784..f12c8d55bc7 100644
Binary files a/boards/arm/steval_fcu001v1/doc/img/steval_fcu001v1.jpg and b/boards/arm/steval_fcu001v1/doc/img/steval_fcu001v1.jpg differ
diff --git a/boards/arm/steval_fcu001v1/doc/index.rst b/boards/arm/steval_fcu001v1/doc/index.rst
index 3c9a869d71f..f28685e7fa9 100644
--- a/boards/arm/steval_fcu001v1/doc/index.rst
+++ b/boards/arm/steval_fcu001v1/doc/index.rst
@@ -9,9 +9,7 @@ Overview
 The STEVAL-FCU001V1 is a Cortex M4 MCU-based flight controller unit for toy quad-copter drones.
 
 .. figure:: img/steval_fcu001v1.jpg
-     :width: 753px
      :align: center
-     :height: 699px
      :alt: STM32 Flight Controller Unit
 
 Hardware
diff --git a/boards/arm/stm3210c_eval/doc/img/stm3210c_eval.jpg b/boards/arm/stm3210c_eval/doc/img/stm3210c_eval.jpg
index 2ee9bb69b62..7c5be01bfc6 100644
Binary files a/boards/arm/stm3210c_eval/doc/img/stm3210c_eval.jpg and b/boards/arm/stm3210c_eval/doc/img/stm3210c_eval.jpg differ
diff --git a/boards/arm/stm3210c_eval/doc/img/stm3210c_eval_connectors.jpg b/boards/arm/stm3210c_eval/doc/img/stm3210c_eval_connectors.jpg
new file mode 100644
index 00000000000..acb5e7fe09c
Binary files /dev/null and b/boards/arm/stm3210c_eval/doc/img/stm3210c_eval_connectors.jpg differ
diff --git a/boards/arm/stm3210c_eval/doc/img/stm3210c_eval_connectors.png b/boards/arm/stm3210c_eval/doc/img/stm3210c_eval_connectors.png
deleted file mode 100644
index e370abcbd15..00000000000
Binary files a/boards/arm/stm3210c_eval/doc/img/stm3210c_eval_connectors.png and /dev/null differ
diff --git a/boards/arm/stm3210c_eval/doc/index.rst b/boards/arm/stm3210c_eval/doc/index.rst
index 2b948362585..6ec151a1cec 100644
--- a/boards/arm/stm3210c_eval/doc/index.rst
+++ b/boards/arm/stm3210c_eval/doc/index.rst
@@ -16,8 +16,6 @@ Extension headers make it easy to connect a daughterboard or wrapping board for
 application.
 
 .. image:: img/stm3210c_eval.jpg
-     :width: 660px
-     :height: 792px
      :align: center
      :alt: STM3210C-EVAL
 
@@ -95,9 +93,7 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/stm3210c_eval_connectors.png
-     :width: 966px
-     :height: 1017px
+.. image:: img/stm3210c_eval_connectors.jpg
      :align: center
      :alt: STM3210C_EVAL connectors
 
diff --git a/boards/arm/stm32373c_eval/doc/img/stm32373c_eval.jpg b/boards/arm/stm32373c_eval/doc/img/stm32373c_eval.jpg
index c1bec80a8c2..e497856e962 100644
Binary files a/boards/arm/stm32373c_eval/doc/img/stm32373c_eval.jpg and b/boards/arm/stm32373c_eval/doc/img/stm32373c_eval.jpg differ
diff --git a/boards/arm/stm32373c_eval/doc/img/stm32373c_eval_connectors.jpg b/boards/arm/stm32373c_eval/doc/img/stm32373c_eval_connectors.jpg
new file mode 100644
index 00000000000..7ebe653fd55
Binary files /dev/null and b/boards/arm/stm32373c_eval/doc/img/stm32373c_eval_connectors.jpg differ
diff --git a/boards/arm/stm32373c_eval/doc/img/stm32373c_eval_connectors.png b/boards/arm/stm32373c_eval/doc/img/stm32373c_eval_connectors.png
deleted file mode 100644
index fadb7ed0f9b..00000000000
Binary files a/boards/arm/stm32373c_eval/doc/img/stm32373c_eval_connectors.png and /dev/null differ
diff --git a/boards/arm/stm32373c_eval/doc/index.rst b/boards/arm/stm32373c_eval/doc/index.rst
index 91a8af7fc5d..2f27c57d0d4 100644
--- a/boards/arm/stm32373c_eval/doc/index.rst
+++ b/boards/arm/stm32373c_eval/doc/index.rst
@@ -12,8 +12,6 @@ The full range of hardware features on the board can help the user evaluate all
 Extension headers make it possible to easily connect a daughter board or wrapping board for a specific application.
 
 .. image:: img/stm32373c_eval.jpg
-     :width: 350px
-     :height: 489px
      :align: center
      :alt: STM32373C-EVAL
 
@@ -99,9 +97,7 @@ capable except for analog inputs.
 
 Board connectors:
 -----------------
-.. image:: img/stm32373c_eval_connectors.png
-     :width: 664px
-     :height: 820px
+.. image:: img/stm32373c_eval_connectors.jpg
      :align: center
      :alt: STM32373C_EVAL connectors
 
diff --git a/boards/arm/stm32_min_dev/doc/img/stm32_min_dev.jpg b/boards/arm/stm32_min_dev/doc/img/stm32_min_dev.jpg
index d3f2a1258cf..dedefdd6fd1 100644
Binary files a/boards/arm/stm32_min_dev/doc/img/stm32_min_dev.jpg and b/boards/arm/stm32_min_dev/doc/img/stm32_min_dev.jpg differ
diff --git a/boards/arm/stm32_min_dev/doc/img/stm32_min_dev_pinout_blue.jpg b/boards/arm/stm32_min_dev/doc/img/stm32_min_dev_pinout_blue.jpg
index 5de6708ec3b..f15956686b6 100644
Binary files a/boards/arm/stm32_min_dev/doc/img/stm32_min_dev_pinout_blue.jpg and b/boards/arm/stm32_min_dev/doc/img/stm32_min_dev_pinout_blue.jpg differ
diff --git a/boards/arm/stm32_min_dev/doc/index.rst b/boards/arm/stm32_min_dev/doc/index.rst
index d4f59158dd3..728191c15f0 100644
--- a/boards/arm/stm32_min_dev/doc/index.rst
+++ b/boards/arm/stm32_min_dev/doc/index.rst
@@ -17,9 +17,7 @@ Zephyr applications can use the stm32_min_dev_blue or stm32_min_dev_black board
 configuration to use these boards.
 
 .. figure:: img/stm32_min_dev.jpg
-     :width: 500px
      :align: center
-     :height: 350px
      :alt: STM32 Minimum Development Board
 
      STM32 Minimum Development Board
@@ -47,9 +45,7 @@ The pinout diagram of STM32 Minimum Development Blue Pill board can be seen
 below. The Black Pill's one is similar:
 
 .. figure:: img/stm32_min_dev_pinout_blue.jpg
-     :width: 500px
      :align: center
-     :height: 350px
      :alt: Pinout for STM32 Minimum Development Blue Pill Board
 
      Pinout for STM32 Minimum Development Blue Pill Board
diff --git a/boards/arm/stm32f030_demo/doc/img/stm32f030_demo.jpg b/boards/arm/stm32f030_demo/doc/img/stm32f030_demo.jpg
new file mode 100644
index 00000000000..1f2abcd3257
Binary files /dev/null and b/boards/arm/stm32f030_demo/doc/img/stm32f030_demo.jpg differ
diff --git a/boards/arm/stm32f030_demo/doc/img/stm32f030_demo.png b/boards/arm/stm32f030_demo/doc/img/stm32f030_demo.png
deleted file mode 100644
index 38d549ba501..00000000000
Binary files a/boards/arm/stm32f030_demo/doc/img/stm32f030_demo.png and /dev/null differ
diff --git a/boards/arm/stm32f030_demo/doc/index.rst b/boards/arm/stm32f030_demo/doc/index.rst
index 52899e2d1dc..3c57989be0a 100644
--- a/boards/arm/stm32f030_demo/doc/index.rst
+++ b/boards/arm/stm32f030_demo/doc/index.rst
@@ -11,10 +11,8 @@ that match the SoC's pin names.
 For practical use, you'll need to add additional components
 and circuits using a breadboard, for example.
 
-.. image:: img/stm32f030_demo.png
-   :width: 275px
+.. image:: img/stm32f030_demo.jpg
    :align: center
-   :height: 484px
    :alt: STM32F030 DEMO BOARD
 
 More information about the board can be found at the `stm32-base.org website`_.
diff --git a/boards/arm/stm32f072_eval/doc/img/stm32f072_eval.jpg b/boards/arm/stm32f072_eval/doc/img/stm32f072_eval.jpg
index 9cc23c826bc..bc268cbf53b 100644
Binary files a/boards/arm/stm32f072_eval/doc/img/stm32f072_eval.jpg and b/boards/arm/stm32f072_eval/doc/img/stm32f072_eval.jpg differ
diff --git a/boards/arm/stm32f072_eval/doc/index.rst b/boards/arm/stm32f072_eval/doc/index.rst
index 345aa2c4a62..3aee4131b9b 100644
--- a/boards/arm/stm32f072_eval/doc/index.rst
+++ b/boards/arm/stm32f072_eval/doc/index.rst
@@ -37,9 +37,7 @@ Here are some highlights of the STM32F072-EVAL board:
 
 
 .. image:: img/stm32f072_eval.jpg
-     :width: 540px
      :align: center
-     :height: 549px
      :alt: STM32F072-EVAL
 
 More information about the board can be found at the `STM32F072-EVAL website`_.
diff --git a/boards/arm/stm32f072b_disco/doc/img/stm32f072b_disco.jpg b/boards/arm/stm32f072b_disco/doc/img/stm32f072b_disco.jpg
index c46929e22ff..0d1ccbf8628 100644
Binary files a/boards/arm/stm32f072b_disco/doc/img/stm32f072b_disco.jpg and b/boards/arm/stm32f072b_disco/doc/img/stm32f072b_disco.jpg differ
diff --git a/boards/arm/stm32f072b_disco/doc/index.rst b/boards/arm/stm32f072b_disco/doc/index.rst
index a91160ebd8c..b01d9decc00 100644
--- a/boards/arm/stm32f072b_disco/doc/index.rst
+++ b/boards/arm/stm32f072b_disco/doc/index.rst
@@ -30,9 +30,7 @@ started quickly. Here are some highlights of the STM32F072B-DISCO board:
 - RF EEprom daughter board connector
 
 .. image:: img/stm32f072b_disco.jpg
-     :width: 272px
      :align: center
-     :height: 551px
      :alt: STM32F072B-DISCO
 
 More information about the board can be found at the
diff --git a/boards/arm/stm32f0_disco/doc/img/stm32f0_disco.jpg b/boards/arm/stm32f0_disco/doc/img/stm32f0_disco.jpg
index 22e1e3d0777..f795a610279 100644
Binary files a/boards/arm/stm32f0_disco/doc/img/stm32f0_disco.jpg and b/boards/arm/stm32f0_disco/doc/img/stm32f0_disco.jpg differ
diff --git a/boards/arm/stm32f0_disco/doc/index.rst b/boards/arm/stm32f0_disco/doc/index.rst
index 87cfcb65259..b528f22adc9 100644
--- a/boards/arm/stm32f0_disco/doc/index.rst
+++ b/boards/arm/stm32f0_disco/doc/index.rst
@@ -12,8 +12,6 @@ comprehensive STM32 software HAL library and various packaged software
 examples.
 
 .. image:: img/stm32f0_disco.jpg
-     :width: 350px
-     :height: 404px
      :align: center
      :alt: STM32F0DISCOVERY
 
diff --git a/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_blue.jpg b/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_blue.jpg
index 5190c82e895..c181cf6f009 100644
Binary files a/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_blue.jpg and b/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_blue.jpg differ
diff --git a/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_pin.jpg b/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_pin.jpg
index 1108e0344af..7ae698f10a1 100644
Binary files a/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_pin.jpg and b/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_pin.jpg differ
diff --git a/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_yellow.jpg b/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_yellow.jpg
index 2e1fcd471ae..24650ba082f 100644
Binary files a/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_yellow.jpg and b/boards/arm/stm32f103_mini/doc/img/stm32f103_mini_yellow.jpg differ
diff --git a/boards/arm/stm32f103_mini/doc/index.rst b/boards/arm/stm32f103_mini/doc/index.rst
index af5a1de1a10..cf16dcbeb37 100644
--- a/boards/arm/stm32f103_mini/doc/index.rst
+++ b/boards/arm/stm32f103_mini/doc/index.rst
@@ -11,14 +11,10 @@ with a wide range of connectivity support and configurations. There are
 multiple version of this board like ``stm32f103_mini``.
 
 .. image:: img/stm32f103_mini_yellow.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: STM32F103 Mini Yellow
 
 .. image:: img/stm32f103_mini_blue.jpg
-   :width: 500px
-   :height: 367px
    :align: center
    :alt: STM32F103 Mini Blue
 
@@ -94,9 +90,7 @@ capable except for analog inputs.
 Board connectors:
 -----------------
 .. image:: img/stm32f103_mini_pin.jpg
-   :width: 800px
    :align: center
-   :height: 619px
    :alt: Nucleo F103RB connectors
 
 Default Zephyr Peripheral Mapping:
diff --git a/boards/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg b/boards/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg
index 1247b0ddac9..b8c4fce59ff 100644
Binary files a/boards/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg and b/boards/arm/stm32f3_disco/doc/img/stm32f3_disco.jpg differ
diff --git a/boards/arm/stm32f3_disco/doc/index.rst b/boards/arm/stm32f3_disco/doc/index.rst
index 370c4b06d53..f0ccbfd7fca 100644
--- a/boards/arm/stm32f3_disco/doc/index.rst
+++ b/boards/arm/stm32f3_disco/doc/index.rst
@@ -36,9 +36,7 @@ started quickly. Here are some highlights of the STM32F3DISCOVERY board:
    Recent PCB revisions (E and newer) are shipped with I3G4250D and LSM303AGR.
 
 .. image:: img/stm32f3_disco.jpg
-     :width: 350px
      :align: center
-     :height: 531px
      :alt: STM32F3DISCOVERY
 
 More information about the board can be found at the
diff --git a/boards/arm/stm32f401_mini/doc/img/STM32_Mini_F401-1.jpg b/boards/arm/stm32f401_mini/doc/img/STM32_Mini_F401-1.jpg
index 46aad195b82..6a7bb77894a 100644
Binary files a/boards/arm/stm32f401_mini/doc/img/STM32_Mini_F401-1.jpg and b/boards/arm/stm32f401_mini/doc/img/STM32_Mini_F401-1.jpg differ
diff --git a/boards/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg b/boards/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg
index 0b005921176..d8dbd21fa7c 100644
Binary files a/boards/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg and b/boards/arm/stm32f411e_disco/doc/img/stm32f411e_disco.jpg differ
diff --git a/boards/arm/stm32f411e_disco/doc/index.rst b/boards/arm/stm32f411e_disco/doc/index.rst
index a6884fe330f..5c8749012f7 100644
--- a/boards/arm/stm32f411e_disco/doc/index.rst
+++ b/boards/arm/stm32f411e_disco/doc/index.rst
@@ -30,9 +30,7 @@ Here are some highlights of the STM32F411E-DISCO board:
 - Extension header for LQFP100 I/Os for a quick connection to the prototyping board and an easy probing
 
 .. image:: img/stm32f411e_disco.jpg
-     :width: 533px
      :align: center
-     :height: 500px
      :alt: STM32F411E-DISCO
 
 More information about the board can be found at the `32F411EDISCOVERY website`_.
diff --git a/boards/arm/stm32f412g_disco/doc/img/stm32f412g_disco.jpg b/boards/arm/stm32f412g_disco/doc/img/stm32f412g_disco.jpg
index 3e95b0690dc..78de8f7d9b8 100644
Binary files a/boards/arm/stm32f412g_disco/doc/img/stm32f412g_disco.jpg and b/boards/arm/stm32f412g_disco/doc/img/stm32f412g_disco.jpg differ
diff --git a/boards/arm/stm32f412g_disco/doc/index.rst b/boards/arm/stm32f412g_disco/doc/index.rst
index ef92f71846c..3849a0d7b9d 100644
--- a/boards/arm/stm32f412g_disco/doc/index.rst
+++ b/boards/arm/stm32f412g_disco/doc/index.rst
@@ -40,9 +40,7 @@ some highlights of the STM32F412G-DISCO board:
 - Comprehensive free software including a variety of examples, part of STM32Cube package
 
 .. image:: img/stm32f412g_disco.jpg
-     :width: 700px
      :align: center
-     :height: 522px
      :alt: STM32F412G-DISCO
 
 More information about the board can be found at the `32F412GDISCOVERY website`_.
diff --git a/boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.jpg b/boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.jpg
new file mode 100644
index 00000000000..d45664d26cc
Binary files /dev/null and b/boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.jpg differ
diff --git a/boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.png b/boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.png
deleted file mode 100644
index cb3ad9621a2..00000000000
Binary files a/boards/arm/stm32f429i_disc1/doc/img/stm32f429i_disc1.png and /dev/null differ
diff --git a/boards/arm/stm32f429i_disc1/doc/index.rst b/boards/arm/stm32f429i_disc1/doc/index.rst
index aed5f667172..d397c414e4f 100644
--- a/boards/arm/stm32f429i_disc1/doc/index.rst
+++ b/boards/arm/stm32f429i_disc1/doc/index.rst
@@ -31,10 +31,8 @@ some highlights of the STM32F429I-DISC1 board:
 	- Two user LEDs: LD3 (green), LD4 (red)
 	- Two USB OTG LEDs: LD5 (green) VBUS and LD6 (red) OC (over-current)
 
-.. image:: img/stm32f429i_disc1.png
-     :width: 350px
+.. image:: img/stm32f429i_disc1.jpg
      :align: center
-     :height: 631px
      :alt: STM32F429I-DISC1
 
 More information about the board can be found at the `STM32F429I-DISC1 website`_.
diff --git a/boards/arm/stm32f469i_disco/doc/img/stm32f469i_disco.jpg b/boards/arm/stm32f469i_disco/doc/img/stm32f469i_disco.jpg
index f0de6daae21..45187233d68 100644
Binary files a/boards/arm/stm32f469i_disco/doc/img/stm32f469i_disco.jpg and b/boards/arm/stm32f469i_disco/doc/img/stm32f469i_disco.jpg differ
diff --git a/boards/arm/stm32f469i_disco/doc/index.rst b/boards/arm/stm32f469i_disco/doc/index.rst
index 727871863b0..c3d564da978 100644
--- a/boards/arm/stm32f469i_disco/doc/index.rst
+++ b/boards/arm/stm32f469i_disco/doc/index.rst
@@ -32,9 +32,7 @@ some highlights of the STM32F469I-DISCO board:
 - Expansion connectors and Arduino UNO V3 connectors
 
 .. image:: img/stm32f469i_disco.jpg
-     :width: 457px
      :align: center
-     :height: 551px
      :alt: STM32F469I-DISCO
 
 More information about the board can be found at the `32F469IDISCOVERY website`_.
diff --git a/boards/arm/stm32f4_disco/doc/img/stm32f4_disco.jpg b/boards/arm/stm32f4_disco/doc/img/stm32f4_disco.jpg
index dab19d209b0..f85c6cf68e3 100644
Binary files a/boards/arm/stm32f4_disco/doc/img/stm32f4_disco.jpg and b/boards/arm/stm32f4_disco/doc/img/stm32f4_disco.jpg differ
diff --git a/boards/arm/stm32f4_disco/doc/index.rst b/boards/arm/stm32f4_disco/doc/index.rst
index b18a2bedc49..1aa228d12b8 100644
--- a/boards/arm/stm32f4_disco/doc/index.rst
+++ b/boards/arm/stm32f4_disco/doc/index.rst
@@ -33,9 +33,7 @@ some highlights of the STM32F4DISCOVERY board:
 - CS43L22 audio DAC with integrated class D speaker driver
 
 .. image:: img/stm32f4_disco.jpg
-     :width: 350px
      :align: center
-     :height: 550px
      :alt: STM32F4DISCOVERY
 
 More information about the board can be found at the `STM32F4DISCOVERY website`_.
diff --git a/boards/arm/stm32f723e_disco/doc/img/stm32f723e_disco.jpg b/boards/arm/stm32f723e_disco/doc/img/stm32f723e_disco.jpg
index f1b83a7b4d1..ee6f994afe3 100644
Binary files a/boards/arm/stm32f723e_disco/doc/img/stm32f723e_disco.jpg and b/boards/arm/stm32f723e_disco/doc/img/stm32f723e_disco.jpg differ
diff --git a/boards/arm/stm32f723e_disco/doc/index.rst b/boards/arm/stm32f723e_disco/doc/index.rst
index 5e131081a30..8fe202a75c3 100644
--- a/boards/arm/stm32f723e_disco/doc/index.rst
+++ b/boards/arm/stm32f723e_disco/doc/index.rst
@@ -24,9 +24,7 @@ and high-speed connectivity features. Important board features include:
 - USB OTG FS with Micro-AB connectors
 
 .. image:: img/stm32f723e_disco.jpg
-     :width: 400px
      :align: center
-     :height: 261px
      :alt: STM32F723E-DISCO
 
 More information about the board can be found at the `32F723E-DISCO website`_.
diff --git a/boards/arm/stm32f746g_disco/doc/img/stm32f746g_disco.jpg b/boards/arm/stm32f746g_disco/doc/img/stm32f746g_disco.jpg
index cd7562c258f..566de415c51 100644
Binary files a/boards/arm/stm32f746g_disco/doc/img/stm32f746g_disco.jpg and b/boards/arm/stm32f746g_disco/doc/img/stm32f746g_disco.jpg differ
diff --git a/boards/arm/stm32f746g_disco/doc/index.rst b/boards/arm/stm32f746g_disco/doc/index.rst
index 508426a1323..579b19cffc8 100644
--- a/boards/arm/stm32f746g_disco/doc/index.rst
+++ b/boards/arm/stm32f746g_disco/doc/index.rst
@@ -36,9 +36,7 @@ and high-speed connectivity features. Important board features include:
 - Ethernet connector compliant with IEEE-802.3-2002
 
 .. image:: img/stm32f746g_disco.jpg
-     :width: 500px
      :align: center
-     :height: 357px
      :alt: STM32F746G-DISCO
 
 More information about the board can be found at the `32F746G-DISCO website`_.
diff --git a/boards/arm/stm32f7508_dk/doc/img/stm32f7508_dk.jpg b/boards/arm/stm32f7508_dk/doc/img/stm32f7508_dk.jpg
index 48a857c8ff2..a222788a04e 100644
Binary files a/boards/arm/stm32f7508_dk/doc/img/stm32f7508_dk.jpg and b/boards/arm/stm32f7508_dk/doc/img/stm32f7508_dk.jpg differ
diff --git a/boards/arm/stm32f7508_dk/doc/index.rst b/boards/arm/stm32f7508_dk/doc/index.rst
index d065cef65b9..e20d0ea3236 100644
--- a/boards/arm/stm32f7508_dk/doc/index.rst
+++ b/boards/arm/stm32f7508_dk/doc/index.rst
@@ -35,9 +35,7 @@ and high-speed connectivity features. Important board features include:
 - Ethernet connector compliant with IEEE-802.3-2002
 
 .. image:: img/stm32f7508_dk.jpg
-     :width: 500px
      :align: center
-     :height: 357px
      :alt: STM32F7508-DK
 
 More information about the board can be found at the `32F7508-DK website`_.
diff --git a/boards/arm/stm32f769i_disco/doc/img/stm32f769i_disco.jpg b/boards/arm/stm32f769i_disco/doc/img/stm32f769i_disco.jpg
index 9d36d984f20..4d8bdc0bd90 100644
Binary files a/boards/arm/stm32f769i_disco/doc/img/stm32f769i_disco.jpg and b/boards/arm/stm32f769i_disco/doc/img/stm32f769i_disco.jpg differ
diff --git a/boards/arm/stm32f769i_disco/doc/index.rst b/boards/arm/stm32f769i_disco/doc/index.rst
index 01dc7473dba..4346f67fbc1 100644
--- a/boards/arm/stm32f769i_disco/doc/index.rst
+++ b/boards/arm/stm32f769i_disco/doc/index.rst
@@ -41,9 +41,7 @@ and high-speed connectivity features. Important board features include:
 - Supported by a wide choice of integrated development environments
 
 .. image:: img/stm32f769i_disco.jpg
-     :width: 500px
      :align: center
-     :height: 260px
      :alt: STM32F769I-DISCO
 
 More information about the board can be found at the `32F769I-DISCO website`_.
diff --git a/boards/arm/stm32g0316_disco/doc/img/stm32g0316_disco.jpg b/boards/arm/stm32g0316_disco/doc/img/stm32g0316_disco.jpg
index 964ce753c22..8c3514ed4d5 100644
Binary files a/boards/arm/stm32g0316_disco/doc/img/stm32g0316_disco.jpg and b/boards/arm/stm32g0316_disco/doc/img/stm32g0316_disco.jpg differ
diff --git a/boards/arm/stm32g0316_disco/doc/index.rst b/boards/arm/stm32g0316_disco/doc/index.rst
index 303a6d63c5b..793e3c98aa8 100644
--- a/boards/arm/stm32g0316_disco/doc/index.rst
+++ b/boards/arm/stm32g0316_disco/doc/index.rst
@@ -12,7 +12,6 @@ and allows the user to develop applications. It includes an on-board ST-LINK/V2-
 and program the embedded STM32 microcontroller.
 
 .. image:: img/stm32g0316_disco.jpg
-   :width: 670px
    :align: center
    :alt: STM32G0316-DISCO
 
diff --git a/boards/arm/stm32g071b_disco/doc/img/stm32g071b_disco.jpg b/boards/arm/stm32g071b_disco/doc/img/stm32g071b_disco.jpg
index e304ae62096..e8a12c8dfb2 100644
Binary files a/boards/arm/stm32g071b_disco/doc/img/stm32g071b_disco.jpg and b/boards/arm/stm32g071b_disco/doc/img/stm32g071b_disco.jpg differ
diff --git a/boards/arm/stm32g071b_disco/doc/index.rst b/boards/arm/stm32g071b_disco/doc/index.rst
index 656e93f9e47..5f9dd31381c 100644
--- a/boards/arm/stm32g071b_disco/doc/index.rst
+++ b/boards/arm/stm32g071b_disco/doc/index.rst
@@ -44,8 +44,6 @@ as a USB Type-C™ and Power Delivery analyzer.
   mass storage, Virtual COM port and debug port
 
 .. image:: img/stm32g071b_disco.jpg
-   :width: 500px
-   :height: 450px
    :align: center
    :alt: STM32G071B-DISCO
 
diff --git a/boards/arm/stm32g081b_eval/doc/img/stm32g081b_eval.jpg b/boards/arm/stm32g081b_eval/doc/img/stm32g081b_eval.jpg
index fb916e8e42f..fd9fba7966c 100644
Binary files a/boards/arm/stm32g081b_eval/doc/img/stm32g081b_eval.jpg and b/boards/arm/stm32g081b_eval/doc/img/stm32g081b_eval.jpg differ
diff --git a/boards/arm/stm32g081b_eval/doc/index.rst b/boards/arm/stm32g081b_eval/doc/index.rst
index b317ab275c5..84d9e18c61e 100644
--- a/boards/arm/stm32g081b_eval/doc/index.rst
+++ b/boards/arm/stm32g081b_eval/doc/index.rst
@@ -85,8 +85,6 @@ through various use cases.
             - 19 V power jack for USB PD
 
 .. image:: img/stm32g081b_eval.jpg
-   :width: 426px
-   :height: 597px
    :align: center
    :alt: STM32G081B-EVAL
 
diff --git a/boards/arm/stm32h735g_disco/doc/img/stm32h735g_disco.jpg b/boards/arm/stm32h735g_disco/doc/img/stm32h735g_disco.jpg
index 9a492d94ad7..15ca53d1d2d 100644
Binary files a/boards/arm/stm32h735g_disco/doc/img/stm32h735g_disco.jpg and b/boards/arm/stm32h735g_disco/doc/img/stm32h735g_disco.jpg differ
diff --git a/boards/arm/stm32h735g_disco/doc/index.rst b/boards/arm/stm32h735g_disco/doc/index.rst
index 0521f619f7d..24d92341f88 100644
--- a/boards/arm/stm32h735g_disco/doc/index.rst
+++ b/boards/arm/stm32h735g_disco/doc/index.rst
@@ -28,9 +28,7 @@ comes with the STM32CubeH7 MCU Package, which provides an STM32 comprehensive
 software HAL library as well as various software examples.
 
 .. image:: img/stm32h735g_disco.jpg
-     :width: 472px
      :align: center
-     :height: 352px
      :alt: STM32H735G-DISCO
 
 More information about the board can be found at the `STM32H735G-DISCO website`_.
diff --git a/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg b/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg
index 684fcc09ae8..dbf783efa42 100644
Binary files a/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg and b/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg differ
diff --git a/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg b/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg
index cabea3778c5..97ae2f00d32 100644
Binary files a/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg and b/boards/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg differ
diff --git a/boards/arm/stm32h747i_disco/doc/img/stm32h747i_disco.jpg b/boards/arm/stm32h747i_disco/doc/img/stm32h747i_disco.jpg
index 8017664ebc8..84966014463 100644
Binary files a/boards/arm/stm32h747i_disco/doc/img/stm32h747i_disco.jpg and b/boards/arm/stm32h747i_disco/doc/img/stm32h747i_disco.jpg differ
diff --git a/boards/arm/stm32h747i_disco/doc/index.rst b/boards/arm/stm32h747i_disco/doc/index.rst
index a5776b393d6..0d88747c066 100644
--- a/boards/arm/stm32h747i_disco/doc/index.rst
+++ b/boards/arm/stm32h747i_disco/doc/index.rst
@@ -34,9 +34,7 @@ Additionally, the board features:
 - Arduino Uno V3 connectors
 
 .. image:: img/stm32h747i_disco.jpg
-     :width: 472px
      :align: center
-     :height: 352px
      :alt: STM32H747I-DISCO
 
 More information about the board can be found at the `STM32H747I-DISCO website`_.
@@ -147,15 +145,11 @@ To get Ethernet working following HW modifications are required:
 Following two images shows necessary changes on the board marked:
 
 .. image:: img/disco_h747i_ethernet_modification_1.jpg
-     :width: 271px
      :align: center
-     :height: 596px
      :alt: STM32H747I-DISCO - Ethernet modification 1 (**SB44**, **SB45**)
 
 .. image:: img/disco_h747i_ethernet_modification_2.jpg
-     :width: 344px
      :align: center
-     :height: 520px
      :alt: STM32H747I-DISCO - Ethernet modification 2 (**SB21**, **R87**, **SB22**, **SB17** and **SB8**)
 
 Resources sharing
diff --git a/boards/arm/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg b/boards/arm/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg
index 74a72c89bfa..ea54ca68430 100644
Binary files a/boards/arm/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg and b/boards/arm/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg differ
diff --git a/boards/arm/stm32h7b3i_dk/doc/index.rst b/boards/arm/stm32h7b3i_dk/doc/index.rst
index 0513ad809fd..549594bb3cc 100644
--- a/boards/arm/stm32h7b3i_dk/doc/index.rst
+++ b/boards/arm/stm32h7b3i_dk/doc/index.rst
@@ -27,9 +27,7 @@ board comes with the STM32CubeH7 MCU Package, which provides an STM32 comprehens
 software HAL library as well as various software examples.
 
 .. image:: img/stm32h7b3i_dk.jpg
-     :width: 484px
      :align: center
-     :height: 439px
      :alt: STM32H7B3I-DK
 
 More information about the board can be found at the `STM32H7B3I-DK website`_.
diff --git a/boards/arm/stm32l1_disco/doc/img/stm32l1_disco.jpg b/boards/arm/stm32l1_disco/doc/img/stm32l1_disco.jpg
index 8b3564c1876..46fda1379ea 100644
Binary files a/boards/arm/stm32l1_disco/doc/img/stm32l1_disco.jpg and b/boards/arm/stm32l1_disco/doc/img/stm32l1_disco.jpg differ
diff --git a/boards/arm/stm32l1_disco/doc/index.rst b/boards/arm/stm32l1_disco/doc/index.rst
index f8c9d1dc0b1..87064ada200 100644
--- a/boards/arm/stm32l1_disco/doc/index.rst
+++ b/boards/arm/stm32l1_disco/doc/index.rst
@@ -24,8 +24,6 @@ configuration assumes only 128K flash and 16K RAM, so it builds and runs
 on both variants out of the box.
 
 .. image:: img/stm32l1_disco.jpg
-     :width: 564px
-     :height: 600px
      :align: center
      :alt: STM32LDISCOVERY
 
diff --git a/boards/arm/stm32l476g_disco/doc/img/stm32l476g_disco.jpg b/boards/arm/stm32l476g_disco/doc/img/stm32l476g_disco.jpg
index bc683bcf3f2..4ff8de98406 100644
Binary files a/boards/arm/stm32l476g_disco/doc/img/stm32l476g_disco.jpg and b/boards/arm/stm32l476g_disco/doc/img/stm32l476g_disco.jpg differ
diff --git a/boards/arm/stm32l476g_disco/doc/index.rst b/boards/arm/stm32l476g_disco/doc/index.rst
index c8869cf6ed7..61f2e5b59a4 100644
--- a/boards/arm/stm32l476g_disco/doc/index.rst
+++ b/boards/arm/stm32l476g_disco/doc/index.rst
@@ -43,9 +43,7 @@ some highlights of the STM32L476G Discovery board:
     - CR2032 battery (not provided)
 
 .. image:: img/stm32l476g_disco.jpg
-     :width: 450px
      :align: center
-     :height: 394px
      :alt: STM32L476G Discovery
 
 More information about the board can be found at the `STM32L476G Discovery website`_.
diff --git a/boards/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg b/boards/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg
index 3129fca2d99..4edd4613781 100644
Binary files a/boards/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg and b/boards/arm/stm32l496g_disco/doc/img/stm32l496g_disco.jpg differ
diff --git a/boards/arm/stm32l496g_disco/doc/index.rst b/boards/arm/stm32l496g_disco/doc/index.rst
index 90043fb3e99..bb0be5243ad 100644
--- a/boards/arm/stm32l496g_disco/doc/index.rst
+++ b/boards/arm/stm32l496g_disco/doc/index.rst
@@ -42,9 +42,7 @@ some highlights of the STM32L496G Discovery board:
 - 4 direction-joystick with selection
 
 .. image:: img/stm32l496g_disco.jpg
-     :width: 450px
      :align: center
-     :height: 394px
      :alt: STM32L496G Discovery
 
 More information about the board can be found at the `STM32L496G Discovery website`_.
diff --git a/boards/arm/stm32l562e_dk/doc/img/stm32l562e_dk.jpg b/boards/arm/stm32l562e_dk/doc/img/stm32l562e_dk.jpg
index 4a89f61212b..96266be0482 100644
Binary files a/boards/arm/stm32l562e_dk/doc/img/stm32l562e_dk.jpg and b/boards/arm/stm32l562e_dk/doc/img/stm32l562e_dk.jpg differ
diff --git a/boards/arm/stm32l562e_dk/doc/index.rst b/boards/arm/stm32l562e_dk/doc/index.rst
index 7c4050f230b..22e5ec16465 100644
--- a/boards/arm/stm32l562e_dk/doc/index.rst
+++ b/boards/arm/stm32l562e_dk/doc/index.rst
@@ -44,9 +44,7 @@ the STM32L562E-DK Discovery board:
 - User and reset push-buttons
 
 .. image:: img/stm32l562e_dk.jpg
-   :width: 460px
    :align: center
-   :height: 474px
    :alt: STM32L562E-DK Discovery
 
 More information about the board can be found at the `STM32L562E-DK Discovery website`_.
diff --git a/boards/arm/stm32mp157c_dk2/doc/img/en.stm32mp157c-dk2.jpg b/boards/arm/stm32mp157c_dk2/doc/img/en.stm32mp157c-dk2.jpg
index 2e1fdbcfb96..0eabb067e73 100644
Binary files a/boards/arm/stm32mp157c_dk2/doc/img/en.stm32mp157c-dk2.jpg and b/boards/arm/stm32mp157c_dk2/doc/img/en.stm32mp157c-dk2.jpg differ
diff --git a/boards/arm/stm32mp157c_dk2/doc/stm32mp157_dk2.rst b/boards/arm/stm32mp157c_dk2/doc/stm32mp157_dk2.rst
index 2a5632295dc..65442f1abc9 100644
--- a/boards/arm/stm32mp157c_dk2/doc/stm32mp157_dk2.rst
+++ b/boards/arm/stm32mp157c_dk2/doc/stm32mp157_dk2.rst
@@ -47,9 +47,7 @@ Zephyr OS is ported to run on the Cortex®-M4 core.
   - Bluetooth® Low Energy 4.1
 
 .. image:: img/en.stm32mp157c-dk2.jpg
-     :width: 600px
      :align: center
-     :height: 526px
      :alt: STM32MP157C-DK2 Discovery
 
 More information about the board can be found at the
diff --git a/boards/arm/stm32vl_disco/doc/img/stm32vl_disco.jpg b/boards/arm/stm32vl_disco/doc/img/stm32vl_disco.jpg
index 8b0f8fd5c74..24b0d26ee02 100644
Binary files a/boards/arm/stm32vl_disco/doc/img/stm32vl_disco.jpg and b/boards/arm/stm32vl_disco/doc/img/stm32vl_disco.jpg differ
diff --git a/boards/arm/stm32vl_disco/doc/index.rst b/boards/arm/stm32vl_disco/doc/index.rst
index 694b2bfb92b..e7a20a3b3e4 100644
--- a/boards/arm/stm32vl_disco/doc/index.rst
+++ b/boards/arm/stm32vl_disco/doc/index.rst
@@ -12,8 +12,6 @@ integrated ST-LINK debugger and programmer is included (V1), but the only
 included I/O devices are two user LEDs and one user button.
 
 .. image:: img/stm32vl_disco.jpg
-     :width: 552px
-     :height: 1024px
      :align: center
      :alt: STM32VLDISCOVERY
 
diff --git a/boards/arm/swan_r5/doc/img/swan.jpg b/boards/arm/swan_r5/doc/img/swan.jpg
index 1ec40a46ce3..2564d61e22d 100644
Binary files a/boards/arm/swan_r5/doc/img/swan.jpg and b/boards/arm/swan_r5/doc/img/swan.jpg differ
diff --git a/boards/arm/swan_r5/doc/index.rst b/boards/arm/swan_r5/doc/index.rst
index 36fb7af9ca0..8a70207bf58 100644
--- a/boards/arm/swan_r5/doc/index.rst
+++ b/boards/arm/swan_r5/doc/index.rst
@@ -54,9 +54,7 @@ some highlights of the board:
   - low-power RTC, and CRC calculation peripherals
 
 .. image:: img/swan.jpg
-     :width: 780px
      :align: center
-     :height: 600px
      :alt: Blues Wireless Swan
 
 More information about the board can be found at the `Swan Product Page`_.
diff --git a/boards/arm/tdk_robokit1/doc/img/tdk_robokit1.jpg b/boards/arm/tdk_robokit1/doc/img/tdk_robokit1.jpg
index c3ccd3e2823..4ddf0cda69d 100644
Binary files a/boards/arm/tdk_robokit1/doc/img/tdk_robokit1.jpg and b/boards/arm/tdk_robokit1/doc/img/tdk_robokit1.jpg differ
diff --git a/boards/arm/tdk_robokit1/doc/index.rst b/boards/arm/tdk_robokit1/doc/index.rst
index 405a3394ade..c4fed0375e6 100644
--- a/boards/arm/tdk_robokit1/doc/index.rst
+++ b/boards/arm/tdk_robokit1/doc/index.rst
@@ -13,7 +13,6 @@ number of small ground robotics useful sensors including chirp sensors for time
 It pairs a 300MHz Cortex-M7 ATSAME70Q21 with an array of TDK sensors and pin headers useful for robotics.
 
 .. image:: img/tdk_robokit1.jpg
-     :width: 500px
      :align: center
      :alt: TDK RoboKit1
 
diff --git a/boards/arm/teensy4/doc/index.rst b/boards/arm/teensy4/doc/index.rst
index 70f79ba985e..02ac4de8aae 100644
--- a/boards/arm/teensy4/doc/index.rst
+++ b/boards/arm/teensy4/doc/index.rst
@@ -11,14 +11,12 @@ programming is done via the USB port.
 
 
 .. figure:: teensy40.jpg
-   :width: 459px
    :align: center
    :alt: TEENSY40
 
    TEENSY40 (Credit: https://www.pjrc.com)
 
 .. figure:: teensy41.jpg
-   :width: 758px
    :align: center
    :alt: TEENSY41
 
diff --git a/boards/arm/teensy4/doc/teensy40.jpg b/boards/arm/teensy4/doc/teensy40.jpg
index 56f50a07e56..2d60c387a48 100644
Binary files a/boards/arm/teensy4/doc/teensy40.jpg and b/boards/arm/teensy4/doc/teensy40.jpg differ
diff --git a/boards/arm/teensy4/doc/teensy41.jpg b/boards/arm/teensy4/doc/teensy41.jpg
index e64b657c961..432c4addd82 100644
Binary files a/boards/arm/teensy4/doc/teensy41.jpg and b/boards/arm/teensy4/doc/teensy41.jpg differ
diff --git a/boards/arm/thingy52_nrf52832/doc/img/thingy52_nrf52832.jpg b/boards/arm/thingy52_nrf52832/doc/img/thingy52_nrf52832.jpg
index 97dcb892ef0..c3763109099 100644
Binary files a/boards/arm/thingy52_nrf52832/doc/img/thingy52_nrf52832.jpg and b/boards/arm/thingy52_nrf52832/doc/img/thingy52_nrf52832.jpg differ
diff --git a/boards/arm/thingy52_nrf52832/doc/index.rst b/boards/arm/thingy52_nrf52832/doc/index.rst
index 5d1529f3e55..96044ee9df4 100644
--- a/boards/arm/thingy52_nrf52832/doc/index.rst
+++ b/boards/arm/thingy52_nrf52832/doc/index.rst
@@ -30,7 +30,6 @@ processor, a set of environmental sensors, a pushbutton, and two RGB LEDs.
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/thingy52_nrf52832.jpg
-     :width: 442px
      :align: center
      :alt: nRF52 Thingy:52
 
diff --git a/boards/arm/twr_ke18f/doc/TWR-KE18F-DEVICE.jpg b/boards/arm/twr_ke18f/doc/TWR-KE18F-DEVICE.jpg
index d57e42c26f8..005ebba2130 100644
Binary files a/boards/arm/twr_ke18f/doc/TWR-KE18F-DEVICE.jpg and b/boards/arm/twr_ke18f/doc/TWR-KE18F-DEVICE.jpg differ
diff --git a/boards/arm/twr_ke18f/doc/index.rst b/boards/arm/twr_ke18f/doc/index.rst
index 7f1c3364098..336099ddca0 100644
--- a/boards/arm/twr_ke18f/doc/index.rst
+++ b/boards/arm/twr_ke18f/doc/index.rst
@@ -11,8 +11,7 @@ MCU-based platforms. The onboard OpenSDAv2 serial and debug adapter,
 running an open source bootloader, offers options for serial
 communication, flash programming, and run-control debugging.
 
-.. figure:: ./TWR-KE18F-DEVICE.jpg
-   :width: 800px
+.. figure:: TWR-KE18F-DEVICE.jpg
    :align: center
    :alt: TWR-KE18F
 
diff --git a/boards/arm/twr_kv58f220m/doc/index.rst b/boards/arm/twr_kv58f220m/doc/index.rst
index 4db15b35c2e..f29129ecd76 100644
--- a/boards/arm/twr_kv58f220m/doc/index.rst
+++ b/boards/arm/twr_kv58f220m/doc/index.rst
@@ -11,8 +11,7 @@ MCU-based platforms. The onboard OpenSDAv2 serial and debug adapter,
 running an open source bootloader, offers options for serial
 communication, flash programming, and run-control debugging.
 
-.. figure:: ./twr_kv58f220m.jpg
-   :width: 700px
+.. figure:: twr_kv58f220m.jpg
    :align: center
    :alt: TWR-KV58F220M
 
diff --git a/boards/arm/twr_kv58f220m/doc/twr_kv58f220m.jpg b/boards/arm/twr_kv58f220m/doc/twr_kv58f220m.jpg
index 6098207f751..7ebc6060da2 100644
Binary files a/boards/arm/twr_kv58f220m/doc/twr_kv58f220m.jpg and b/boards/arm/twr_kv58f220m/doc/twr_kv58f220m.jpg differ
diff --git a/boards/arm/ubx_bmd300eval_nrf52832/doc/img/BMD-30-33-35-36-EVAL.jpg b/boards/arm/ubx_bmd300eval_nrf52832/doc/img/BMD-30-33-35-36-EVAL.jpg
new file mode 100644
index 00000000000..071a6d55a39
Binary files /dev/null and b/boards/arm/ubx_bmd300eval_nrf52832/doc/img/BMD-30-33-35-36-EVAL.jpg differ
diff --git a/boards/arm/ubx_bmd300eval_nrf52832/doc/img/BMD-30-33-35-36-EVAL.png b/boards/arm/ubx_bmd300eval_nrf52832/doc/img/BMD-30-33-35-36-EVAL.png
deleted file mode 100644
index d7e798c57b5..00000000000
Binary files a/boards/arm/ubx_bmd300eval_nrf52832/doc/img/BMD-30-33-35-36-EVAL.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd300eval_nrf52832/doc/img/bmd-300-eval_pin_out.jpg b/boards/arm/ubx_bmd300eval_nrf52832/doc/img/bmd-300-eval_pin_out.jpg
new file mode 100644
index 00000000000..a6168fe97bf
Binary files /dev/null and b/boards/arm/ubx_bmd300eval_nrf52832/doc/img/bmd-300-eval_pin_out.jpg differ
diff --git a/boards/arm/ubx_bmd300eval_nrf52832/doc/img/bmd-300-eval_pin_out.png b/boards/arm/ubx_bmd300eval_nrf52832/doc/img/bmd-300-eval_pin_out.png
deleted file mode 100644
index 59685fa07e2..00000000000
Binary files a/boards/arm/ubx_bmd300eval_nrf52832/doc/img/bmd-300-eval_pin_out.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd300eval_nrf52832/doc/index.rst b/boards/arm/ubx_bmd300eval_nrf52832/doc/index.rst
index c6e012bc0ff..4cf272153c0 100644
--- a/boards/arm/ubx_bmd300eval_nrf52832/doc/index.rst
+++ b/boards/arm/ubx_bmd300eval_nrf52832/doc/index.rst
@@ -26,8 +26,7 @@ CPU and the following devices:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/BMD-30-33-35-36-EVAL.png
-	:width: 593px
+.. figure:: img/BMD-30-33-35-36-EVAL.jpg
 	:align: center
 	:alt: BMD-300-EVAL
 
@@ -125,8 +124,7 @@ Push buttons
 External Connectors
 -------------------
 
-.. figure:: img/bmd-300-eval_pin_out.png
-	:width: 659px
+.. figure:: img/bmd-300-eval_pin_out.jpg
 	:align: center
 	:alt: BMD-300-EVAL pin-out
 
diff --git a/boards/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.jpg b/boards/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.jpg
new file mode 100644
index 00000000000..071a6d55a39
Binary files /dev/null and b/boards/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.jpg differ
diff --git a/boards/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.png b/boards/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.png
deleted file mode 100644
index d7e798c57b5..00000000000
Binary files a/boards/arm/ubx_bmd330eval_nrf52810/doc/img/BMD-30-33-35-36-EVAL.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.jpg b/boards/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.jpg
new file mode 100644
index 00000000000..a6168fe97bf
Binary files /dev/null and b/boards/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.jpg differ
diff --git a/boards/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.png b/boards/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.png
deleted file mode 100644
index 59685fa07e2..00000000000
Binary files a/boards/arm/ubx_bmd330eval_nrf52810/doc/img/bmd-300-eval_pin_out.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd330eval_nrf52810/doc/index.rst b/boards/arm/ubx_bmd330eval_nrf52810/doc/index.rst
index ef428925324..56ede10d98b 100644
--- a/boards/arm/ubx_bmd330eval_nrf52810/doc/index.rst
+++ b/boards/arm/ubx_bmd330eval_nrf52810/doc/index.rst
@@ -26,8 +26,7 @@ the following devices:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/BMD-30-33-35-36-EVAL.png
-	:width: 593px
+.. figure:: img/BMD-30-33-35-36-EVAL.jpg
 	:align: center
 	:alt: BMD-300-EVAL
 
@@ -122,8 +121,7 @@ Push buttons
 External Connectors
 -------------------
 
-.. figure:: img/bmd-300-eval_pin_out.png
-	:width: 659px
+.. figure:: img/bmd-300-eval_pin_out.jpg
 	:align: center
 	:alt: BMD-300-EVAL pin-out
 
diff --git a/boards/arm/ubx_bmd340eval_nrf52840/doc/img/BMD-34-38-EVAL.jpg b/boards/arm/ubx_bmd340eval_nrf52840/doc/img/BMD-34-38-EVAL.jpg
new file mode 100644
index 00000000000..d7437216ae2
Binary files /dev/null and b/boards/arm/ubx_bmd340eval_nrf52840/doc/img/BMD-34-38-EVAL.jpg differ
diff --git a/boards/arm/ubx_bmd340eval_nrf52840/doc/img/BMD-34-38-EVAL.png b/boards/arm/ubx_bmd340eval_nrf52840/doc/img/BMD-34-38-EVAL.png
deleted file mode 100644
index 7237f1ddb37..00000000000
Binary files a/boards/arm/ubx_bmd340eval_nrf52840/doc/img/BMD-34-38-EVAL.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd340eval_nrf52840/doc/img/bmd-340-eval_pin_out.jpg b/boards/arm/ubx_bmd340eval_nrf52840/doc/img/bmd-340-eval_pin_out.jpg
new file mode 100644
index 00000000000..ee26e1c90d5
Binary files /dev/null and b/boards/arm/ubx_bmd340eval_nrf52840/doc/img/bmd-340-eval_pin_out.jpg differ
diff --git a/boards/arm/ubx_bmd340eval_nrf52840/doc/img/bmd-340-eval_pin_out.png b/boards/arm/ubx_bmd340eval_nrf52840/doc/img/bmd-340-eval_pin_out.png
deleted file mode 100644
index 2b85be0af3f..00000000000
Binary files a/boards/arm/ubx_bmd340eval_nrf52840/doc/img/bmd-340-eval_pin_out.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd340eval_nrf52840/doc/index.rst b/boards/arm/ubx_bmd340eval_nrf52840/doc/index.rst
index 87fe3891c84..513f7dbdc8a 100644
--- a/boards/arm/ubx_bmd340eval_nrf52840/doc/index.rst
+++ b/boards/arm/ubx_bmd340eval_nrf52840/doc/index.rst
@@ -29,8 +29,7 @@ Both support the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/BMD-34-38-EVAL.png
-     :width: 600px
+.. figure:: img/BMD-34-38-EVAL.jpg
      :align: center
      :alt: BMD-340-EVAL
 
@@ -131,8 +130,7 @@ Push buttons
 External Connectors
 -------------------
 
-.. figure:: img/bmd-340-eval_pin_out.png
-     :width: 800px
+.. figure:: img/bmd-340-eval_pin_out.jpg
      :align: center
      :alt: BMD-340-EVAL pin-out
 
diff --git a/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_features.jpg b/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_features.jpg
new file mode 100644
index 00000000000..d8e2b764fec
Binary files /dev/null and b/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_features.jpg differ
diff --git a/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_features.png b/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_features.png
deleted file mode 100644
index 463c31ab761..00000000000
Binary files a/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_features.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_pin_out.jpg b/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_pin_out.jpg
new file mode 100644
index 00000000000..0a567e47fc8
Binary files /dev/null and b/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_pin_out.jpg differ
diff --git a/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_pin_out.png b/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_pin_out.png
deleted file mode 100644
index 6fef4df1e8e..00000000000
Binary files a/boards/arm/ubx_bmd345eval_nrf52840/doc/img/bmd-345-eval_pin_out.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd345eval_nrf52840/doc/index.rst b/boards/arm/ubx_bmd345eval_nrf52840/doc/index.rst
index efa54259ebb..7404ebd9053 100644
--- a/boards/arm/ubx_bmd345eval_nrf52840/doc/index.rst
+++ b/boards/arm/ubx_bmd345eval_nrf52840/doc/index.rst
@@ -28,8 +28,7 @@ Both support the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/bmd-345-eval_features.png
-     :width: 442px
+.. figure:: img/bmd-345-eval_features.jpg
      :align: center
      :alt: BMD 345 EVAL
 
@@ -144,8 +143,7 @@ Push buttons
 External Connectors
 -------------------
 
-.. figure:: img/bmd-345-eval_pin_out.png
-     :width: 819px
+.. figure:: img/bmd-345-eval_pin_out.jpg
      :align: center
      :alt: BMD-345-EVAL pin-out
 
diff --git a/boards/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.jpg b/boards/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.jpg
new file mode 100644
index 00000000000..071a6d55a39
Binary files /dev/null and b/boards/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.jpg differ
diff --git a/boards/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.png b/boards/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.png
deleted file mode 100644
index d7e798c57b5..00000000000
Binary files a/boards/arm/ubx_bmd360eval_nrf52811/doc/img/BMD-30-33-35-36-EVAL.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.jpg b/boards/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.jpg
new file mode 100644
index 00000000000..a6168fe97bf
Binary files /dev/null and b/boards/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.jpg differ
diff --git a/boards/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.png b/boards/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.png
deleted file mode 100644
index 59685fa07e2..00000000000
Binary files a/boards/arm/ubx_bmd360eval_nrf52811/doc/img/bmd-300-eval_pin_out.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd360eval_nrf52811/doc/index.rst b/boards/arm/ubx_bmd360eval_nrf52811/doc/index.rst
index b1c11668578..c81d8b4ab7e 100644
--- a/boards/arm/ubx_bmd360eval_nrf52811/doc/index.rst
+++ b/boards/arm/ubx_bmd360eval_nrf52811/doc/index.rst
@@ -26,8 +26,7 @@ the following devices:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/BMD-30-33-35-36-EVAL.png
-	:width: 593px
+.. figure:: img/BMD-30-33-35-36-EVAL.jpg
 	:align: center
 	:alt: BMD-300-EVAL
 
@@ -120,8 +119,7 @@ Push buttons
 External Connectors
 -------------------
 
-.. figure:: img/bmd-300-eval_pin_out.png
-	:width: 659px
+.. figure:: img/bmd-300-eval_pin_out.jpg
 	:align: center
 	:alt: BMD-300-EVAL pin-out
 
diff --git a/boards/arm/ubx_bmd380eval_nrf52840/doc/img/BMD-34-38-EVAL.jpg b/boards/arm/ubx_bmd380eval_nrf52840/doc/img/BMD-34-38-EVAL.jpg
new file mode 100644
index 00000000000..d7437216ae2
Binary files /dev/null and b/boards/arm/ubx_bmd380eval_nrf52840/doc/img/BMD-34-38-EVAL.jpg differ
diff --git a/boards/arm/ubx_bmd380eval_nrf52840/doc/img/BMD-34-38-EVAL.png b/boards/arm/ubx_bmd380eval_nrf52840/doc/img/BMD-34-38-EVAL.png
deleted file mode 100644
index 7237f1ddb37..00000000000
Binary files a/boards/arm/ubx_bmd380eval_nrf52840/doc/img/BMD-34-38-EVAL.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd380eval_nrf52840/doc/img/bmd-340-eval_pin_out.jpg b/boards/arm/ubx_bmd380eval_nrf52840/doc/img/bmd-340-eval_pin_out.jpg
new file mode 100644
index 00000000000..ee26e1c90d5
Binary files /dev/null and b/boards/arm/ubx_bmd380eval_nrf52840/doc/img/bmd-340-eval_pin_out.jpg differ
diff --git a/boards/arm/ubx_bmd380eval_nrf52840/doc/img/bmd-340-eval_pin_out.png b/boards/arm/ubx_bmd380eval_nrf52840/doc/img/bmd-340-eval_pin_out.png
deleted file mode 100644
index 2b85be0af3f..00000000000
Binary files a/boards/arm/ubx_bmd380eval_nrf52840/doc/img/bmd-340-eval_pin_out.png and /dev/null differ
diff --git a/boards/arm/ubx_bmd380eval_nrf52840/doc/index.rst b/boards/arm/ubx_bmd380eval_nrf52840/doc/index.rst
index 5ad8da78095..e76334dd96a 100644
--- a/boards/arm/ubx_bmd380eval_nrf52840/doc/index.rst
+++ b/boards/arm/ubx_bmd380eval_nrf52840/doc/index.rst
@@ -27,8 +27,7 @@ the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/BMD-34-38-EVAL.png
-     :width: 600px
+.. figure:: img/BMD-34-38-EVAL.jpg
      :align: center
      :alt: BMD-340-EVAL
 
@@ -128,8 +127,7 @@ Push buttons
 External Connectors
 -------------------
 
-.. figure:: img/bmd-340-eval_pin_out.png
-     :width: 800px
+.. figure:: img/bmd-340-eval_pin_out.jpg
      :align: center
      :alt: BMD-340-EVAL pin-out
 
diff --git a/boards/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.jpg b/boards/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.jpg
new file mode 100644
index 00000000000..8cd3e596c0e
Binary files /dev/null and b/boards/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.jpg differ
diff --git a/boards/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.png b/boards/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.png
deleted file mode 100644
index cb020e984c4..00000000000
Binary files a/boards/arm/ubx_evkannab1_nrf52832/doc/img/EVK-ANNA-B112.png and /dev/null differ
diff --git a/boards/arm/ubx_evkannab1_nrf52832/doc/index.rst b/boards/arm/ubx_evkannab1_nrf52832/doc/index.rst
index 8d932d190a7..8a4702f331c 100644
--- a/boards/arm/ubx_evkannab1_nrf52832/doc/index.rst
+++ b/boards/arm/ubx_evkannab1_nrf52832/doc/index.rst
@@ -25,7 +25,7 @@ and has support for the following features:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/EVK-ANNA-B112.png
+.. figure:: img/EVK-ANNA-B112.jpg
 
 	EVK ANNA-B1
 
diff --git a/boards/arm/ubx_evkninab1_nrf52832/doc/img/EVK-NINA-B1.jpg b/boards/arm/ubx_evkninab1_nrf52832/doc/img/EVK-NINA-B1.jpg
index cbb8d9b2d96..35101c88dcd 100644
Binary files a/boards/arm/ubx_evkninab1_nrf52832/doc/img/EVK-NINA-B1.jpg and b/boards/arm/ubx_evkninab1_nrf52832/doc/img/EVK-NINA-B1.jpg differ
diff --git a/boards/arm/ubx_evkninab3_nrf52840/doc/img/EVK-NINA-B3.jpg b/boards/arm/ubx_evkninab3_nrf52840/doc/img/EVK-NINA-B3.jpg
new file mode 100644
index 00000000000..e4bcd6e4da6
Binary files /dev/null and b/boards/arm/ubx_evkninab3_nrf52840/doc/img/EVK-NINA-B3.jpg differ
diff --git a/boards/arm/ubx_evkninab3_nrf52840/doc/img/EVK-NINA-B3.png b/boards/arm/ubx_evkninab3_nrf52840/doc/img/EVK-NINA-B3.png
deleted file mode 100644
index 008b324ab75..00000000000
Binary files a/boards/arm/ubx_evkninab3_nrf52840/doc/img/EVK-NINA-B3.png and /dev/null differ
diff --git a/boards/arm/ubx_evkninab3_nrf52840/doc/index.rst b/boards/arm/ubx_evkninab3_nrf52840/doc/index.rst
index dbfc25b0a5f..6fc01e40a97 100644
--- a/boards/arm/ubx_evkninab3_nrf52840/doc/index.rst
+++ b/boards/arm/ubx_evkninab3_nrf52840/doc/index.rst
@@ -26,8 +26,7 @@ nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/EVK-NINA-B3.png
-     :width: 600px
+.. figure:: img/EVK-NINA-B3.jpg
      :align: center
      :alt: EVK-NINA-B3
 
diff --git a/boards/arm/ubx_evkninab4_nrf52833/doc/img/EVK-NINA-B406_Top_web.jpg b/boards/arm/ubx_evkninab4_nrf52833/doc/img/EVK-NINA-B406_Top_web.jpg
new file mode 100644
index 00000000000..8f4e0aa58a8
Binary files /dev/null and b/boards/arm/ubx_evkninab4_nrf52833/doc/img/EVK-NINA-B406_Top_web.jpg differ
diff --git a/boards/arm/ubx_evkninab4_nrf52833/doc/img/EVK-NINA-B406_Top_web.png b/boards/arm/ubx_evkninab4_nrf52833/doc/img/EVK-NINA-B406_Top_web.png
deleted file mode 100644
index a845bc1b1cf..00000000000
Binary files a/boards/arm/ubx_evkninab4_nrf52833/doc/img/EVK-NINA-B406_Top_web.png and /dev/null differ
diff --git a/boards/arm/ubx_evkninab4_nrf52833/doc/index.rst b/boards/arm/ubx_evkninab4_nrf52833/doc/index.rst
index 8e4adb9b42b..abdb7754a9d 100644
--- a/boards/arm/ubx_evkninab4_nrf52833/doc/index.rst
+++ b/boards/arm/ubx_evkninab4_nrf52833/doc/index.rst
@@ -26,7 +26,7 @@ and has support for the following features:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/EVK-NINA-B406_Top_web.png
+.. figure:: img/EVK-NINA-B406_Top_web.jpg
 
     EVK NINA-B4
 
diff --git a/boards/arm/udoo_neo_full_m4/doc/index.rst b/boards/arm/udoo_neo_full_m4/doc/index.rst
index b3b22805973..f3c11e3dd31 100644
--- a/boards/arm/udoo_neo_full_m4/doc/index.rst
+++ b/boards/arm/udoo_neo_full_m4/doc/index.rst
@@ -13,8 +13,7 @@ core running up to 227 MHz for high CPU performance and real-time response.
 Zephyr was ported to run on the Cortex-M4 core only. In a future release, it
 will also communicate with the Cortex-A9 core (running Linux) via OpenAMP.
 
-.. figure:: ./udoo_neo_full_m4.jpg
-   :width: 1715px
+.. figure:: udoo_neo_full_m4.jpg
    :align: center
    :alt: UDOO-Neo-Full
 
diff --git a/boards/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg b/boards/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg
index e07b9c7c07c..e01e832bf79 100644
Binary files a/boards/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg and b/boards/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg differ
diff --git a/boards/arm/v2m_beetle/doc/img/v2m_beetle.jpg b/boards/arm/v2m_beetle/doc/img/v2m_beetle.jpg
new file mode 100644
index 00000000000..9388b363c79
Binary files /dev/null and b/boards/arm/v2m_beetle/doc/img/v2m_beetle.jpg differ
diff --git a/boards/arm/v2m_beetle/doc/img/v2m_beetle.png b/boards/arm/v2m_beetle/doc/img/v2m_beetle.png
deleted file mode 100644
index dc3e1906f18..00000000000
Binary files a/boards/arm/v2m_beetle/doc/img/v2m_beetle.png and /dev/null differ
diff --git a/boards/arm/v2m_beetle/doc/index.rst b/boards/arm/v2m_beetle/doc/index.rst
index 08e7ead420e..ccb66696519 100644
--- a/boards/arm/v2m_beetle/doc/index.rst
+++ b/boards/arm/v2m_beetle/doc/index.rst
@@ -15,10 +15,8 @@ the following devices:
 - Cortex-M System Design Kit GPIO
 - Cortex-M System Design Kit UART
 
-.. image:: img/v2m_beetle.png
-     :width: 442px
+.. image:: img/v2m_beetle.jpg
      :align: center
-     :height: 335px
      :alt: ARM V2M Beetle
 
 More information about the board can be found at the `V2M Beetle Website`_.
diff --git a/boards/arm/v2m_musca_b1/doc/img/v2m_musca_b1.jpg b/boards/arm/v2m_musca_b1/doc/img/v2m_musca_b1.jpg
new file mode 100644
index 00000000000..0eae92bcc38
Binary files /dev/null and b/boards/arm/v2m_musca_b1/doc/img/v2m_musca_b1.jpg differ
diff --git a/boards/arm/v2m_musca_b1/doc/img/v2m_musca_b1.png b/boards/arm/v2m_musca_b1/doc/img/v2m_musca_b1.png
deleted file mode 100644
index ca85ba80638..00000000000
Binary files a/boards/arm/v2m_musca_b1/doc/img/v2m_musca_b1.png and /dev/null differ
diff --git a/boards/arm/v2m_musca_b1/doc/index.rst b/boards/arm/v2m_musca_b1/doc/index.rst
index cb9761de7fd..49ee086678a 100644
--- a/boards/arm/v2m_musca_b1/doc/index.rst
+++ b/boards/arm/v2m_musca_b1/doc/index.rst
@@ -15,10 +15,8 @@ CPU and the following devices:
 - Cortex-M System Design Kit GPIO
 - Cortex-M System Design Kit UART
 
-.. image:: img/v2m_musca_b1.png
-     :width: 435px
+.. image:: img/v2m_musca_b1.jpg
      :align: center
-     :height: 362px
      :alt: ARM V2M Musca B1
 
 More information about the board can be found at the `V2M Musca B1 Website`_.
diff --git a/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1.jpg b/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1.jpg
new file mode 100644
index 00000000000..6e55f47ccd6
Binary files /dev/null and b/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1.jpg differ
diff --git a/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1.png b/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1.png
deleted file mode 100644
index 3711f06e0fc..00000000000
Binary files a/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1.png and /dev/null differ
diff --git a/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1_powered.jpg b/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1_powered.jpg
new file mode 100644
index 00000000000..836a6e11141
Binary files /dev/null and b/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1_powered.jpg differ
diff --git a/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1_powered.png b/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1_powered.png
deleted file mode 100644
index 3765e65b0f8..00000000000
Binary files a/boards/arm/v2m_musca_s1/doc/img/v2m_musca_s1_powered.png and /dev/null differ
diff --git a/boards/arm/v2m_musca_s1/doc/index.rst b/boards/arm/v2m_musca_s1/doc/index.rst
index f7c771ad974..2c37d125436 100644
--- a/boards/arm/v2m_musca_s1/doc/index.rst
+++ b/boards/arm/v2m_musca_s1/doc/index.rst
@@ -15,10 +15,8 @@ CPU and the following devices:
 - Cortex-M System Design Kit GPIO
 - Cortex-M System Design Kit UART
 
-.. image:: img/v2m_musca_s1.png
-     :width: 440px
+.. image:: img/v2m_musca_s1.jpg
      :align: center
-     :height: 386px
      :alt: ARM V2M Musca-S1
 
 More information about the board can be found at the `V2M Musca-S1 Website`_.
@@ -344,10 +342,8 @@ For more information refer to the `Srecord Manual`_.
    # For a 128K bootloader IMAGE_OFFSET = $FLASH_OFFSET + 0x20000
    srec_cat $BIN_BOOTLOADER -Binary -offset 0xA000000 $BIN_APP -Binary -offset 0xA020000 -o zephyr.hex -Intel
 
-.. image:: img/v2m_musca_s1_powered.png
-     :width: 600px
+.. image:: img/v2m_musca_s1_powered.jpg
      :align: center
-     :height: 404px
      :alt: The Musca-S1 with the USB connected and powered-on
 
 To upload the application, connect the V2M Musca-S1 to your host computer using
diff --git a/boards/arm/warp7_m4/doc/index.rst b/boards/arm/warp7_m4/doc/index.rst
index a7abb6ad59b..bc1d60a4068 100644
--- a/boards/arm/warp7_m4/doc/index.rst
+++ b/boards/arm/warp7_m4/doc/index.rst
@@ -12,8 +12,7 @@ Zephyr was ported to run on the M4 core. In a later release, it will also
 communicate with the A7 core (running Linux) via RPmsg.
 
 
-.. image:: ./warp7_m4.png
-   :width: 470px
+.. image:: warp7_m4.jpg
    :align: center
    :alt: WaRP7-iMX7S
 
diff --git a/boards/arm/warp7_m4/doc/warp7_m4.jpg b/boards/arm/warp7_m4/doc/warp7_m4.jpg
new file mode 100644
index 00000000000..92638c1ecff
Binary files /dev/null and b/boards/arm/warp7_m4/doc/warp7_m4.jpg differ
diff --git a/boards/arm/warp7_m4/doc/warp7_m4.png b/boards/arm/warp7_m4/doc/warp7_m4.png
deleted file mode 100644
index fb8fea9c079..00000000000
Binary files a/boards/arm/warp7_m4/doc/warp7_m4.png and /dev/null differ
diff --git a/boards/arm/waveshare_open103z/doc/img/waveshare_open103z.jpg b/boards/arm/waveshare_open103z/doc/img/waveshare_open103z.jpg
new file mode 100644
index 00000000000..ba3c3462638
Binary files /dev/null and b/boards/arm/waveshare_open103z/doc/img/waveshare_open103z.jpg differ
diff --git a/boards/arm/waveshare_open103z/doc/img/waveshare_open103z.png b/boards/arm/waveshare_open103z/doc/img/waveshare_open103z.png
deleted file mode 100644
index dd4fa01eb77..00000000000
Binary files a/boards/arm/waveshare_open103z/doc/img/waveshare_open103z.png and /dev/null differ
diff --git a/boards/arm/waveshare_open103z/doc/index.rst b/boards/arm/waveshare_open103z/doc/index.rst
index 05fa3ec618a..2cd9c7a6ac0 100644
--- a/boards/arm/waveshare_open103z/doc/index.rst
+++ b/boards/arm/waveshare_open103z/doc/index.rst
@@ -8,7 +8,7 @@ Overview
 
 The Waveshare Open103Z-64 is a development board equipped with STM32F103ZE MCU.
 
-.. image:: img/waveshare_open103z.png
+.. image:: img/waveshare_open103z.jpg
 
 Hardware
 ********
diff --git a/boards/arm/we_ophelia1ev_nrf52805/doc/img/we_ophelia1ev_nrf52805.jpg b/boards/arm/we_ophelia1ev_nrf52805/doc/img/we_ophelia1ev_nrf52805.jpg
index 20503bd4c55..8e98d985da0 100644
Binary files a/boards/arm/we_ophelia1ev_nrf52805/doc/img/we_ophelia1ev_nrf52805.jpg and b/boards/arm/we_ophelia1ev_nrf52805/doc/img/we_ophelia1ev_nrf52805.jpg differ
diff --git a/boards/arm/we_ophelia1ev_nrf52805/doc/index.rst b/boards/arm/we_ophelia1ev_nrf52805/doc/index.rst
index ddee346fdbd..ea523c2fcf2 100644
--- a/boards/arm/we_ophelia1ev_nrf52805/doc/index.rst
+++ b/boards/arm/we_ophelia1ev_nrf52805/doc/index.rst
@@ -23,7 +23,6 @@ the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/we_ophelia1ev_nrf52805.jpg
-     :width: 2000px
      :align: center
      :alt: Ophelia-I EV
 
diff --git a/boards/arm/we_proteus2ev_nrf52832/doc/img/we_proteus2ev_nrf52832.jpg b/boards/arm/we_proteus2ev_nrf52832/doc/img/we_proteus2ev_nrf52832.jpg
index 40fc0be9d2d..a9b30800e08 100644
Binary files a/boards/arm/we_proteus2ev_nrf52832/doc/img/we_proteus2ev_nrf52832.jpg and b/boards/arm/we_proteus2ev_nrf52832/doc/img/we_proteus2ev_nrf52832.jpg differ
diff --git a/boards/arm/we_proteus2ev_nrf52832/doc/index.rst b/boards/arm/we_proteus2ev_nrf52832/doc/index.rst
index 783bac9b8c3..316d961c647 100644
--- a/boards/arm/we_proteus2ev_nrf52832/doc/index.rst
+++ b/boards/arm/we_proteus2ev_nrf52832/doc/index.rst
@@ -26,7 +26,6 @@ the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/we_proteus2ev_nrf52832.jpg
-     :width: 642px
      :align: center
      :alt: Proteus-II EV
 
diff --git a/boards/arm/we_proteus3ev_nrf52840/doc/img/we_proteus3ev_nrf52840.jpg b/boards/arm/we_proteus3ev_nrf52840/doc/img/we_proteus3ev_nrf52840.jpg
index bbc15af2bea..27ce0185b0d 100644
Binary files a/boards/arm/we_proteus3ev_nrf52840/doc/img/we_proteus3ev_nrf52840.jpg and b/boards/arm/we_proteus3ev_nrf52840/doc/img/we_proteus3ev_nrf52840.jpg differ
diff --git a/boards/arm/we_proteus3ev_nrf52840/doc/index.rst b/boards/arm/we_proteus3ev_nrf52840/doc/index.rst
index 972af4b7d75..608f366716a 100644
--- a/boards/arm/we_proteus3ev_nrf52840/doc/index.rst
+++ b/boards/arm/we_proteus3ev_nrf52840/doc/index.rst
@@ -26,7 +26,6 @@ nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 
 .. figure:: img/we_proteus3ev_nrf52840.jpg
-     :width: 2810px
      :align: center
      :alt: Proteus-III EV
 
diff --git a/boards/arm/xiao_ble/doc/img/xiao_ble.jpg b/boards/arm/xiao_ble/doc/img/xiao_ble.jpg
new file mode 100644
index 00000000000..7a459cd3b52
Binary files /dev/null and b/boards/arm/xiao_ble/doc/img/xiao_ble.jpg differ
diff --git a/boards/arm/xiao_ble/doc/img/xiao_ble.png b/boards/arm/xiao_ble/doc/img/xiao_ble.png
deleted file mode 100644
index 8c8eef39ad5..00000000000
Binary files a/boards/arm/xiao_ble/doc/img/xiao_ble.png and /dev/null differ
diff --git a/boards/arm/xiao_ble/doc/index.rst b/boards/arm/xiao_ble/doc/index.rst
index 93bf5ef2b9c..c0644725bb5 100644
--- a/boards/arm/xiao_ble/doc/index.rst
+++ b/boards/arm/xiao_ble/doc/index.rst
@@ -10,8 +10,7 @@ The Seeed XIAO BLE is a tiny (21 mm x 17.5 mm) Nordic Semiconductor nRF52840 ARM
 Cortex-M4F development board with onboard LEDs, USB port, QSPI flash, battery
 charger, and range of I/O broken out into 14 pins.
 
-.. figure:: img/xiao_ble.png
-     :width: 300px
+.. figure:: img/xiao_ble.jpg
      :align: center
      :alt: XIAO BLE
 
diff --git a/boards/arm/xmc45_relax_kit/doc/index.rst b/boards/arm/xmc45_relax_kit/doc/index.rst
index ad1ac346bf7..59a37bc2b6a 100644
--- a/boards/arm/xmc45_relax_kit/doc/index.rst
+++ b/boards/arm/xmc45_relax_kit/doc/index.rst
@@ -10,8 +10,7 @@ The XMC4500 Relax Kit is designed to evaluate the capabilities of the XMC4500
 Microcontroller. It is based on High performance ARM Cortex-M4F which can run
 up to 120MHz.
 
-.. image:: ./xmc45_relax_kit.jpeg
-   :width: 720px
+.. image:: xmc45_relax_kit.jpg
    :align: center
    :alt: XMC45-RELAX-KIT
 
diff --git a/boards/arm/xmc45_relax_kit/doc/xmc45_relax_kit.jpeg b/boards/arm/xmc45_relax_kit/doc/xmc45_relax_kit.jpeg
deleted file mode 100644
index 15a5adc8464..00000000000
Binary files a/boards/arm/xmc45_relax_kit/doc/xmc45_relax_kit.jpeg and /dev/null differ
diff --git a/boards/arm/xmc45_relax_kit/doc/xmc45_relax_kit.jpg b/boards/arm/xmc45_relax_kit/doc/xmc45_relax_kit.jpg
new file mode 100644
index 00000000000..7711e02c040
Binary files /dev/null and b/boards/arm/xmc45_relax_kit/doc/xmc45_relax_kit.jpg differ
diff --git a/boards/arm/zybo/doc/index.rst b/boards/arm/zybo/doc/index.rst
index d48e59801fa..44810e666ce 100644
--- a/boards/arm/zybo/doc/index.rst
+++ b/boards/arm/zybo/doc/index.rst
@@ -11,8 +11,7 @@ circuit development board. It is built around the Xilinx Zynq-7000 family, which
 Xilinx All Programmable System-on-Chip (AP SoC) architecture. This architecture tightly integrates a
 dual-core ARM Cortex-A9 processor with Xilinx 7-series Field Programmable Gate Array (FPGA) logic.
 
-.. figure:: ./zybo-0.png
-   :width: 600px
+.. figure:: zybo-0.jpg
    :align: center
    :alt: Digilent Zybo
 
diff --git a/boards/arm/zybo/doc/zybo-0.jpg b/boards/arm/zybo/doc/zybo-0.jpg
new file mode 100644
index 00000000000..9b6f808c454
Binary files /dev/null and b/boards/arm/zybo/doc/zybo-0.jpg differ
diff --git a/boards/arm/zybo/doc/zybo-0.png b/boards/arm/zybo/doc/zybo-0.png
deleted file mode 100644
index eb78e27b3af..00000000000
Binary files a/boards/arm/zybo/doc/zybo-0.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst b/boards/arm64/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst
index 4df72d60811..8515b4218df 100644
--- a/boards/arm64/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst
+++ b/boards/arm64/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst
@@ -9,7 +9,7 @@ Install Arm DS
 Please refer to the official Arm Development Studio Page [1]_ for details. Here
 ``Version: 2020.b Build: 2020110909`` is used in the following example.
 
-.. image:: images/version-info.png
+.. image:: images/version-info.jpg
    :scale: 70%
    :alt: Arm DS Version
 
@@ -24,13 +24,13 @@ Use DS perspective
 
 From menu choose ``Window -> Perspective -> Open Perspective -> Other...``:
 
-.. image:: images/perspective-choose-other.png
+.. image:: images/perspective-choose-other.jpg
    :scale: 70%
    :alt: Arm DS Perspective choose Other...
 
 In the opened window, choose ``Development Studio (default)``:
 
-.. image:: images/perspective-choose-ds.png
+.. image:: images/perspective-choose-ds.jpg
    :scale: 70%
    :alt: Arm DS Perspective choose DS
 
@@ -39,19 +39,19 @@ Create a new configuration database
 
 Create a new configuration database by selecting ``File -> New -> Other... -> Configuration Database``:
 
-.. image:: images/create-new-configuration-database.png
+.. image:: images/create-new-configuration-database.jpg
    :scale: 70%
    :alt: Arm DS create new configuration database
 
 Choose a name for the database. Here ``Zephyr`` is used:
 
-.. image:: images/create-new-configuration-database_database-name.png
+.. image:: images/create-new-configuration-database_database-name.jpg
    :scale: 70%
    :alt: Arm DS create new configuration database: choose database name
 
 Click ``Finish`` and the new configuration database can be seen in ``Project Explorer``:
 
-.. image:: images/create-new-configuration-database_shown-in-project-explorer.png
+.. image:: images/create-new-configuration-database_shown-in-project-explorer.jpg
    :scale: 70%
    :alt: Arm DS create new configuration database: shown in project explorer
 
@@ -60,7 +60,7 @@ Create a new model configuration
 
 Right click ``Zephyr`` in ``Project Explorer``, choose ``New -> Model Configuration``:
 
-.. image:: images/create-new-model-configuration.png
+.. image:: images/create-new-model-configuration.jpg
    :scale: 70%
    :alt: Arm DS create new model configuration
 
@@ -70,14 +70,14 @@ In the opened window:
 2. Choose ``Launch and connect to specific model``, then ``Next >``.
 3. Set ``Model Path`` to ``$FVP_D/FVP_BaseR_AEMv8R``, then ``Finish``.
 
-.. image:: images/create-new-model-configuration_model-path.png
+.. image:: images/create-new-model-configuration_model-path.jpg
    :scale: 70%
    :alt: Arm DS create new model configuration: set model path
 
 Then in ``FVP_BaseR_AEMv8R`` tab, change ``ARMAEMv8-R_`` to ``V8R64-Generic``,
 click ``Save`` and then click ``Import``:
 
-.. image:: images/create-new-model-configuration_model-use-V8R64-Generic.png
+.. image:: images/create-new-model-configuration_model-use-V8R64-Generic.jpg
    :scale: 70%
    :alt: Arm DS create new model configuration: import
 
@@ -86,7 +86,7 @@ Create a new launch configuration
 
 From ``Project Explorer``, right click ``FVP_BaseR_AEMv8R`` and select ``Debug as -> Debug configurations...``:
 
-.. image:: images/create-new-launch-configuration_context-menu.png
+.. image:: images/create-new-launch-configuration_context-menu.jpg
    :scale: 70%
    :alt: Arm DS create new launch configuration: context menu
 
@@ -104,7 +104,7 @@ A new configuration named ``New_configuration`` will be created.
      to see all command line options. Run ``FVP_BaseR_AEMv8R --list-params`` to see all supported parameters.
      The file ``zephyr.elf`` specified by ``-a`` is the binary built from Zephyr.
 
-.. image:: images/create-new-launch-configuration_connection.png
+.. image:: images/create-new-launch-configuration_connection.jpg
    :scale: 70%
    :alt: Arm DS create new launch configuration: connection
 
@@ -112,7 +112,7 @@ A new configuration named ``New_configuration`` will be created.
 
    In ``Files`` box, set ``Load symbols from file`` to full path of ``zephyr.elf`` that you built.
 
-.. image:: images/create-new-launch-configuration_files.png
+.. image:: images/create-new-launch-configuration_files.jpg
    :scale: 70%
    :alt: Arm DS create new launch configuration: files
 
@@ -126,7 +126,7 @@ A new configuration named ``New_configuration`` will be created.
 
    - In ``Paths`` box, set ``Source search directory`` to the path to Zephyr source code.
 
-.. image:: images/create-new-launch-configuration_debugger.png
+.. image:: images/create-new-launch-configuration_debugger.jpg
    :scale: 70%
    :alt: Arm DS create new launch configuration: debugger
 
@@ -134,7 +134,7 @@ After all these changes are made, click ``Apply``, then click ``Debug``. DS will
 launch ``FVP_BaseR_AEMv8R`` and connect to it. You can see a new session is
 connected in ``Debug Control`` window.
 
-.. image:: images/DS-debug-working.png
+.. image:: images/DS-debug-working.jpg
    :scale: 70%
    :alt: Arm DS working
 
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.jpg
new file mode 100644
index 00000000000..64d35dc53a2
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.png b/boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.png
deleted file mode 100644
index 0c611e0dabe..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.jpg
new file mode 100644
index 00000000000..eb7b6dc6980
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.png
deleted file mode 100644
index f2e92f2a529..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.jpg
new file mode 100644
index 00000000000..3d34355db59
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.png
deleted file mode 100644
index 6d5d0b76100..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.jpg
new file mode 100644
index 00000000000..acfc38fe959
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.png
deleted file mode 100644
index 5b950b13bb3..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.jpg
new file mode 100644
index 00000000000..d2846d5a482
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.png
deleted file mode 100644
index 7db82252fbb..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.jpg
new file mode 100644
index 00000000000..9736cdc15c1
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.png
deleted file mode 100644
index 0d85c15f1b6..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.jpg
new file mode 100644
index 00000000000..c790091900a
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.png
deleted file mode 100644
index 764fef843da..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.jpg
new file mode 100644
index 00000000000..d472dab5580
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.png
deleted file mode 100644
index 0b17c0986aa..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.jpg
new file mode 100644
index 00000000000..7753ece1fb3
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.png
deleted file mode 100644
index 990640cb6f1..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.jpg
new file mode 100644
index 00000000000..0e6c8c1a10a
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.png
deleted file mode 100644
index 9b08ed650b6..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.jpg
new file mode 100644
index 00000000000..e83748e708a
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.png b/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.png
deleted file mode 100644
index 0b2de806d27..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.jpg
new file mode 100644
index 00000000000..9f7f87169f9
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.png b/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.png
deleted file mode 100644
index f5a9348cecc..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.jpg
new file mode 100644
index 00000000000..cbaa0a21049
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.png b/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.png
deleted file mode 100644
index 8e776d971d6..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.png and /dev/null differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/version-info.jpg b/boards/arm64/fvp_baser_aemv8r/doc/images/version-info.jpg
new file mode 100644
index 00000000000..6c463b7fa8c
Binary files /dev/null and b/boards/arm64/fvp_baser_aemv8r/doc/images/version-info.jpg differ
diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/version-info.png b/boards/arm64/fvp_baser_aemv8r/doc/images/version-info.png
deleted file mode 100644
index d92855e3ee2..00000000000
Binary files a/boards/arm64/fvp_baser_aemv8r/doc/images/version-info.png and /dev/null differ
diff --git a/boards/nios2/altera_max10/doc/img/Altera_MAX10_switches.jpg b/boards/nios2/altera_max10/doc/img/Altera_MAX10_switches.jpg
index a72e5afa598..5c71d7bf80d 100644
Binary files a/boards/nios2/altera_max10/doc/img/Altera_MAX10_switches.jpg and b/boards/nios2/altera_max10/doc/img/Altera_MAX10_switches.jpg differ
diff --git a/boards/nios2/altera_max10/doc/img/altera_max10.jpg b/boards/nios2/altera_max10/doc/img/altera_max10.jpg
index 0b98f6d5c41..51d5424c2f8 100644
Binary files a/boards/nios2/altera_max10/doc/img/altera_max10.jpg and b/boards/nios2/altera_max10/doc/img/altera_max10.jpg differ
diff --git a/boards/nios2/altera_max10/doc/index.rst b/boards/nios2/altera_max10/doc/index.rst
index f96710075f5..030ca65e105 100644
--- a/boards/nios2/altera_max10/doc/index.rst
+++ b/boards/nios2/altera_max10/doc/index.rst
@@ -11,7 +11,6 @@ The Zephyr kernel is supported on the Altera MAX10 Rev C development kit, using
 the Nios II Gen 2 soft CPU.
 
 .. figure:: img/altera_max10.jpg
-   :width: 442px
    :align: center
    :alt: Altera's MAX* 10
 
@@ -33,7 +32,6 @@ importance is SW2:
 * Switch 4 (HSMC_BYPASSN) should be OFF (up)
 
 .. image:: img/Altera_MAX10_switches.jpg
-   :width: 442px
    :align: center
    :alt: Altera's MAX* 10 Switches
 
diff --git a/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k160.jpg b/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k160.jpg
new file mode 100644
index 00000000000..da9d52aaa02
Binary files /dev/null and b/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k160.jpg differ
diff --git a/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k160.png b/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k160.png
deleted file mode 100644
index 38ca5294f09..00000000000
Binary files a/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k160.png and /dev/null differ
diff --git a/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k410.jpg b/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k410.jpg
new file mode 100644
index 00000000000..e08a657fba7
Binary files /dev/null and b/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k410.jpg differ
diff --git a/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k410.png b/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k410.png
deleted file mode 100644
index 592bce49953..00000000000
Binary files a/boards/riscv/adp_xc7k_ae350/doc/img/adp_xc7k410.png and /dev/null differ
diff --git a/boards/riscv/adp_xc7k_ae350/doc/img/connect_aice.jpg b/boards/riscv/adp_xc7k_ae350/doc/img/connect_aice.jpg
new file mode 100644
index 00000000000..52e6efee2ce
Binary files /dev/null and b/boards/riscv/adp_xc7k_ae350/doc/img/connect_aice.jpg differ
diff --git a/boards/riscv/adp_xc7k_ae350/doc/img/connect_aice.png b/boards/riscv/adp_xc7k_ae350/doc/img/connect_aice.png
deleted file mode 100644
index 353b6aaa673..00000000000
Binary files a/boards/riscv/adp_xc7k_ae350/doc/img/connect_aice.png and /dev/null differ
diff --git a/boards/riscv/adp_xc7k_ae350/doc/index.rst b/boards/riscv/adp_xc7k_ae350/doc/index.rst
index e8a202cd5fd..8c6d7fc14f8 100644
--- a/boards/riscv/adp_xc7k_ae350/doc/index.rst
+++ b/boards/riscv/adp_xc7k_ae350/doc/index.rst
@@ -16,13 +16,11 @@ of fundamental peripheral IPs.
 
 1st figure shows the green PCB is ADP-XC7K160 and 2nd figure shows the red PCB is ADP-XC7K410.
 
-.. image:: img/adp_xc7k160.png
-     :width: 600px
+.. image:: img/adp_xc7k160.jpg
      :align: center
      :alt: ADP-XC7K160
 
-.. image:: img/adp_xc7k410.png
-     :width: 600px
+.. image:: img/adp_xc7k410.jpg
      :align: center
      :alt: ADP-XC7K410
 
@@ -200,8 +198,7 @@ Connecting Andes ICE (AICE)
 AICE is used for flashing and debugging the board. Please connect AICE to both
 ADP-XC7K board and the host computer as shown in the figure.
 
-.. image:: img/connect_aice.png
-     :width: 600px
+.. image:: img/connect_aice.jpg
      :align: center
      :alt: Connect AICE
 
diff --git a/boards/riscv/gd32vf103c_starter/doc/img/gd32vf103c_starter.jpg b/boards/riscv/gd32vf103c_starter/doc/img/gd32vf103c_starter.jpg
index 80e41120d97..3d2d4640a75 100644
Binary files a/boards/riscv/gd32vf103c_starter/doc/img/gd32vf103c_starter.jpg and b/boards/riscv/gd32vf103c_starter/doc/img/gd32vf103c_starter.jpg differ
diff --git a/boards/riscv/gd32vf103v_eval/doc/img/gd32vf103v_eval.jpg b/boards/riscv/gd32vf103v_eval/doc/img/gd32vf103v_eval.jpg
index 37736d3d1f5..abdf23747d0 100644
Binary files a/boards/riscv/gd32vf103v_eval/doc/img/gd32vf103v_eval.jpg and b/boards/riscv/gd32vf103v_eval/doc/img/gd32vf103v_eval.jpg differ
diff --git a/boards/riscv/hifive1/doc/img/hifive1.jpg b/boards/riscv/hifive1/doc/img/hifive1.jpg
index cabe5130114..95a914377dc 100644
Binary files a/boards/riscv/hifive1/doc/img/hifive1.jpg and b/boards/riscv/hifive1/doc/img/hifive1.jpg differ
diff --git a/boards/riscv/hifive1/doc/index.rst b/boards/riscv/hifive1/doc/index.rst
index 3dbdb6a4c26..9482a6ad0d4 100644
--- a/boards/riscv/hifive1/doc/index.rst
+++ b/boards/riscv/hifive1/doc/index.rst
@@ -12,7 +12,6 @@ More information can be found on
 `SiFive's website <https://www.sifive.com/boards/hifive1>`_.
 
 .. image:: img/hifive1.jpg
-   :width: 650px
    :align: center
    :alt: SiFive HiFive1 board
 
diff --git a/boards/riscv/hifive1_revb/doc/img/hifive1_revb.jpg b/boards/riscv/hifive1_revb/doc/img/hifive1_revb.jpg
index 3cd30d8c25d..e08329a1bc5 100644
Binary files a/boards/riscv/hifive1_revb/doc/img/hifive1_revb.jpg and b/boards/riscv/hifive1_revb/doc/img/hifive1_revb.jpg differ
diff --git a/boards/riscv/hifive1_revb/doc/index.rst b/boards/riscv/hifive1_revb/doc/index.rst
index 9e76f2b6eda..843192fe2cc 100644
--- a/boards/riscv/hifive1_revb/doc/index.rst
+++ b/boards/riscv/hifive1_revb/doc/index.rst
@@ -10,7 +10,6 @@ The HiFive1 Rev B is an Arduino-compatible development board with
 a SiFive FE310-G002 RISC-V SoC.
 
 .. image:: img/hifive1_revb.jpg
-   :width: 650px
    :align: center
    :alt: SiFive HiFive1 Rev B board
 
diff --git a/boards/riscv/hifive_unleashed/doc/img/hifive_unleashed.jpg b/boards/riscv/hifive_unleashed/doc/img/hifive_unleashed.jpg
index b477ec8311d..438d56c446a 100644
Binary files a/boards/riscv/hifive_unleashed/doc/img/hifive_unleashed.jpg and b/boards/riscv/hifive_unleashed/doc/img/hifive_unleashed.jpg differ
diff --git a/boards/riscv/hifive_unleashed/doc/index.rst b/boards/riscv/hifive_unleashed/doc/index.rst
index f0a906216d2..f2dd987ff03 100644
--- a/boards/riscv/hifive_unleashed/doc/index.rst
+++ b/boards/riscv/hifive_unleashed/doc/index.rst
@@ -10,7 +10,6 @@ The HiFive Unleashed is a development board with a SiFive FU540-C000
 multi-core 64bit RISC-V SoC.
 
 .. image:: img/hifive_unleashed.jpg
-   :width: 650px
    :align: center
    :alt: SiFive HiFive Unleashed board
 
diff --git a/boards/riscv/hifive_unmatched/doc/img/hifive_unmatched.jpg b/boards/riscv/hifive_unmatched/doc/img/hifive_unmatched.jpg
new file mode 100644
index 00000000000..62129543c63
Binary files /dev/null and b/boards/riscv/hifive_unmatched/doc/img/hifive_unmatched.jpg differ
diff --git a/boards/riscv/hifive_unmatched/doc/img/hifive_unmatched.png b/boards/riscv/hifive_unmatched/doc/img/hifive_unmatched.png
deleted file mode 100644
index 35b76083306..00000000000
Binary files a/boards/riscv/hifive_unmatched/doc/img/hifive_unmatched.png and /dev/null differ
diff --git a/boards/riscv/hifive_unmatched/doc/index.rst b/boards/riscv/hifive_unmatched/doc/index.rst
index 873225c3f99..da374e37679 100644
--- a/boards/riscv/hifive_unmatched/doc/index.rst
+++ b/boards/riscv/hifive_unmatched/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The HiFive Unmatched is a development board with a SiFive FU740-C000
 multi-core 64bit RISC-V SoC.
 
-.. image:: img/hifive_unmatched.png
-   :width: 650px
+.. image:: img/hifive_unmatched.jpg
    :align: center
    :alt: SiFive HiFive Unmatched board
 
diff --git a/boards/riscv/icev_wireless/doc/img/icev_wireless.jpg b/boards/riscv/icev_wireless/doc/img/icev_wireless.jpg
index 31301523e91..72c69604690 100644
Binary files a/boards/riscv/icev_wireless/doc/img/icev_wireless.jpg and b/boards/riscv/icev_wireless/doc/img/icev_wireless.jpg differ
diff --git a/boards/riscv/icev_wireless/doc/img/icev_wireless_back.jpg b/boards/riscv/icev_wireless/doc/img/icev_wireless_back.jpg
index fc2d62e359b..860334ed147 100644
Binary files a/boards/riscv/icev_wireless/doc/img/icev_wireless_back.jpg and b/boards/riscv/icev_wireless/doc/img/icev_wireless_back.jpg differ
diff --git a/boards/riscv/icev_wireless/doc/img/icev_wireless_pinout.jpg b/boards/riscv/icev_wireless/doc/img/icev_wireless_pinout.jpg
index d326d205b15..d2833fcdb33 100644
Binary files a/boards/riscv/icev_wireless/doc/img/icev_wireless_pinout.jpg and b/boards/riscv/icev_wireless/doc/img/icev_wireless_pinout.jpg differ
diff --git a/boards/riscv/icev_wireless/doc/index.rst b/boards/riscv/icev_wireless/doc/index.rst
index 63a6b92f6db..0d1f4f5e95d 100644
--- a/boards/riscv/icev_wireless/doc/index.rst
+++ b/boards/riscv/icev_wireless/doc/index.rst
@@ -11,7 +11,6 @@ The ICE-V Wireless is a combined ESP32C3 and iCE40 FPGA board.
 See the `ICE-V Wireless Github Project`_ for details.
 
 .. figure:: img/icev_wireless.jpg
-   :width: 400px
    :align: center
    :alt: ICE-V Wireless
 
@@ -74,7 +73,6 @@ the iCE40 FPGA. Note that several of the iCE40 pins brought out to the PMOD
 connectors are capable of operating as differential pairs.
 
 .. figure:: img/icev_wireless_back.jpg
-   :width: 400px
    :align: center
    :alt: ICE-V Wireless (Back)
 
@@ -88,7 +86,6 @@ For PMOD details, please refer to the `PMOD Specification`_ and the image
 below.
 
 .. figure:: img/icev_wireless_pinout.jpg
-   :width: 400px
    :align: center
    :alt: ICE-V Wireless Pinout
 
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P1.jpg b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P1.jpg
new file mode 100644
index 00000000000..76f00874941
Binary files /dev/null and b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P1.jpg differ
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P1.png b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P1.png
deleted file mode 100644
index bc2fd5ec7a3..00000000000
Binary files a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P1.png and /dev/null differ
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P2.jpg b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P2.jpg
new file mode 100644
index 00000000000..02571f6b544
Binary files /dev/null and b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P2.jpg differ
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P2.png b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P2.png
deleted file mode 100644
index 260acae4cf0..00000000000
Binary files a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P2.png and /dev/null differ
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P3.jpg b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P3.jpg
new file mode 100644
index 00000000000..292050be904
Binary files /dev/null and b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P3.jpg differ
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P3.png b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P3.png
deleted file mode 100644
index b572a295e5e..00000000000
Binary files a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P3.png and /dev/null differ
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P4.jpg b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P4.jpg
new file mode 100644
index 00000000000..36a0bee3918
Binary files /dev/null and b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P4.jpg differ
diff --git a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P4.png b/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P4.png
deleted file mode 100644
index 601cdb7c25e..00000000000
Binary files a/boards/riscv/it8xxx2_evb/doc/WinFlashTool_P4.png and /dev/null differ
diff --git a/boards/riscv/it8xxx2_evb/doc/index.rst b/boards/riscv/it8xxx2_evb/doc/index.rst
index f5987840954..b28f38444e7 100644
--- a/boards/riscv/it8xxx2_evb/doc/index.rst
+++ b/boards/riscv/it8xxx2_evb/doc/index.rst
@@ -11,8 +11,6 @@ And a highly integrated embedded controller with system functions.
 It is suitable for mobile system applications.
 
 .. figure:: it81302_board.jpg
-     :width: 550px
-     :height: 452px
      :align: center
      :alt: IT81302 EVB
 
@@ -87,14 +85,12 @@ Wiring
 #. Connect your Download Board to your host computer using the USB cable.
 
    .. image:: ite_Downloadboard_setup.jpg
-        :width: 600px
         :align: center
         :alt: ITE Download Board Connected
 
 #. Connect your Download Board to J145 on the it8xxx2_evb board.
 
    .. image:: it8xxx2_evb_setup.jpg
-        :width: 600px
         :align: center
         :alt: ITE Download Board Connected
 
@@ -160,20 +156,17 @@ to the it8xxx2 board flash.
    Second, turn on the it8xxx2_evb board switch.
    Then, configure your winflash tool like below.
 
-    .. figure:: WinFlashTool_P2.png
-          :width: 600px
+    .. figure:: WinFlashTool_P2.jpg
           :align: center
 
-    .. figure:: WinFlashTool_P4.png
-          :width: 600px
+    .. figure:: WinFlashTool_P4.jpg
           :align: center
 
 #. Using winflash tool flash zephyr.bin into your ITE board.
    First, click ``Load`` button and select your zephyr.bin file.
    Second, click ``run`` to flash the iamge into board.
 
-    .. figure:: WinFlashTool_P3.png
-          :width: 600px
+    .. figure:: WinFlashTool_P3.jpg
           :align: center
 
 #. At this point, you have flashed your image into ITE board and
@@ -183,8 +176,7 @@ to the it8xxx2 board flash.
    For example, open device manager to find the USB Serial Port(COM4) and use your
    terminal program to connect it(Speed: 115200).
 
-    .. figure:: WinFlashTool_P1.png
-          :width: 600px
+    .. figure:: WinFlashTool_P1.jpg
           :align: center
 
 #. Turn on the it8xxx2_evb board switch, you should see ``"Hello World! it8xxx2_evb"``
diff --git a/boards/riscv/it8xxx2_evb/doc/it81302_board.jpg b/boards/riscv/it8xxx2_evb/doc/it81302_board.jpg
index 7a7bb483c0f..03648495770 100644
Binary files a/boards/riscv/it8xxx2_evb/doc/it81302_board.jpg and b/boards/riscv/it8xxx2_evb/doc/it81302_board.jpg differ
diff --git a/boards/riscv/it8xxx2_evb/doc/it8xxx2_evb_setup.jpg b/boards/riscv/it8xxx2_evb/doc/it8xxx2_evb_setup.jpg
index b2cd11317fd..b3a56a411bd 100644
Binary files a/boards/riscv/it8xxx2_evb/doc/it8xxx2_evb_setup.jpg and b/boards/riscv/it8xxx2_evb/doc/it8xxx2_evb_setup.jpg differ
diff --git a/boards/riscv/it8xxx2_evb/doc/ite_Downloadboard_setup.jpg b/boards/riscv/it8xxx2_evb/doc/ite_Downloadboard_setup.jpg
index a959c37b6b7..ae3454bcc7e 100644
Binary files a/boards/riscv/it8xxx2_evb/doc/ite_Downloadboard_setup.jpg and b/boards/riscv/it8xxx2_evb/doc/ite_Downloadboard_setup.jpg differ
diff --git a/boards/riscv/litex_vexriscv/doc/img/litex_vexriscv.jpg b/boards/riscv/litex_vexriscv/doc/img/litex_vexriscv.jpg
index fa2a87dd8e2..5b99c930816 100644
Binary files a/boards/riscv/litex_vexriscv/doc/img/litex_vexriscv.jpg and b/boards/riscv/litex_vexriscv/doc/img/litex_vexriscv.jpg differ
diff --git a/boards/riscv/litex_vexriscv/doc/index.rst b/boards/riscv/litex_vexriscv/doc/index.rst
index fd8032387bb..e092030957e 100644
--- a/boards/riscv/litex_vexriscv/doc/index.rst
+++ b/boards/riscv/litex_vexriscv/doc/index.rst
@@ -20,7 +20,6 @@ LiteX VexRiscv SoC implementation generated for the
 <https://store.digilentinc.com/arty-a7-artix-7-fpga-development-board-for-makers-and-hobbyists>`_.
 
 .. image:: img/litex_vexriscv.jpg
-   :width: 650px
    :align: center
    :alt: LiteX VexRiscv on Digilent Arty 35T Board
 
diff --git a/boards/riscv/longan_nano/doc/img/longan_nano.jpg b/boards/riscv/longan_nano/doc/img/longan_nano.jpg
new file mode 100644
index 00000000000..63b9193409a
Binary files /dev/null and b/boards/riscv/longan_nano/doc/img/longan_nano.jpg differ
diff --git a/boards/riscv/longan_nano/doc/img/longan_nano.png b/boards/riscv/longan_nano/doc/img/longan_nano.png
deleted file mode 100644
index 1f3d4c2ec51..00000000000
Binary files a/boards/riscv/longan_nano/doc/img/longan_nano.png and /dev/null differ
diff --git a/boards/riscv/longan_nano/doc/index.rst b/boards/riscv/longan_nano/doc/index.rst
index 7104f55871d..bb33520cb68 100644
--- a/boards/riscv/longan_nano/doc/index.rst
+++ b/boards/riscv/longan_nano/doc/index.rst
@@ -3,7 +3,7 @@
 Sipeed Longan Nano
 ##################
 
-.. image:: img/longan_nano.png
+.. image:: img/longan_nano.jpg
      :align: center
      :alt: longan_nano
 
diff --git a/boards/riscv/rv32m1_vega/doc/index.rst b/boards/riscv/rv32m1_vega/doc/index.rst
index 7256f3eb7c9..defd9177435 100644
--- a/boards/riscv/rv32m1_vega/doc/index.rst
+++ b/boards/riscv/rv32m1_vega/doc/index.rst
@@ -13,7 +13,7 @@ on-die XIP flash, and a full complement of peripherals, including a
 2.4 GHz multi-protocol radio. It also has built-in sensors and
 Arduino-style expansion connectors.
 
-.. figure:: rv32m1_vega.png
+.. figure:: rv32m1_vega.jpg
    :align: center
    :alt: RV32M1-VEGA
 
@@ -526,7 +526,6 @@ first make sure you're booting the right core.
 
   .. figure:: ri5cy_boot.jpg
      :align: center
-     :width: 4in
      :alt: Reset button is pressed
 
   Now quit the telnet session in this terminal and exit OpenOCD in the
diff --git a/boards/riscv/rv32m1_vega/doc/ri5cy_boot.jpg b/boards/riscv/rv32m1_vega/doc/ri5cy_boot.jpg
index f119572c517..6483f98642f 100644
Binary files a/boards/riscv/rv32m1_vega/doc/ri5cy_boot.jpg and b/boards/riscv/rv32m1_vega/doc/ri5cy_boot.jpg differ
diff --git a/boards/riscv/rv32m1_vega/doc/rv32m1_vega.jpg b/boards/riscv/rv32m1_vega/doc/rv32m1_vega.jpg
new file mode 100644
index 00000000000..1e5e5fbc1da
Binary files /dev/null and b/boards/riscv/rv32m1_vega/doc/rv32m1_vega.jpg differ
diff --git a/boards/riscv/rv32m1_vega/doc/rv32m1_vega.png b/boards/riscv/rv32m1_vega/doc/rv32m1_vega.png
deleted file mode 100644
index 32bba083e85..00000000000
Binary files a/boards/riscv/rv32m1_vega/doc/rv32m1_vega.png and /dev/null differ
diff --git a/boards/riscv/rv32m1_vega/doc/rv32m1_vega_jtag.jpg b/boards/riscv/rv32m1_vega/doc/rv32m1_vega_jtag.jpg
index 8d3a02d1e77..236dd269479 100644
Binary files a/boards/riscv/rv32m1_vega/doc/rv32m1_vega_jtag.jpg and b/boards/riscv/rv32m1_vega/doc/rv32m1_vega_jtag.jpg differ
diff --git a/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518_block_diagram.jpg b/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518_block_diagram.jpg
index 2b0b2818ed3..2c83775570f 100644
Binary files a/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518_block_diagram.jpg and b/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518_block_diagram.jpg differ
diff --git a/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518adk80d.jpg b/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518adk80d.jpg
index 76f34a9dc9c..b7d9d9e8a2c 100644
Binary files a/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518adk80d.jpg and b/boards/riscv/tlsr9518adk80d/doc/img/tlsr9518adk80d.jpg differ
diff --git a/boards/riscv/tlsr9518adk80d/doc/index.rst b/boards/riscv/tlsr9518adk80d/doc/index.rst
index e1cc3192c32..62c6b93cf3a 100644
--- a/boards/riscv/tlsr9518adk80d/doc/index.rst
+++ b/boards/riscv/tlsr9518adk80d/doc/index.rst
@@ -13,7 +13,6 @@ rate, Enhanced data rate, LE, Indoor positioning and BLE Mesh),
 Zigbee 3.0, Homekit, 6LoWPAN, Thread and 2.4 Ghz proprietary.
 
 .. figure:: img/tlsr9518adk80d.jpg
-     :width: 400px
      :align: center
      :alt: TLSR9518ADK80D
 
@@ -28,7 +27,6 @@ stereo audio codec, 14 bit AUX ADC, analog and digital Microphone input, PWM, fl
 and other peripheral blocks required for advanced IoT, hearable, and wearable devices.
 
 .. figure:: img/tlsr9518_block_diagram.jpg
-     :width: 400px
      :align: center
      :alt: TLSR9518ADK80D_SOC
 
diff --git a/boards/shields/atmel_rf2xx/doc/ATAVRRZ600.jpg b/boards/shields/atmel_rf2xx/doc/ATAVRRZ600.jpg
index 1d5adf11167..c598c35ec83 100644
Binary files a/boards/shields/atmel_rf2xx/doc/ATAVRRZ600.jpg and b/boards/shields/atmel_rf2xx/doc/ATAVRRZ600.jpg differ
diff --git a/boards/shields/atmel_rf2xx/doc/atreb233-xpro-top.jpg b/boards/shields/atmel_rf2xx/doc/atreb233-xpro-top.jpg
index 73f28189274..8769fb8d168 100644
Binary files a/boards/shields/atmel_rf2xx/doc/atreb233-xpro-top.jpg and b/boards/shields/atmel_rf2xx/doc/atreb233-xpro-top.jpg differ
diff --git a/boards/shields/atmel_rf2xx/doc/index.rst b/boards/shields/atmel_rf2xx/doc/index.rst
index e5c270c412a..31abe4c03f8 100644
--- a/boards/shields/atmel_rf2xx/doc/index.rst
+++ b/boards/shields/atmel_rf2xx/doc/index.rst
@@ -35,8 +35,7 @@ connector.  The modules from this kit are available without any transceiver
 advanced features.  For Xplained headers the `atmel_rf2xx_xplained`_ must be
 selected.  For Xplained-Pro header the `atmel_rf2xx_legacy`_ must be enabled.
 
-.. image:: ./ATAVRRZ600.jpg
-   :width: 350px
+.. image:: ATAVRRZ600.jpg
    :align: center
    :alt: AVR-RZ600
 
@@ -73,8 +72,7 @@ REB233-XPRO Module
 The REB233-XPRO development kit uses Atmel Xplained Pro header.  It is enabled
 selecting `atmel_rf2xx_xpro`_ option.
 
-.. image:: ./atreb233-xpro-top.jpg
-   :width: 300px
+.. image:: atreb233-xpro-top.jpg
    :align: center
    :alt: REB233-XPRO Top
 
diff --git a/boards/shields/dac80508_evm/doc/dac80508evm-board-photo.jpg b/boards/shields/dac80508_evm/doc/dac80508evm-board-photo.jpg
index d8270b90835..9c8b80498c0 100644
Binary files a/boards/shields/dac80508_evm/doc/dac80508evm-board-photo.jpg and b/boards/shields/dac80508_evm/doc/dac80508evm-board-photo.jpg differ
diff --git a/boards/shields/dac80508_evm/doc/dac80508evm_connected.jpg b/boards/shields/dac80508_evm/doc/dac80508evm_connected.jpg
index 4f0480583a9..31d99681253 100644
Binary files a/boards/shields/dac80508_evm/doc/dac80508evm_connected.jpg and b/boards/shields/dac80508_evm/doc/dac80508evm_connected.jpg differ
diff --git a/boards/shields/dac80508_evm/doc/index.rst b/boards/shields/dac80508_evm/doc/index.rst
index 1aa61378d46..204769e2bd9 100644
--- a/boards/shields/dac80508_evm/doc/index.rst
+++ b/boards/shields/dac80508_evm/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The Texas Instruments DAC80508 Evaluation Module (EVM) is a
 DAC development module for the TI DAC80508 series.
 
-.. figure:: ./dac80508evm-board-photo.jpg
-   :width: 640px
+.. figure:: dac80508evm-board-photo.jpg
    :align: center
    :alt: DAC80508 EVM
 
@@ -25,8 +24,7 @@ The SPI connector pins on the DAC80508 EVM can be connected to the
 Arduino headers of the development board using jumper wires.
 In addition, 5V must be connected to the DAC80508 EVM's TP6(VDD).
 
-.. figure:: ./dac80508evm_connected.jpg
-   :width: 640px
+.. figure:: dac80508evm_connected.jpg
    :align: center
    :alt: DAC80508 EVM + STM32F746G_DISCO
 
diff --git a/boards/shields/esp_8266/doc/esp-01.jpeg b/boards/shields/esp_8266/doc/esp-01.jpeg
deleted file mode 100644
index afaea1bba05..00000000000
Binary files a/boards/shields/esp_8266/doc/esp-01.jpeg and /dev/null differ
diff --git a/boards/shields/esp_8266/doc/esp-01.jpg b/boards/shields/esp_8266/doc/esp-01.jpg
new file mode 100644
index 00000000000..2d3e74236d5
Binary files /dev/null and b/boards/shields/esp_8266/doc/esp-01.jpg differ
diff --git a/boards/shields/esp_8266/doc/esp_at_173.jpg b/boards/shields/esp_8266/doc/esp_at_173.jpg
new file mode 100644
index 00000000000..ade9d548b4b
Binary files /dev/null and b/boards/shields/esp_8266/doc/esp_at_173.jpg differ
diff --git a/boards/shields/esp_8266/doc/esp_at_173.png b/boards/shields/esp_8266/doc/esp_at_173.png
deleted file mode 100644
index f64774db3ed..00000000000
Binary files a/boards/shields/esp_8266/doc/esp_at_173.png and /dev/null differ
diff --git a/boards/shields/esp_8266/doc/index.rst b/boards/shields/esp_8266/doc/index.rst
index 83805ea7aa6..5d3acf6911e 100644
--- a/boards/shields/esp_8266/doc/index.rst
+++ b/boards/shields/esp_8266/doc/index.rst
@@ -15,8 +15,7 @@ to existing devices.
 The simplest module that uses ESP-8266 is ESP-01. This is a generic shield
 configuration that allows any ESP-8266 module variation including ESP-12E/F.
 
-.. image:: ./esp-01.jpeg
-   :width: 634px
+.. image:: esp-01.jpg
    :align: center
    :alt: ESP-01
 
@@ -69,8 +68,7 @@ with 1MB flash using Boot Mode and with Flash size 8Mbit: 512KB + 512KB. The
 ESP8266 AT Bin 1.7.x available requires the following partition configuration
 to works:
 
-.. image:: ./esp_at_173.png
-   :width: 678px
+.. image:: esp_at_173.jpg
    :align: center
    :alt: ESP8266 AT Bin V1.7.3
 
diff --git a/boards/shields/frdm_cr20a/doc/frdm_cr20a.jpg b/boards/shields/frdm_cr20a/doc/frdm_cr20a.jpg
index 4d6e4e19b26..b8e08be2bd9 100644
Binary files a/boards/shields/frdm_cr20a/doc/frdm_cr20a.jpg and b/boards/shields/frdm_cr20a/doc/frdm_cr20a.jpg differ
diff --git a/boards/shields/frdm_cr20a/doc/index.rst b/boards/shields/frdm_cr20a/doc/index.rst
index 31470fed714..99d14af8438 100644
--- a/boards/shields/frdm_cr20a/doc/index.rst
+++ b/boards/shields/frdm_cr20a/doc/index.rst
@@ -12,8 +12,7 @@ cost-effective reference design for the MCR20A transceiver in a shield form
 factor, compatible with existing Freedom development platforms, such as
 :ref:`frdm_k64f`.
 
-.. image:: ./frdm_cr20a.jpg
-   :width: 720px
+.. image:: frdm_cr20a.jpg
    :align: center
    :alt: FRDM-CR20A
 
diff --git a/boards/shields/frdm_stbc_agm01/doc/AGM01.jpg b/boards/shields/frdm_stbc_agm01/doc/AGM01.jpg
index fa918c1f569..8c38ec99005 100644
Binary files a/boards/shields/frdm_stbc_agm01/doc/AGM01.jpg and b/boards/shields/frdm_stbc_agm01/doc/AGM01.jpg differ
diff --git a/boards/shields/frdm_stbc_agm01/doc/index.rst b/boards/shields/frdm_stbc_agm01/doc/index.rst
index 60ea89cae57..d4f983671bb 100644
--- a/boards/shields/frdm_stbc_agm01/doc/index.rst
+++ b/boards/shields/frdm_stbc_agm01/doc/index.rst
@@ -11,8 +11,7 @@ FXOS8700 and FXAS21002. This 9-axis solution (FXAS21002C Gyroscope,
 + FXOS8700CQ E-compass sensor) is compatible with any board that
 provides an Arduino R3 header.
 
-.. image:: ./AGM01.jpg
-   :width: 500px
+.. image:: AGM01.jpg
    :align: center
    :alt: FRDM-STBC-AGM01
 
diff --git a/boards/shields/ftdi_vm800c/doc/VM800C_top.jpg b/boards/shields/ftdi_vm800c/doc/VM800C_top.jpg
index 3c02228f6c1..980af2f3d4e 100644
Binary files a/boards/shields/ftdi_vm800c/doc/VM800C_top.jpg and b/boards/shields/ftdi_vm800c/doc/VM800C_top.jpg differ
diff --git a/boards/shields/ftdi_vm800c/doc/index.rst b/boards/shields/ftdi_vm800c/doc/index.rst
index a47cf51807a..720ffee5aa1 100644
--- a/boards/shields/ftdi_vm800c/doc/index.rst
+++ b/boards/shields/ftdi_vm800c/doc/index.rst
@@ -9,8 +9,7 @@ and demonstrate the functionality of the FT800 Embedded Video Engine, EVE. This
 module behaves as an SPI slave, and requires a SPI Master for proper
 microcontroller interfacing and system integration.
 
-.. image:: ./VM800C_top.jpg
-   :width: 350px
+.. image:: VM800C_top.jpg
    :align: center
    :alt: VM800C
 
diff --git a/boards/shields/inventek_eswifi/doc/index.rst b/boards/shields/inventek_eswifi/doc/index.rst
index c7cbc5038a1..699fd540190 100644
--- a/boards/shields/inventek_eswifi/doc/index.rst
+++ b/boards/shields/inventek_eswifi/doc/index.rst
@@ -32,8 +32,7 @@ Otherwise, J17 2-3 will select USB-5V. More information can be found at
 .. note::
 	The Inventek's EVBs signals are 3.3V only.
 
-.. image:: ./ismart4343c-evb.jpg
-   :width: 350px
+.. image:: ismart4343c-evb.jpg
    :align: center
    :alt: ISMART4343C-EVB
 
@@ -53,8 +52,7 @@ available at header J26 pin 1 and shield configuration uses D7 to control that
 signal, user need do a wire connecting these two terminals.  On the below
 image is possible see suggested wiring connections.
 
-.. image:: ./ismart4343c-evb-wiring.jpg
-   :width: 800px
+.. image:: ismart4343c-evb-wiring.jpg
    :align: center
    :alt: ISMART4343C-EVB Wiring
 
diff --git a/boards/shields/inventek_eswifi/doc/ismart4343c-evb-wiring.jpg b/boards/shields/inventek_eswifi/doc/ismart4343c-evb-wiring.jpg
index 7996e09544f..10658582054 100644
Binary files a/boards/shields/inventek_eswifi/doc/ismart4343c-evb-wiring.jpg and b/boards/shields/inventek_eswifi/doc/ismart4343c-evb-wiring.jpg differ
diff --git a/boards/shields/inventek_eswifi/doc/ismart4343c-evb.jpg b/boards/shields/inventek_eswifi/doc/ismart4343c-evb.jpg
index f225dc20980..15835440821 100644
Binary files a/boards/shields/inventek_eswifi/doc/ismart4343c-evb.jpg and b/boards/shields/inventek_eswifi/doc/ismart4343c-evb.jpg differ
diff --git a/boards/shields/link_board_eth/doc/img/link_board_eth.jpg b/boards/shields/link_board_eth/doc/img/link_board_eth.jpg
new file mode 100644
index 00000000000..d1c4041afd4
Binary files /dev/null and b/boards/shields/link_board_eth/doc/img/link_board_eth.jpg differ
diff --git a/boards/shields/link_board_eth/doc/img/link_board_eth.png b/boards/shields/link_board_eth/doc/img/link_board_eth.png
deleted file mode 100644
index 03bfa42fddf..00000000000
Binary files a/boards/shields/link_board_eth/doc/img/link_board_eth.png and /dev/null differ
diff --git a/boards/shields/link_board_eth/doc/index.rst b/boards/shields/link_board_eth/doc/index.rst
index a70694f7da9..645b6af11ef 100644
--- a/boards/shields/link_board_eth/doc/index.rst
+++ b/boards/shields/link_board_eth/doc/index.rst
@@ -12,8 +12,7 @@ It was developed as an expansion component for the reel board.
 See :ref:`reel_board` documentation for more information about
 link board family and how to connect it to the reel board.
 
-.. image:: ./img/link_board_eth.png
-     :width: 720px
+.. image:: img/link_board_eth.jpg
      :align: center
      :alt: link board ETH
 
diff --git a/boards/shields/lmp90100_evb/doc/index.rst b/boards/shields/lmp90100_evb/doc/index.rst
index 1e55d8dc4f0..3e06d70abdd 100644
--- a/boards/shields/lmp90100_evb/doc/index.rst
+++ b/boards/shields/lmp90100_evb/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The Texas Instruments LMP90100 Sensor AFE Evaluation Board (EVB) is a
 development kit for the TI LMP90xxx series of analog sensor frontends.
 
-.. figure:: ./lmp90100eb_lmp90100eb.jpg
-   :width: 640px
+.. figure:: lmp90100eb_lmp90100eb.jpg
    :align: center
    :alt: LMP90100 EVB
 
diff --git a/boards/shields/lmp90100_evb/doc/lmp90100eb_lmp90100eb.jpg b/boards/shields/lmp90100_evb/doc/lmp90100eb_lmp90100eb.jpg
index f6f9d79ed76..0752e4f4f8a 100644
Binary files a/boards/shields/lmp90100_evb/doc/lmp90100eb_lmp90100eb.jpg and b/boards/shields/lmp90100_evb/doc/lmp90100eb_lmp90100eb.jpg differ
diff --git a/boards/shields/mcp2515/doc/dfrobot_can_bus_v2_0.jpg b/boards/shields/mcp2515/doc/dfrobot_can_bus_v2_0.jpg
index f5dcd8641e7..7863410cd07 100644
Binary files a/boards/shields/mcp2515/doc/dfrobot_can_bus_v2_0.jpg and b/boards/shields/mcp2515/doc/dfrobot_can_bus_v2_0.jpg differ
diff --git a/boards/shields/mcp2515/doc/index.rst b/boards/shields/mcp2515/doc/index.rst
index ee6a0115e01..9b6fd681f16 100644
--- a/boards/shields/mcp2515/doc/index.rst
+++ b/boards/shields/mcp2515/doc/index.rst
@@ -16,8 +16,7 @@ The DFRobot CAN BUS shield supports the Microchip MCP2515 stand-alone CAN
 controller and JTA1050 high speed CAN transceiver. The shield has an Arduino
 Uno R3 compatible hardware interface.
 
-.. figure:: ./dfrobot_can_bus_v2_0.jpg
-   :width: 720px
+.. figure:: dfrobot_can_bus_v2_0.jpg
    :align: center
    :alt: DFRobot_CAN_BUS_V2_0_SHIELD
 
@@ -126,8 +125,7 @@ The Keyestudio CAN BUS shield supports the Microchip MCP2515 stand-alone CAN
 controller and MCP2551 high speed CAN transceiver. The shield has an Arduino
 Uno R3 compatible hardware interface.
 
-.. figure:: ./keyestudio_can_bus_ks0411.png
-   :width: 559px
+.. figure:: keyestudio_can_bus_ks0411.jpg
    :align: center
    :alt: Keyestudio CAN-BUS Shield (KS0411)
 
diff --git a/boards/shields/mcp2515/doc/keyestudio_can_bus_ks0411.jpg b/boards/shields/mcp2515/doc/keyestudio_can_bus_ks0411.jpg
new file mode 100644
index 00000000000..25c09a2b71f
Binary files /dev/null and b/boards/shields/mcp2515/doc/keyestudio_can_bus_ks0411.jpg differ
diff --git a/boards/shields/mcp2515/doc/keyestudio_can_bus_ks0411.png b/boards/shields/mcp2515/doc/keyestudio_can_bus_ks0411.png
deleted file mode 100644
index d0dfe2ac6ef..00000000000
Binary files a/boards/shields/mcp2515/doc/keyestudio_can_bus_ks0411.png and /dev/null differ
diff --git a/boards/shields/mikroe_adc_click/doc/adc-click.jpg b/boards/shields/mikroe_adc_click/doc/adc-click.jpg
index 50a61dac52a..eee90a0876b 100644
Binary files a/boards/shields/mikroe_adc_click/doc/adc-click.jpg and b/boards/shields/mikroe_adc_click/doc/adc-click.jpg differ
diff --git a/boards/shields/mikroe_adc_click/doc/index.rst b/boards/shields/mikroe_adc_click/doc/index.rst
index 30d8346ecd3..41656ab2e36 100644
--- a/boards/shields/mikroe_adc_click/doc/index.rst
+++ b/boards/shields/mikroe_adc_click/doc/index.rst
@@ -9,8 +9,7 @@ Overview
 The MikroElektronika ADC Click carries the `MCP3204`_ 12-bit
 Analog-to-Digital converter in a `mikroBUS`_ |trade| form factor.
 
-.. figure:: ./adc-click.jpg
-   :width: 528px
+.. figure:: adc-click.jpg
    :align: center
    :alt: MikroElektronika ADC Click
 
diff --git a/boards/shields/mikroe_wifi_bt_click/doc/index.rst b/boards/shields/mikroe_wifi_bt_click/doc/index.rst
index 0f1da63e415..8673caa4583 100644
--- a/boards/shields/mikroe_wifi_bt_click/doc/index.rst
+++ b/boards/shields/mikroe_wifi_bt_click/doc/index.rst
@@ -12,8 +12,7 @@ the standard MikroBus interface with UART pins plus its Espressif AT
 command set. Alternatively, the Zephyr modem driver can be used,
 configuring the module as a native WIFI networking interface.
 
-.. image:: ./wifi_click.jpeg
-   :width: 634px
+.. image:: wifi_click.jpg
    :align: center
    :alt: MikroE WIFI BLE Click
 
diff --git a/boards/shields/mikroe_wifi_bt_click/doc/wifi_click.jpeg b/boards/shields/mikroe_wifi_bt_click/doc/wifi_click.jpeg
deleted file mode 100644
index 13bfcf42f1a..00000000000
Binary files a/boards/shields/mikroe_wifi_bt_click/doc/wifi_click.jpeg and /dev/null differ
diff --git a/boards/shields/mikroe_wifi_bt_click/doc/wifi_click.jpg b/boards/shields/mikroe_wifi_bt_click/doc/wifi_click.jpg
new file mode 100644
index 00000000000..34669d9fe87
Binary files /dev/null and b/boards/shields/mikroe_wifi_bt_click/doc/wifi_click.jpg differ
diff --git a/boards/shields/v2c_daplink/doc/index.rst b/boards/shields/v2c_daplink/doc/index.rst
index 481d452be04..92f7fbac4fa 100644
--- a/boards/shields/v2c_daplink/doc/index.rst
+++ b/boards/shields/v2c_daplink/doc/index.rst
@@ -10,8 +10,7 @@ The `ARM V2C-DAPLink for DesignStart FPGA`_ shield can be used to provide
 DAPLink debug access to the ARM DesignStart FPGA reference designs implemented
 on the :ref:`arty`.
 
-.. figure:: ./v2c_daplink.png
-   :width: 600px
+.. figure:: v2c_daplink.jpg
    :align: center
    :alt: V2C-DAPLink
 
diff --git a/boards/shields/v2c_daplink/doc/v2c_daplink.jpg b/boards/shields/v2c_daplink/doc/v2c_daplink.jpg
new file mode 100644
index 00000000000..a593038b608
Binary files /dev/null and b/boards/shields/v2c_daplink/doc/v2c_daplink.jpg differ
diff --git a/boards/shields/v2c_daplink/doc/v2c_daplink.png b/boards/shields/v2c_daplink/doc/v2c_daplink.png
deleted file mode 100644
index ea497f7e07a..00000000000
Binary files a/boards/shields/v2c_daplink/doc/v2c_daplink.png and /dev/null differ
diff --git a/boards/shields/x_nucleo_53l0a1/doc/index.rst b/boards/shields/x_nucleo_53l0a1/doc/index.rst
index ba323ac0cb0..60f780ac43d 100644
--- a/boards/shields/x_nucleo_53l0a1/doc/index.rst
+++ b/boards/shields/x_nucleo_53l0a1/doc/index.rst
@@ -19,8 +19,7 @@ Two VL53L0X satellites can be connected using the two 10 pin connectors.
 The expansion board is compatible with the STM32 Nucleo board family,
 and with the Arduino UNO R3 connector layout.
 
-.. figure:: ./x_nucleo_53l0a1.jpg
-   :width: 371px
+.. figure:: x_nucleo_53l0a1.jpg
    :align: center
    :alt: X-NUCLEO-53L0A1
 
diff --git a/boards/shields/x_nucleo_53l0a1/doc/x_nucleo_53l0a1.jpg b/boards/shields/x_nucleo_53l0a1/doc/x_nucleo_53l0a1.jpg
index ffe17a735ba..d44998fbd10 100644
Binary files a/boards/shields/x_nucleo_53l0a1/doc/x_nucleo_53l0a1.jpg and b/boards/shields/x_nucleo_53l0a1/doc/x_nucleo_53l0a1.jpg differ
diff --git a/boards/shields/x_nucleo_eeprma2/doc/index.rst b/boards/shields/x_nucleo_eeprma2/doc/index.rst
index e22b69bbbd8..ea5a330b514 100644
--- a/boards/shields/x_nucleo_eeprma2/doc/index.rst
+++ b/boards/shields/x_nucleo_eeprma2/doc/index.rst
@@ -15,8 +15,7 @@ and ST morpho connectors can be mounted if required.
 The I2C EEPROMs are compatible with the ``atmel,at24`` driver and
 the SPI EEPROMs are compatible with the ``atmel,at25`` driver.
 
-.. figure:: ./x_nucleo_eeprma2.jpg
-   :width: 371px
+.. figure:: x_nucleo_eeprma2.jpg
    :align: center
    :alt: X-NUCLEO-EEPRMA2
 
diff --git a/boards/shields/x_nucleo_eeprma2/doc/x_nucleo_eeprma2.jpg b/boards/shields/x_nucleo_eeprma2/doc/x_nucleo_eeprma2.jpg
index 96797d7b736..44cc7bed326 100644
Binary files a/boards/shields/x_nucleo_eeprma2/doc/x_nucleo_eeprma2.jpg and b/boards/shields/x_nucleo_eeprma2/doc/x_nucleo_eeprma2.jpg differ
diff --git a/boards/shields/x_nucleo_idb05a1/doc/img/x-nucleo-idb05a1.jpg b/boards/shields/x_nucleo_idb05a1/doc/img/x-nucleo-idb05a1.jpg
index bc9e1bdef44..8f600d976cd 100644
Binary files a/boards/shields/x_nucleo_idb05a1/doc/img/x-nucleo-idb05a1.jpg and b/boards/shields/x_nucleo_idb05a1/doc/img/x-nucleo-idb05a1.jpg differ
diff --git a/boards/shields/x_nucleo_idb05a1/doc/index.rst b/boards/shields/x_nucleo_idb05a1/doc/index.rst
index 22956670120..11ae6a7213a 100644
--- a/boards/shields/x_nucleo_idb05a1/doc/index.rst
+++ b/boards/shields/x_nucleo_idb05a1/doc/index.rst
@@ -21,8 +21,6 @@ but CS and SCK signals are not the standard Arduino SPI_CS and SPI_SCK signals.
 Please refer to "Hardware configuration" section.
 
 .. image:: img/x-nucleo-idb05a1.jpg
-     :width: 400px
-     :height: 350px
      :align: center
      :alt: X-NUCLEO-IDB05A1
 
diff --git a/boards/shields/x_nucleo_iks01a1/doc/img/x-nucleo-iks01a1.jpg b/boards/shields/x_nucleo_iks01a1/doc/img/x-nucleo-iks01a1.jpg
index 30a9dfde8aa..428ef984eed 100644
Binary files a/boards/shields/x_nucleo_iks01a1/doc/img/x-nucleo-iks01a1.jpg and b/boards/shields/x_nucleo_iks01a1/doc/img/x-nucleo-iks01a1.jpg differ
diff --git a/boards/shields/x_nucleo_iks01a1/doc/index.rst b/boards/shields/x_nucleo_iks01a1/doc/index.rst
index e5fb3eeda44..5674ee69e7a 100644
--- a/boards/shields/x_nucleo_iks01a1/doc/index.rst
+++ b/boards/shields/x_nucleo_iks01a1/doc/index.rst
@@ -14,8 +14,6 @@ humidity and temperature sensor, and the LPS25HB pressure sensor.
 The X-NUCLEO-IKS01A1 interfaces with the main board via an I2C interface.
 
 .. image:: img/x-nucleo-iks01a1.jpg
-     :width: 350px
-     :height: 489px
      :align: center
      :alt: X-NUCLEO-IKS01A
 
diff --git a/boards/shields/x_nucleo_iks01a2/doc/img/x-nucleo-iks01a2.jpg b/boards/shields/x_nucleo_iks01a2/doc/img/x-nucleo-iks01a2.jpg
index 05dedec1f2f..ae854d4f79a 100644
Binary files a/boards/shields/x_nucleo_iks01a2/doc/img/x-nucleo-iks01a2.jpg and b/boards/shields/x_nucleo_iks01a2/doc/img/x-nucleo-iks01a2.jpg differ
diff --git a/boards/shields/x_nucleo_iks01a2/doc/index.rst b/boards/shields/x_nucleo_iks01a2/doc/index.rst
index 36c7491b508..7cd19653b43 100644
--- a/boards/shields/x_nucleo_iks01a2/doc/index.rst
+++ b/boards/shields/x_nucleo_iks01a2/doc/index.rst
@@ -15,8 +15,6 @@ The X-NUCLEO-IKS01A2 interfaces with the STM32 microcontroller via the I2C pin,
 and it is possible to change the default I2C port.
 
 .. image:: img/x-nucleo-iks01a2.jpg
-     :width: 350px
-     :height: 489px
      :align: center
      :alt: X-NUCLEO-IKS01A2
 
diff --git a/boards/shields/x_nucleo_iks01a3/doc/img/x-nucleo-iks01a3.jpg b/boards/shields/x_nucleo_iks01a3/doc/img/x-nucleo-iks01a3.jpg
index 03eba48eadb..f552fc83568 100644
Binary files a/boards/shields/x_nucleo_iks01a3/doc/img/x-nucleo-iks01a3.jpg and b/boards/shields/x_nucleo_iks01a3/doc/img/x-nucleo-iks01a3.jpg differ
diff --git a/boards/shields/x_nucleo_iks01a3/doc/index.rst b/boards/shields/x_nucleo_iks01a3/doc/index.rst
index 577883cb283..c18647cfb7f 100644
--- a/boards/shields/x_nucleo_iks01a3/doc/index.rst
+++ b/boards/shields/x_nucleo_iks01a3/doc/index.rst
@@ -15,8 +15,6 @@ The X-NUCLEO-IKS01A3 interfaces with the STM32 microcontroller via the I2C pin,
 and it is possible to change the default I2C port.
 
 .. image:: img/x-nucleo-iks01a3.jpg
-     :width: 786px
-     :height: 543px
      :align: center
      :alt: X-NUCLEO-IKS01A3
 
diff --git a/boards/shields/x_nucleo_iks02a1/doc/img/x-nucleo-iks02a1.jpg b/boards/shields/x_nucleo_iks02a1/doc/img/x-nucleo-iks02a1.jpg
index 560cfe7b75c..e881f9e2575 100644
Binary files a/boards/shields/x_nucleo_iks02a1/doc/img/x-nucleo-iks02a1.jpg and b/boards/shields/x_nucleo_iks02a1/doc/img/x-nucleo-iks02a1.jpg differ
diff --git a/boards/shields/x_nucleo_iks02a1/doc/index.rst b/boards/shields/x_nucleo_iks02a1/doc/index.rst
index 4689c2083b5..2dab5a453f0 100644
--- a/boards/shields/x_nucleo_iks02a1/doc/index.rst
+++ b/boards/shields/x_nucleo_iks02a1/doc/index.rst
@@ -16,8 +16,6 @@ The X-NUCLEO-IKS02A1 interfaces with the STM32 microcontroller via the I2C pin,
 and it is possible to change the default I2C port.
 
 .. image:: img/x-nucleo-iks02a1.jpg
-     :width: 426px
-     :height: 395px
      :align: center
      :alt: X-NUCLEO-IKS02A1
 
diff --git a/boards/sparc/gr716a_mini/doc/gr716a_mini.jpg b/boards/sparc/gr716a_mini/doc/gr716a_mini.jpg
index c14ffe92e93..112552facb3 100644
Binary files a/boards/sparc/gr716a_mini/doc/gr716a_mini.jpg and b/boards/sparc/gr716a_mini/doc/gr716a_mini.jpg differ
diff --git a/boards/sparc/gr716a_mini/doc/index.rst b/boards/sparc/gr716a_mini/doc/index.rst
index 87fd92993f9..c09374996e7 100644
--- a/boards/sparc/gr716a_mini/doc/index.rst
+++ b/boards/sparc/gr716a_mini/doc/index.rst
@@ -17,7 +17,6 @@ The GR716-MINI development board provides:
 * Miniature 80 pin mezzanine connector (bottom side)
 
 .. figure:: gr716a_mini.jpg
-   :width: 543px
    :align: center
    :alt: GR716-MINI Development Board
 
diff --git a/boards/x86/acrn/doc/ACRN-Hybrid.jpg b/boards/x86/acrn/doc/ACRN-Hybrid.jpg
new file mode 100644
index 00000000000..5bf9c65d27d
Binary files /dev/null and b/boards/x86/acrn/doc/ACRN-Hybrid.jpg differ
diff --git a/boards/x86/acrn/doc/ACRN-Hybrid.png b/boards/x86/acrn/doc/ACRN-Hybrid.png
deleted file mode 100644
index 9eb466d636c..00000000000
Binary files a/boards/x86/acrn/doc/ACRN-Hybrid.png and /dev/null differ
diff --git a/boards/x86/acrn/doc/index.rst b/boards/x86/acrn/doc/index.rst
index 943b024413a..39b47a39267 100644
--- a/boards/x86/acrn/doc/index.rst
+++ b/boards/x86/acrn/doc/index.rst
@@ -13,11 +13,10 @@ and safety capability can be assured without influence from other
 VMs. The following figure from ACRN's official documentation shows
 how a hybrid scenario works:
 
-.. figure:: ACRN-Hybrid.png
+.. figure:: ACRN-Hybrid.jpg
     :align: center
     :alt: ACRN Hybrid User Scenario
     :figclass: align-center
-    :width: 600px
 
     ACRN Hybrid User Scenario
 
diff --git a/boards/x86/up_squared/doc/img/up_squared.jpg b/boards/x86/up_squared/doc/img/up_squared.jpg
new file mode 100644
index 00000000000..ecc0f6b887b
Binary files /dev/null and b/boards/x86/up_squared/doc/img/up_squared.jpg differ
diff --git a/boards/x86/up_squared/doc/img/up_squared.png b/boards/x86/up_squared/doc/img/up_squared.png
deleted file mode 100644
index 11f6dda8593..00000000000
Binary files a/boards/x86/up_squared/doc/img/up_squared.png and /dev/null differ
diff --git a/boards/x86/up_squared/doc/index.rst b/boards/x86/up_squared/doc/index.rst
index 2f9d8a12681..7fb70d01780 100644
--- a/boards/x86/up_squared/doc/index.rst
+++ b/boards/x86/up_squared/doc/index.rst
@@ -11,8 +11,7 @@ performance and low power consumption. It features the latest Intel |reg| Apollo
 Lake Celeron |trade| and Pentium |trade| Processors with only 4W of Scenario Design Power and
 a powerful and flexible Intel |reg| FPGA Altera MAX 10 onboard.
 
-.. figure:: img/up_squared.png
-   :width: 800px
+.. figure:: img/up_squared.jpg
    :align: center
    :alt: UP Squared
 
diff --git a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-block-diagram.jpg b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-block-diagram.jpg
new file mode 100644
index 00000000000..2d35b15d577
Binary files /dev/null and b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-block-diagram.jpg differ
diff --git a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-block-diagram.png b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-block-diagram.png
deleted file mode 100644
index 65adba51b7b..00000000000
Binary files a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-block-diagram.png and /dev/null differ
diff --git a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-back.jpg b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-back.jpg
new file mode 100644
index 00000000000..780a9202026
Binary files /dev/null and b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-back.jpg differ
diff --git a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-back.png b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-back.png
deleted file mode 100644
index 6d05551a0ab..00000000000
Binary files a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-back.png and /dev/null differ
diff --git a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-front.jpg b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-front.jpg
new file mode 100644
index 00000000000..8cb975f01ce
Binary files /dev/null and b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-front.jpg differ
diff --git a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-front.png b/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-front.png
deleted file mode 100644
index a1cf3a42109..00000000000
Binary files a/boards/xtensa/esp_wrover_kit/doc/img/esp-wrover-kit-v4.1-layout-front.png and /dev/null differ
diff --git a/boards/xtensa/esp_wrover_kit/doc/index.rst b/boards/xtensa/esp_wrover_kit/doc/index.rst
index 838efef2d49..b851756cdc5 100644
--- a/boards/xtensa/esp_wrover_kit/doc/index.rst
+++ b/boards/xtensa/esp_wrover_kit/doc/index.rst
@@ -31,10 +31,8 @@ Functionality Overview
 
 The block diagram below shows the main components of ESP-WROVER-KIT and their interconnections.
 
-.. image:: img/esp-wrover-kit-block-diagram.png
-     :width: 837px
+.. image:: img/esp-wrover-kit-block-diagram.jpg
      :align: center
-     :height: 415px
      :alt: ESP-WROVER-KIT
 
 Functional Description
@@ -43,7 +41,7 @@ Functional Description
 The following two figures and the table below describe the key components, interfaces, and controls
 of the ESP-WROVER-KIT board.
 
-.. figure:: img/esp-wrover-kit-v4.1-layout-front.png
+.. figure:: img/esp-wrover-kit-v4.1-layout-front.jpg
      :align: center
      :alt: esp wrover front
 
@@ -51,7 +49,7 @@ of the ESP-WROVER-KIT board.
 
 .. _esp wrover back:
 
-.. figure:: img/esp-wrover-kit-v4.1-layout-back.png
+.. figure:: img/esp-wrover-kit-v4.1-layout-back.jpg
      :align: center
      :alt: esp wrover back
 
diff --git a/boards/xtensa/odroid_go/doc/img/odroid_go.jpg b/boards/xtensa/odroid_go/doc/img/odroid_go.jpg
new file mode 100644
index 00000000000..ad0c86ecbef
Binary files /dev/null and b/boards/xtensa/odroid_go/doc/img/odroid_go.jpg differ
diff --git a/boards/xtensa/odroid_go/doc/img/odroid_go.png b/boards/xtensa/odroid_go/doc/img/odroid_go.png
deleted file mode 100644
index a682b5a240e..00000000000
Binary files a/boards/xtensa/odroid_go/doc/img/odroid_go.png and /dev/null differ
diff --git a/boards/xtensa/odroid_go/doc/index.rst b/boards/xtensa/odroid_go/doc/index.rst
index 7a0ed181165..f3f1839f61a 100644
--- a/boards/xtensa/odroid_go/doc/index.rst
+++ b/boards/xtensa/odroid_go/doc/index.rst
@@ -24,7 +24,7 @@ The features include the following:
 - Expansion port (I2C, GPIO, SPI)
 - Cryptographic hardware acceleration (RNG, ECC, RSA, SHA-2, AES)
 
-.. figure:: img/odroid_go.png
+.. figure:: img/odroid_go.jpg
         :align: center
         :alt: ODROID-GO
 
diff --git a/boards/xtensa/olimex_esp32_evb/doc/ESP32-EVB.jpg b/boards/xtensa/olimex_esp32_evb/doc/ESP32-EVB.jpg
index 114e6ddc7e3..82759b11afa 100644
Binary files a/boards/xtensa/olimex_esp32_evb/doc/ESP32-EVB.jpg and b/boards/xtensa/olimex_esp32_evb/doc/ESP32-EVB.jpg differ
diff --git a/boards/xtensa/olimex_esp32_evb/doc/index.rst b/boards/xtensa/olimex_esp32_evb/doc/index.rst
index 22f1a7f8f5b..33fdf22a7d2 100644
--- a/boards/xtensa/olimex_esp32_evb/doc/index.rst
+++ b/boards/xtensa/olimex_esp32_evb/doc/index.rst
@@ -15,8 +15,7 @@ The board can operate from a single LiPo backup battery as it has an internal
 LiPo battery charger. There is no step-up converter, so relays, CAN, and USB
 power does not work when running off battery.
 
-.. figure:: ./ESP32-EVB.jpg
-   :width: 540px
+.. figure:: ESP32-EVB.jpg
    :align: center
    :alt: ESP32-EVB
 
diff --git a/boards/xtensa/xt-sim/doc/img/xt-sim.jpg b/boards/xtensa/xt-sim/doc/img/xt-sim.jpg
new file mode 100644
index 00000000000..8979ab54d5e
Binary files /dev/null and b/boards/xtensa/xt-sim/doc/img/xt-sim.jpg differ
diff --git a/boards/xtensa/xt-sim/doc/img/xt-sim.png b/boards/xtensa/xt-sim/doc/img/xt-sim.png
deleted file mode 100644
index 70a83dcf5d4..00000000000
Binary files a/boards/xtensa/xt-sim/doc/img/xt-sim.png and /dev/null differ
diff --git a/boards/xtensa/xt-sim/doc/index.rst b/boards/xtensa/xt-sim/doc/index.rst
index 0e4a572a69b..d8a4b9c5993 100644
--- a/boards/xtensa/xt-sim/doc/index.rst
+++ b/boards/xtensa/xt-sim/doc/index.rst
@@ -13,8 +13,7 @@ addition to a base ISA to tailor the processor for a particular application.
 
 For more information, see https://ip.cadence.com/ipportfolio/tensilica-ip/xtensa-customizable
 
-.. figure:: img/xt-sim.png
-     :width: 612px
+.. figure:: img/xt-sim.jpg
      :align: center
      :alt: Xtensa Xplorer (Eclipse base frontend for xt-sim)