diff --git a/boards/arc/em_starterkit/doc/em_starterkit.jpg b/boards/arc/em_starterkit/doc/em_starterkit.jpg
index 0dff5f5b81947b72ec80795aebc1630b732c9b14..c3deb7d649e04663bb1a137cde7ff5eb0c3aab05 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 7d5621853f40f4f9e3dd55129cbb9bd1c50b45d1..79e73a591d88457bf4b8433ed6b9775ee021ae5e 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 b017453a5205956fc6a2cda4a6466775fa9b517a..7c22b530ffabeb967cfc12e71b03a250c7b667b4 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 6bda0a943a6754de4a00aab93e7dbb5df0fd1c15..664035dacd214c8f26e834918eafd33f76220071 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 7f0c509de9a4ad0d92d2e11378b39e015b79cbf6..12efeece84afc5b6ae6f27fca7cb36042ef17487 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 afee5ff6e3968bd0e038e08784c53f909ee25757..3c7e595747c60cfed7ebc28702e6885f060bd48f 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 27d9d11bf2377bd07d9d9aa976d5b1bcc1cfe6b2..5d5fb1aa521c1c124acff27f97835b7c136ee1c7 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 410e8b276851943f6db16a79dab83135dd078aef..ae95d586d3532b3cd1cb35daf02ed4811bfd6499 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 616ec96042676b66572df96cd1840d5a394606b7..8e2b8a3f6d1f3ef5123d38f4741bb2bcd2256114 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 951ca8b8513c1f10e656824116fa84ca73f4bef6..e3fd707f9ada70026a8ea7f5d5f291fac9712dba 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 10fa3e0f58c6cdf2c46656896f5a578775d26404..d06de1c7c8c808469eadbd7196428ae9d74672b4 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 08a3f6768f295c566cf23d0933071d7d0b64ad85..175fe31899b7d9df57610b31d192e967ce8b2129 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 aa8661b577d4685cf19981164bfc3d918f8252b1..fbfee1f00810dd3277a9eeebe6dbd02c90398a91 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 69987e482a4623d8eb05e65feda34c17ddffa7c4..e5ddc9df956c4c588abfce341aae8f1dc7b5cbcf 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 98a67b5b674b8b3f4911b9d1789c14daff8bc7d2..0cbed5921564d4b21413290a0f10e3e4957b9795 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 0000000000000000000000000000000000000000..2df3664bfef50945bce9fd41e08b6bfd609ffa4c
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 4c509bc92781944f13f055387060db2a36fd5e16..0000000000000000000000000000000000000000
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 cf085d90c9dd4486f7dff0dc26ea2898113ba999..de7e1393182946814a1cc512efa227ca48494b52 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 0000000000000000000000000000000000000000..9f9bd49fac58166a33452a1d70d706e8c3e75546
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 2c27def9aef6af94d670c51e7ea849be3008590d..0000000000000000000000000000000000000000
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 520d84393b84cec1ead19c64121a1966e464c919..608e77e2b42c12501307fe649777851149aa8a76 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 0000000000000000000000000000000000000000..9833a9ebab43fc88b72a74e2463ad74c97352425
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 d233d097e318b95379b006fbd6c9afb9e896ab55..0000000000000000000000000000000000000000
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 89fdbb44f549ec281711f84f5a5059e3a6e2825f..5a17733d35ff892386e94a1446bf359b319b6bdc 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 5be76a5105f6810740433cdecde19dff66f112de..fcb7c11b9c37a386328a07cce96569abf06ae2e3 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 4ee87e563943afc3566614ac340a4fcaf50bba67..17e7f4bf9693999fc426baab4cf7519a20b6c055 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 d530f6916eb50a72d3478799920fa983daaafcf8..8f0311259e1d894b983afe1a6733260ec0f6d2d6 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 0000000000000000000000000000000000000000..69e2df3345bda779e1bead37c8dc83096061bf8f
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 fc28794a5d45f2c105bdd127f78b95cf8c29fd2c..0000000000000000000000000000000000000000
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 2aeb1085ca4f630142ba196c6c4d69f0bc59086f..86e08e96ccff855174d0fd75bb13c364d14a9267 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 0000000000000000000000000000000000000000..b5a3383a57bdfd0356e8131941fd2a4db9cad9f0
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 9609f1256b98790622641ff5059ecb6cfc610eea..0000000000000000000000000000000000000000
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 5702cbd51348673b9f8e1f86229a81f3544e3d66..1160777bb0f7967d4fffc201be29da497d8e2018 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 500e218df9844e0f0089d52be7792e6d5af1d365..58bb3ee18b88123aa1f73a380cd9221483e36774 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 0000000000000000000000000000000000000000..d45d1c22fac8099bc20ed1c8c501aec90681f186
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 be1d14d55cc2f8daf4eb312bde0b69f937fd195e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..40ee6259a33e5926d70a487df71e56b46590bdcd
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 4534a5c922e7a3e2a7b21d9e053ebb39409d6e35..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..629dae3ffb344dad815a53829c52030e7f669e68
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 39540528a224353b4f7173f25f3c2b0c16ca2242..0000000000000000000000000000000000000000
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 a9ce297fbadfdc760186ec0144dac7f47d282335..7f040e6630ec8ae15740ee92a02ad11cb00bd79d 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 0000000000000000000000000000000000000000..fd68bd7fe6714c3a03a73d834c10dbd9ce194cdf
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 3bda407f10d3981023dc67b216691ba30e91a8c9..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..aa8efe902b421beb7738123818359d5dafa8aa41
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 0ff49c8519c9db35e88196ec5a5c4b698ef15b43..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..edb843c6a4671049c1984533c965b9d9dfed3cf1
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 09626c4a0fe128fe6ff580fadb69472f8b26b2b6..0000000000000000000000000000000000000000
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 159dad93473cfaef2776e0c7abe7c753379671ab..b6d166900aa2694b5450f9cfc6f84d8be85426bb 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 0000000000000000000000000000000000000000..4492de2a93271919fa56f63be4197cc4c233f773
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 910471fc2673dd6bd4f7354b8171ab2ce8cb39cd..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..0fe6a2e56e92117cb3e1dc5ab67f77256850b224
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 0b5fca9f9713c0c79659c70d02bea7b8204a5985..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a48d455ee5b59e0bb30ca4c320c4f8d47e03c44a
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 36b583bac2bf552df5527897ce6c8a9d54fdd8eb..0000000000000000000000000000000000000000
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 3426ac0052033ed2095c8b7063f2ca5dcf9d3c6a..6c22d627e11d0ed479b3c2e7537ba112660a94f4 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 6a806da2ee056aed98a49363a87091e70a74756d..de8afcbed2a4d8b9825c4d70b620f5bf299c2bc4 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 2344e200383628c86aabddf5cb52462ae2646311..680de554fbbe000f3969130a6e0fd7bee8b6e3d5 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 e83c5353d69eeb309c748a9a195d1a926d92eeb0..13c06db34878ca79b24d50d8bb8869952d202509 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 d49564a55702a7f475a86c1d3cdd5427c95e4793..6110da15dca7885c4699c0bc0500fbb5c57ebd6c 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 139237bcfe5ac840b62ca2288dbb3bedb2b1b642..ed95a3090141c420e0247fc94fbe1ebc3637af78 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 2dcd3ce64f952f7f413fdc8f55783d2596e0cb16..1e80ba70b49769de2fe2133dc2f5cbf5b14d0ff7 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 0000000000000000000000000000000000000000..2aebf616b51faaa32926a6d8a05c952a115f5e61
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 ba04458e3960c394ad01feefe82950fd725e8e66..0000000000000000000000000000000000000000
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 06a0691d299efb1c5a1b7d08161a784b97f5cf0d..025a037d7f1b3903f3a8de28d9a9b7170f4085da 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 0000000000000000000000000000000000000000..f375b29ad5272a577ab63f9bf2b6bde674fbf0fc
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 18d623baedd321459bdff3cf777781be71a0cab8..0000000000000000000000000000000000000000
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 7aeea8a6461b1b3426e08f19b43171e84fea9c8a..07b7ce428cfb32cfa4bcbfe5b1baf7748fc3d687 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 0000000000000000000000000000000000000000..43ea9367905cbc206f1156067032e09ef11e947e
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 e77472d00fafe58f400c87d103cdc280829196ac..0000000000000000000000000000000000000000
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 53c34ce3d5aa1a3985b573188d9cf45c692695cf..f607298e133f19392fcf7efa162a08a1fc774e8c 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 0000000000000000000000000000000000000000..78ca006568d875441574a77f72967d75e06067d7
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 e563973734b2c6e223aa266c83346b2160b5f424..0000000000000000000000000000000000000000
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 145269220d8163672f5599a84d6a12252d6d7019..3df9ea49d19aee71aadf958d925606ec87d32169 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 0000000000000000000000000000000000000000..e903d7904ff10e23741a0cef0630a7795bb62a4b
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 ff68d9730602c23408473e015c2e61a711328625..0000000000000000000000000000000000000000
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 28cf8eef5591d3d0e2a5139fd44ae58599f09feb..47a0bd124a1f9bee84c344d8041077b07768ee31 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 0000000000000000000000000000000000000000..adc9e7e02f98bfd1ee19ea6fad115dfb19ce7c27
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 d5beace56dd721a42f7fa11ecd773c515c839821..0000000000000000000000000000000000000000
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 51b41165196c4d36e7726faf36984022a89f1fc8..64e89e717f5f782ce1f38009841e53fb817e9c38 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 0000000000000000000000000000000000000000..122e8ac4440427e61171a4a1bf1063c1d2d8d6be
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 311062784a16e0869e5a3cd474f20ed93c491749..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..3886dc9d57a8a682ee3191128fdb993127080356
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 76447d4f7d09f1351d967f314bd989d3ada5e1d1..0000000000000000000000000000000000000000
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 279493b19f21b5fac512592af2754dfbdf38d6b4..1c8ad554c34a5aa72769d7ae676bf8a72cc3fb09 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 0000000000000000000000000000000000000000..aa1f1065b55e390e8e34983e6e83d214a505e330
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 20d385648336706c37a5402b076e97e0281bec27..0000000000000000000000000000000000000000
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 1952c3fd28aca762dd81d76aecbfc26a69d847f4..c178c2e53771ac77617bb881411750e4f8c01b90 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 0000000000000000000000000000000000000000..1fb25d59b9d9c3cb73a2fad3fa9becd8ad549c9e
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 99d11a76774b28dbf3d2b295fe853d8bcd87e0db..0000000000000000000000000000000000000000
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 57ca26e03d474ab8a249997b5f042a82752d09f1..58f0e467f6c51de67e78b7bb6408ff04a67768f9 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 0000000000000000000000000000000000000000..e4a0226461a386409311ee333856dfb307942891
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 92929bd11d7520cbc9b10ae24008f320b8bc1767..0000000000000000000000000000000000000000
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 fd917c709d6fa471d044379322627feefb41de7c..0e00488b727217fa68c60e19c82309b52dfe359f 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 507eb13b025b2a3ad66d396087fb8677550b30a0..27f88fa728fbd6f52d790832a07d34cebbb148cc 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 de5adc3639d8aaa3cbf9a05d33ef4f34ab756f27..fee9662bed44b6a8ad639ee485e162e5c2e3cb2e 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 0000000000000000000000000000000000000000..e9b3e44de8ad5e3af34f3b7a6aa4b2154a360cd2
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 da729dedf63cc9122f189d1ad5f0c0b9fa3372f0..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..506174c26d66b5b5a9176ba869be28d4a539c4cd
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 6b379a5a6e7c813d1042734dde32d398770dfd00..0000000000000000000000000000000000000000
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 cfc056b0cc77561d94d80782f4d09d6f4a353375..c1443191cba6127c6d343f341a019a8b02965d5d 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 0000000000000000000000000000000000000000..a15a990c261a05f3ed5708a551824ba56ea01647
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 d9809aa771abcc1f604450e79527806a06a4fc0f..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ca493cc2ef2b0461dc202896440df64cb50ce8b2
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 3fae378ae31727ffcfcbb9a9520fc59163cad0ed..0000000000000000000000000000000000000000
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 ca8e1742e8337d16a2428f0897cd6be1348103de..b08c7e3e367d4e71046a6d63f4f5a09d18ff1231 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 0000000000000000000000000000000000000000..a02d42090f3ad7b4cba7476a18f21dfeb17ece18
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 043b328feabcc9df41bb0c28b7e943678931ede3..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..6ec02a691c6674800e133f700f87391a6ee7c650
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 1f6bd108fe65c8f3a618b8bde15b1fdeecbb345b..0000000000000000000000000000000000000000
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 783a484448805b31f89c6b84d45aa3da69471d98..2051b9efa189096b981924f5201807b5ce35e516 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 0000000000000000000000000000000000000000..c3f25b355b737e7da9b42ea2ec7020c23428fcf8
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 28dfc5251480dee53fe4518a74fe562889ba45d1..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..161791d0f835877c29c09930d9e96ed3b4f5532a
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 63a6ec2ce130f6adbed9fe9aa7fe2367cc32a747..0000000000000000000000000000000000000000
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 cf35140a2b72ab6fe0bf2b527aa4b2676282b76d..be3bd2b4dd34914a80aee091ed140ee9f087f591 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 0000000000000000000000000000000000000000..f0827727050fac5ad454478821bb9e95a63db5c5
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 0818688ef96a1eccc6a89323c2cff8c3a818710d..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..f4c79058c53a362184a1b1e28b8b6b24c74a36f1
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 04e06ee89f650c928d19fcafa7a7dc194d7c2549..0000000000000000000000000000000000000000
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 56879c364dfbfb353f9adfedfbc19c38c3f5dd6e..051245c5d392a67f331f6bc26d79aa1ee8773b86 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 0e40cc5351ce7fb2977af71687eccdd254631f48..0fcc393b2adf828f291c84cab04be76645c102d5 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 658f175b8f911d6789d588dec2cf418f81a9875a..30aa1719dd26b10fd385dbb727b6ef2e7d4534d5 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 0000000000000000000000000000000000000000..6ec49d39b0f7c80a5df59ed49e268cab7a4e89f0
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 87fb6d1b83e1bb303d938e2f0d73da15f06b6720..0000000000000000000000000000000000000000
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 d94123c051824f94111bd1dbedc7e3803be307ef..9a28af18e39a8ba275309b28cca3cdd7e075c091 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 4331b958b1f3ce81cc03c6455eda1033b5a85224..120e6c675044309160aa01e26ec9318dc38a0492 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 c61d0646bf4542b6bddb2e3ff45780a3556121a9..14d9480707b01177061dca545647056610281482 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 6fe7baa7faa86eca009c0085dc3b64f90daf6faf..e7c31dbc1f722012aeebfe15006a0837cd1a6154 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 d0bcedbfb72d333da1e24b67d2f1ff275a4d6144..31b1118f96a3cbc7e25bf7492346af542c625efa 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 0000000000000000000000000000000000000000..39c5a20c2205574ad2a870158d89d65a52876b1f
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 8eba9e8e4db866d8c2582b970cccccfa582c5a16..0000000000000000000000000000000000000000
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 465b0b1e90088909b1f5e371707e36b634448127..aa36d3d662bfc0661b0721e424bcc350798989c0 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 0000000000000000000000000000000000000000..d4126317bc5bda91c5c3c0e42153fdb4531986eb
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 a2a3d98be0a844109d2d654718766cdec0eded28..0000000000000000000000000000000000000000
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 e6d67d4afbd7eddd7dd6e6b6ad0aa978994cad84..7c94a3e5a4e414bb938283ec7ecd1af1c5a1e50c 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 0000000000000000000000000000000000000000..712a2be971cd9d9cc48572c1d2547b4ccdc0e079
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 6e6782e561da86ffb2e4f162a150b1d9a3efd445..0000000000000000000000000000000000000000
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 f92a83dea583c1e5f36fbf63ac472402509c5c2a..efe6984a0d494f7fb11de6ede0818ac961910ab5 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 c994309315bd1519d2a31577a1a1adf9584dfce9..3fafbf1c34bfcbc83a0c20e6722229d235c2d2e7 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 fd2d138289794ac7fe3d8a9bc4e02b39eb40af5f..07ae2e5a23e9702d5927981dcc78ba828b64d60e 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 4b1fc2314a6030f9c846b610896df2109a25fc20..d35ddb3de577bf329ff3a980fd8a6ee4d6dcbf9a 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 ba22234fafc6ad01c1fcd40f7d9d6bba6f7f1a05..98c6bbf23aaa0c72b4ab8c26642e94a99dce7b63 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 a1c80bae69f9b3f2ed46f578a90ed1aebce7efa9..07ed13730a5a3a540a348d9531d53f156fa66ee3 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 f64e85918cbf8e3adfc52f4b0a23b2007026166a..4ae9f496d6f7d6b5558eab8a1a4f49f5f96fd738 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 e6ec63f15d8197cba723fe7177ce9a1c1fc9b388..b40e641f0367baf0516be1c4f8ed1ff6e9a56568 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 01277ac0239e11cb4b2b4915d9cc6b8778b68334..6178c02cdb306f2b4ccfdde8b0ea20c873f2ad61 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 92783aa35ff6bbd798d7e6492f0fdae575d582d4..7a1c79f48040ba495e55038d4fdc48914bc608a0 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 0000000000000000000000000000000000000000..95b247661d2dacba989092cb75798dab139a4cd2
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 6d05c33d3860eaf36b610488cc23b4e14a9cbed9..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..e8ef1064c1549dc1db02143ae81880ec5d274de0
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 9cc9a2da60e3b4b458a4126cda9fba0032112400..0000000000000000000000000000000000000000
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 2c5b5f5335289ea69db583ac5eb3c46442e30579..887a2c82685646e149124ce730db01e8b86850a2 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 d05af0ead27566942e89495832dd96bdab6f4de8..4c129e7864a90cffb07ca35b5e28daf96d40412b 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 879254326ce54461fec24673fddce121630efebd..b095e64917225756dd8876b98e00a6b6de5c08a0 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 bdcb58d1eea44058af4e261738a36780de5a4a59..bc0008ad326ac4ac2fa904e18a586c21909caad2 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 688b5f5629c9ec01126fd32079122f1aa5f28294..a8280ec0d1517457812b1e26f5b1663b6c6bb35c 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 0000000000000000000000000000000000000000..a0a90aa16584b198abfef7ee8a60d40fb479805e
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 fe098e5db6045e6459f77f4bc0dc5e2dd99f1ed3..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..bfb9b4b1c3a00dc35dfb644783fc1d845936643d
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 d8c34780c15911b991780a1db778ab279ffc1599..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..c17304ba84a45035cfb70fb24c6a720fdf964514
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 c7a85310a5be17bd12abfd73c44102ad7e995a24..0000000000000000000000000000000000000000
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 97ec9886e02c7966d1e0c1608bf42e3f9e66c654..86af49bb477da2c6bbe3d87d4eb7bf1f94cc186b 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 bcd4aa7eb07352c9fb9726664ddb2c7112a9ce4f..20a223eff3a5a5b3eaf5b497cc2e0d588a44c0ab 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 7c0539e00ac96be481f01bb673a93b947e964ab3..18b44f3adf4d3f8707b85ae769a72fac8c607a29 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 0000000000000000000000000000000000000000..b16f4610b0869cf58e8b2fc33a3a5afcf18e6ac6
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 3f15c620d208ef058c5b094a81272aa2d90199df..0000000000000000000000000000000000000000
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 d4687d8e0c8515775cf453fbaa5fd28ff02041e5..184ec306f9b6de79242e78febea30bfeea73fcce 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 2af413c3abecd3a21a362f87f651ff03ad16c6f6..e4ba748e258a793d306a5b260a17ad33f3dcaf4a 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 0000000000000000000000000000000000000000..b16f4610b0869cf58e8b2fc33a3a5afcf18e6ac6
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 3f15c620d208ef058c5b094a81272aa2d90199df..0000000000000000000000000000000000000000
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 d4687d8e0c8515775cf453fbaa5fd28ff02041e5..184ec306f9b6de79242e78febea30bfeea73fcce 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 a252d244e75840a406b0c22d64261f9c7090c2d9..da8f63df258e1ec7ae40b857da02eafc8b17dd09 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 0000000000000000000000000000000000000000..b16f4610b0869cf58e8b2fc33a3a5afcf18e6ac6
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 3f15c620d208ef058c5b094a81272aa2d90199df..0000000000000000000000000000000000000000
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 d4687d8e0c8515775cf453fbaa5fd28ff02041e5..184ec306f9b6de79242e78febea30bfeea73fcce 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 32ee1e9159e378880cf4be21fd5bbe7ae2de48d2..877556288f27569759da135726beef366932fcc2 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 0000000000000000000000000000000000000000..55679b6c9c38a8c9473f3c01c9f0ad9b4d6d351f
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 78b0aba5360ac437a9b2069d94a219169e64078e..0000000000000000000000000000000000000000
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 33e3bae5f863d8ab7b96a4e93f13167344b799eb..517572c3d961d2c696832f940ef3a879c25e2b96 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 48e2d95b1b1ddda64645d30122174c570242577d..1d5290fe1e60406ce45cbb8ae7da7d85b1a0d8e2 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 0c51c4a05409bbcdddc56d880fadf5a9c9400c75..74d5e9b2bf202e78db0e5d47266cd4decfb9f97f 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 56d657ed389e26dbfbb6277a75def2f04f0bf486..ef0032b8b23d4f6c1b74078a30cb7b9a5912984d 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 0000000000000000000000000000000000000000..42a524470c8189df8dce121bcb4abe998b063035
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 1a9d407f5cb02ebe87cf142cfee0ff33059dee52..0000000000000000000000000000000000000000
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 c393e3ab82215a5e6638a4e810770d8bd4e9b1f6..e792f91ec57166d4bcdaa16e42eaaf05f2f9a4da 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 ba903ec515163da223aeee9148ac0532eb3d2371..29d7da710d7c93723e744af5655994691a5d1bac 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 0c3d355b01972927b028873690e23ea941c1f8b7..e3b9dabb3926fc031d2b8c64d33f3f1cbd76c02c 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 61dad863f1ed3d7faad899de6a995d23c7f6c339..c0a2c8d110d7b2b4921d90496c0ab19511d80ca0 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 0000000000000000000000000000000000000000..58b122a901a3d4c88a858da53bdde9d5360f9fa3
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 68bc07189965229620deac0058b09d2d2a555b90..0000000000000000000000000000000000000000
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 ebe45d806dc26f20753d5edc06aa552b345431d8..30afada55feca2c21dc88c2d659357254d142431 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 ad1ae2304d2719c2293c3d25f860c9cb9ccbee2c..c3e45bc09d08621c7233b150a77e5a8cecdf83c5 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 0cf75446c8b380ad830b060fcee6e026bd650c3d..4e6815c8cda3e547af4dec9362d0f711c912fe0b 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 1f7588a44798fc965456e5ebbe084bb336c8be84..577d303f4dd86df6c3946805dc6246f73c23fa12 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 0000000000000000000000000000000000000000..0ad5170fac9f2a9cc2f7a980c54879acf7938ba2
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 4ae7674b9e4c657a3df8ce33a4faf3bc4cc11ff1..0000000000000000000000000000000000000000
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 902360657d3fb88002425e2856e5c2b3489bbaf0..052eeed4dc515a72d8141d1b4c1594d742ad1d1d 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 0000000000000000000000000000000000000000..2496e5b4275b0dbd7a9144d7e534a3f221f02dd1
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 238a06e09733cbebfa6e6efd4ffe5412f8727ef0..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..5f316c2d5c4d1a5dfe530ce3af1536a30dc6524f
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 6b21a746620d28b1580af40447bcc5240b2b3c75..0000000000000000000000000000000000000000
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 ffd1d6a44ea0b1a9cc653ea4455f549bb23163f9..025c1638e212ac16dcc7182ccd12b7032eda8961 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 0000000000000000000000000000000000000000..3a0f86f73d9583697d361c961d77f30a742cb433
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 9e15d846db800c9b15bd853e75df11c053d2c75c..0000000000000000000000000000000000000000
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 1c9ecc36677bd4e3cd17b75a2fb7e0a320d2b450..f8de598f7947fb95c6e3c1826eaa0d799eb28441 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 0ffebd739dbe752ef18a9d57b680204c77a9b0e2..1bf737c8fd5741856c5c94f701e15749cfdcd28c 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 ead1ecc424fb2e3725d54b4924489eb3884ea1c0..15f9e52bca8bb1df6ab3b505160ae46e8c8437cc 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 82f2996df957d8e41d3c77bdc676fe0cbefb7c3f..d0c68ecbd3909556eee6dbf2aae03693a940c017 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 ecf49b4e26dbffead505f0b3d1358ed37c3a8e47..d6b77f6da42bb0179c6224097d9cd145040c13a2 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 0000000000000000000000000000000000000000..7481e9cc2e6fbe36c01d9730bb02e94d52391282
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 b48744c3db68125da4e8854048ed71fa4a5961ba..0000000000000000000000000000000000000000
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 1841e7176d4f83f9a5607236eac91030caf98318..ec313afb1204191af967861934a46b72e343974d 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 faac3f3deb14f69ba38be5aae2a07d122cae495a..46c258a03f21eaff303c798cd4d643020c382dc2 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 c0ac79095bd2443cf7f3ddf899187def907e2f3a..d11a8da0b7d093246e3a14404261f911859f5860 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 bdc6c5b89ea39de5027ec632a9dee471bd3766f0..5ef840d7aa5a699800650af5f6e0cd80902bebc5 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 db034b2b1ca67f1b75fb48cf814531cc6bfbd3c7..1f51e20650c88c866ff3c2b58b9ce70dff4147e0 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 0000000000000000000000000000000000000000..73d2fba818ac3b95017c769890f5be62dcaebedf
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 46c612e7557fda1daf23ec13a8759e2b66a27e1c..0000000000000000000000000000000000000000
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 026495b4e1060393a23b9074994757f715c7885b..a252c4273e89810b0534c578aed3107a5a603893 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 557fb6f6446ca6f8969c6ff11ea936623dca688d..97044e71815e0b555e66e9e21505bf97c9629718 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 35fc0c1ef0aa3ffee8d402171bbad2db4ba9b56a..e62bae9b5af91f8ab9fac5f9107a1ef2fed2286a 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 0000000000000000000000000000000000000000..759f00dacccd9d592030312b9dbe51141ddbafad
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 063dc1d6c0948f2e349ecefd5726919f8e2226c1..0000000000000000000000000000000000000000
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 c4bd31049cc7f8daae68668ab2c74edff4ed7743..08471cbba184203ff8ae0fc0b67dc250c6134ef8 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 0000000000000000000000000000000000000000..d3f2eb3d9e046aaec4e11ebdfb9dd093ade0f506
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 1c5ac11493f22b4d96d70861ee16517523a58d6a..0000000000000000000000000000000000000000
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 989928867532c7f28149d7c4c2c55174b74350bf..762125afb3d6e413b71704aa59da47277e515ec3 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 06fd294f4c250a9ea165642c231a86a155fd2dbc..3b83b7d500003b9a3f605eaee986bd6b23db91c7 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 1430f04fb04d895e6a10c09059da3b107a1f0a6f..d679b5f30c4eb4d8c019ebeeb1772a3b9d3ff8a8 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 61b5995b4ec87f73d7a29d7ff2efc2851b7da10a..be1f25efdaa7868ec1b4e10ed4814ecf99135c5c 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 68be3359845e17e4df916a884484881b0454c57d..7b9cac8e3c6ba01a0146a94dafe5c96cabb51e59 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 25c33d94c198f298e2d9438b0bc1c6662a153955..58da7aae769dda2618fb559444adcd049c56ad45 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 20ffece0991e3aaf361e245a765d5fe8a04f4395..50b3d9cd7850a5f5d201f8701c8cdbef3f175119 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 7279694d3c5470f4b681184f4257ef2c7becb324..ffa4c0ae6ee5153d3fedce7ad245ef0f02215df5 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 2d9c9ac9fe0f6eb37ed4e9843f01f4b53bf9b676..6f81474df52a741f08abe27a326c07bda147f72b 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 5c48ef83c1510153dfe85615adf6d98bdc29b83b..22c8aa42a6133c014eb1db29cebbc959d5561557 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 99f7e94bde24c9ced0d62381f0b582d7709df31b..4d646060f257bbf2b9b660f162eeb1e67ddd9389 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 aea6a32e08444959ce31c06674331cdd34e7f75f..0815af72bfedc53b4ca1ae8ae1813d12cebe56ce 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 1a6de113ec9bf37decabd1d71fbee3c388eb42c9..6dfd2fd96e4c625cfe03f501091d442093cb6f1b 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 57384b770b43bd6fcb9233956274e0dc1f6d3caa..48547fbef6e6e196b684a5840fe039c3e42b0e9a 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 b947c92f656a7078d3c36d96f6a7cfc878422331..d624619d83fce6b4a62d7f9b58691ed3d38c2682 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 49073b94ba7ca514d0b4ca97655be1879d6d3bf1..e92874a41295dec02109d241fe3cf893e420451a 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 ab6f9370c7895244e8fff995f3e40e9b49e1452a..870b324a2799564eb0c32b6f21a7bbcdb89ee1c2 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 0b64850e2b6ed900d8a040e3db0ba026d97241f3..f2cf395c1b99216f00070db694ef21d75df82d51 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 7dd82025047c6bea3ac36f24a04e1bef345bb53e..ab81e513c900182a5c76e0381c3add9adc7f910e 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 fedfe99988671fc34af357aea48d8c10c5a40ad3..5a93d75ff94843c40366a49db2d7ca92c172669d 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 edda1a43ea325b656e009f416fa03b5d0ad4a710..545582068314157f6b35e50594136d6f46d41314 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 8451a87ac0895a52a133f3fdf287a15e71f1c6e4..bef358cd5a9a7f5ca0b1ecc4ea166bc9fa8d8f50 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 5d50e488732e95f5106947114281309de9060ff1..172b8faadd7d7cea7ef281fbde74cd64ec71c770 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 1bf01c580802bf45b576a5fc71dc8bb05d34531e..9c87c42a610d6424b705a56b1a124575392c68fb 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 8ce9fdcd00cf1953c1144c444119c02d3588b8d3..9e4f28ed98f48a2594ae8ba2427d989d927ff2cb 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 8099e5e1cc6b614d9ad43a83769e66bc444cb556..636ca1aac4379a46293810e436b1121786fdb24d 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 2d992a2c34f04f7dc665d562b06e760ed73490cb..ba93124302b05827fcba31d62fd05656407d9a89 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 645c118cc3813e4e5cbd94a068ef41c30ed90f7f..7822d895ca9785552bae43bcbe8083453f801849 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 9abfe13debb6c2866a1cbd22d0b7a689587b3f76..ed432753fd7cde15de63763d779721caf1683ec0 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 3802c25cf96ac315e423a0f2e502db0ccba19366..5fac7d25fec7a0ab38f64eae7b94983e814c05dd 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 3b5b96cdba923b279c192d26e6d66c5514f52cae..9fa670c71290a16e4053f7728e307d9ca8458536 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 b13e4fd4e88ad765cf86ff601cda820750a153d6..feee11bfb6f95c9066003cb55e2a78bada4a3561 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 3bb54da8af911a45b5946b809f8b4e5b206bd5c1..c28e4cfb3a8c9af3c2eca8e9f62b400285cf5a76 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 5dd1b00f0b9d9d936a49b3edd5c334d7c4aa2170..54efc6940f8bce7826b20ba8bfec8c25dfdbf7af 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 caf876e90a075b03ebdb0eebb74f1eae5ad58e82..d4955d77c2fe2445b5f353c964ddb0cd73d575b6 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 f2fb0c7a6f05cff18c4c5181e26a85fe85bf5464..6c3000d17b6b71295c600aeb6676baee47eded68 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 dd845bf245ddb97e8b6ea01df4c6292b0c74bdcd..1e6def9f190e203df1127040c2f9972c3d99319c 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 eaf3c87aad11e37a9d39d1ea94ca590190259d34..09f3d9d69e61a2fb540ebae8d81e07d5e252762b 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 0d42422828a86c3471fbe41159634f61f67b0652..4820d4584a23ac88be2374d09fcdf3b40fba944a 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 0000000000000000000000000000000000000000..de29769df49f62d010063face7c3984c544ba4e8
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 3f984b8889dc75e2ae98a075d5573436fc233ce6..0000000000000000000000000000000000000000
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 2fe7efa48392460250da27952568a3c86fda5f4e..ccf1e9b1e3e4d849bd9dbbe2d77cc711d7752c42 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 2177b6b0c06b3f7e2f3f87ab04420a77ba5672e1..2e32c81354443e0f0a58a2fcfc17b5c859a94e3e 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 0000000000000000000000000000000000000000..528d07470dd3355ab43e30a3d073b657858cb951
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 e8c5de489d47ef8bb9df45378f7c3a892d5d358c..0000000000000000000000000000000000000000
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 7aa8ce3bb80b17a32d81b9ced35cda44b968babe..35971620c176429aac98b721efdbfa7b977d5d5f 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 0000000000000000000000000000000000000000..de29769df49f62d010063face7c3984c544ba4e8
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 3f984b8889dc75e2ae98a075d5573436fc233ce6..0000000000000000000000000000000000000000
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 54d3756792123dbd790c5f83b1767781b0ad6c72..4a2f5fffa5fd3450c07c852a00640d4c655978c5 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 0000000000000000000000000000000000000000..032905d9842a827a98ef92e7f4cdaca7ec66c703
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 0fe5f3aed2c5111ecc2cea8cb6406089b20ae364..0000000000000000000000000000000000000000
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 23d4c97ae510d2ebe87dcc21e6d000fad2a23b98..56017e4aef52bb056dd27e5134cf3ce4943bacad 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 0000000000000000000000000000000000000000..7fca77536466f7957c1973153e0c9b81a8140a43
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 a0749adedfb6612ce676631410d522079f09c0af..0000000000000000000000000000000000000000
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 1dcb94c3b89125b49c464ba2ba67f310e8865ade..179886cd0db4c16559c61ef4fb6f1d176880e246 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 0000000000000000000000000000000000000000..d4d870ecb890a8f8247b4da68373e8e5142c938f
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 340af2fabd569f65ea5d552db06a08bb90b9fd27..0000000000000000000000000000000000000000
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 e09f4c8a7741ce6afdce7d3de3ba02d025694028..c28b0212bb1f7d251aa35023584e86b146a6cb07 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 ad9e300008efdf1cb80ea943708e26eedb8412cb..e16f61a96e187eb9e0eba235d8170110863aa91b 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 b78f4d4e1dfeaed226c19b0901663dea2ce179ea..7632ce9c9e0167b2f7ef102b59cb1448c011f8db 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 25be0f24daf39fea20957fe50d913f7821cad1b0..6ca029e4161c2db491ba874705e1b7735707430f 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 0000000000000000000000000000000000000000..7bbe2d0697989f2959acb2e1bed182bbedce1adc
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 448cda8e50541eb789b84e8b8716efca98800dd4..0000000000000000000000000000000000000000
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 495f90cf50a16677d7cb9f14283ea2bdd08525eb..639b04a5470695febfe45cfa480f84337acf55e3 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 38acc3dc1dcc37f1649bbe6901f2f5ddd35497c1..b915b60f1e3a416daea87153e9e0b41075da8002 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 0000000000000000000000000000000000000000..8060b6126c2b1dec7e180eef9b6cda4b234eff48
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 2e4fa19e5f64a46cbd093dee8023085e413a9c4d..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..3f3287b4750a5b2bdd1d0c1bb91e16b0f083d308
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 d307b42333945f2ec343f20c9e534082b841a97c..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..9ac2ecfaddb6d845ceef72dab00711660dcbc511
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 ea56212b05ae26afd5abbfd2e90bd2bd7fdf9354..0000000000000000000000000000000000000000
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 55204f7dbc4ba67980c61d872109f0cd4c6dbed1..c744281d651354f42d2604620dad1f992740d6e5 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 0000000000000000000000000000000000000000..f4cc12ede43b485f4543313dc94d7a3dc578c938
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 051e6c2ea11d29ffe4158bd727716bac5db921ae..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..8822017b4f2780a2b191e633ff00a02637f2b63e
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 2d1c5c9082918c11258d6119a034a84c25abc8ac..0000000000000000000000000000000000000000
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 9625802f89bb0a7e82c1a1c663f461f2abb990ef..a24920002d901a527a63bb902793630d3ce9f65e 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 aa880af08cb827cf08d72049725f7e58aa56b343..75a4b7f15a5aa1bf4c8c6788c485a472fbb9539b 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 0000000000000000000000000000000000000000..2eb887c150944971914d202d168ff48ffef7a54e
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 6c247f766de3e864c6ace9bd0b0ac52b12471010..0000000000000000000000000000000000000000
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 7eafbb80f9dbf75425e11aeaebb6e94e138372e6..c1fff7e4d7b1d944f88f9b7bb8bfafe4254f64a7 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 0000000000000000000000000000000000000000..725f40075a686ef6b2da7c9127c5752e27cc3f34
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 2e89e813d4d6a2206f55ef7351664de5ce086fe8..0000000000000000000000000000000000000000
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 ebec53e7f6861ae3c0ce4e7cb738a32df780c89b..e0d38c663ac3c757901f52bea9e8f3d1d2330f58 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 0000000000000000000000000000000000000000..dd3a1e76043ecc04423340242b5dcc6a8ce755d3
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 1ee717a962d1bccd7e8e6aded4dd58b58f6f9dce..0000000000000000000000000000000000000000
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 775ed0817615783ef61a4061aba7fb5034000505..8ca45df15419f18cbb711673fd73f95268a99f98 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 0000000000000000000000000000000000000000..ad97b295da270f66c58290e34d7cd0989d340834
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 b3f897560c93b78db7447300e943b38540351bd2..0000000000000000000000000000000000000000
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 7ef25d605826c7403836d239da4b53aa964b34a4..5202c6e1b7ef5b3f8aa50fc412c2843b75e41232 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 96c11399d61a9c0a3389be1f87e423ebd32a3674..919cfc7f91e17e058b88ae76b6864494a509478a 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 0000000000000000000000000000000000000000..8aa3f469d33a08574508f73da2add363cdab64a5
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 23676fb92d9df7a2724398c9cb87cd2fa6920a5c..0000000000000000000000000000000000000000
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 1e870c171e2d6fd67cebac40e8ac6a3a8c364fbc..c8d5fec7ce37fa9394a9f044836187ecca41ae7f 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 73ff56d67f213c59f75bccaa5aeea748a175d722..15e12046d5666a0882eecedc3b8b6f42353fa1f6 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 e23bbfc951ca262c968eba2a120e2a0c91624b16..1f4c41d1b9eac0100054d661eb02ce92cc836227 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 097aaa114c96bc7cdab34661ac27c4f73be5f015..a3b70af4ecfa5996b4b4c166bc3f09a6e1e7f6d5 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 29cb54f65e67f9499c40bc76c0103667c8753fc8..556916dc093825d6f269064444849d28ba9018e5 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 381613ca84dd347de99f6a4663becac10585ca31..6e92348a3cd64c15057793583556a6103118b56c 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 0000000000000000000000000000000000000000..e07b3fdb6030b20b9b95675e3bd81176ff2b76c1
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 0e2b95821e76bd700904df46b806167dd85a6cb2..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..e8c932fe4e806fd7cb05ae488c11800a48a347e1
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 ccdd6155ec8e8945ebc762f3ba1ac6202c6179c0..0000000000000000000000000000000000000000
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 25fa116c8ede6a1204ef5c873880fc5bee94f66d..2053e1366a1dbd0e90b86676af10612a7794d599 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 0000000000000000000000000000000000000000..f6798e20e07b0ee40919e1efa70b4d9e9207cf89
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 7572d7a15067bc27624ea2f040e9fa49aeb8e12b..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..9525f683ab6116a896793553d7782194d55203f1
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 8c292f4bece5c399c916a9670dac0a7aaf8b946e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..c89f4d32cc6c47481a65c305631ba7bb6c1964d0
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 d4bedec1feafe136d7a72094bb5524bb170b5b42..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..383fd827c914d3a3fc48a847e2c7834daab6163e
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 7c4d8d8373f6cf1f85007b29c0c891bded3186ba..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..0ae390d5b82556a299fc6c0f8d83a04a4901aad6
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 4e658f1e146ab64089a07ba6448cd503119bd76e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..2b51781c7b177789182980a4b6102720d94f76e5
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 6843c27a8a37a176875295b6b855c7e9a740757e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..d459c74cdb84fabc736730e2ff8c3b5882f8a440
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 68e99b3adf0d35cad50b3405ae353a9f4f6bbb71..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..b68fda1083f52a6bf62ac11ee828c4b3b57901f8
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 5674d21c7e4f2c3b5d240cbc52f7aa1e04dfef68..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..c9fde56cca3e5c8841efb6260841c59ef2b1065a
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 89001b0ebdcb8fc32ec89c6b48abb5ab7d472646..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..11e13cbd24c90757f8d17bc37b117d700450abc8
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 a1243fc5b28ff593e0faaaec11254949e5641b01..0000000000000000000000000000000000000000
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 cf3ec036ce5cfacae60d8275d4e854a45589ef4a..b0806817d941ee401ca5f940d3f9b7fda083a1b3 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 0000000000000000000000000000000000000000..cc4c8ed2c6c6547882d129f5c5ec9f7870bc671f
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 18ffe0c64a6c565dc6d90dd1f21ffe9275ce312d..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..9a6758a3eebc28e875232758ca397e0e8cad3b94
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 360538059cf7bb15b1c50b48f33a29e9a7cae938..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..90c7e5bac682a796e40d56cfc9c35273dda52421
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 55b7ef0683054a116a23191630d5cb19fdb1c3a5..0000000000000000000000000000000000000000
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 20f6c9ebb624b7e0e0552367a987141fb7ebd481..0d37d043e6cf6fde7ae570ef573103115b58d07d 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 277d64f03d97823f7dc5d414ee8064802fdfcf33..85e29fc34bb61a03596d97dd9cb20e34d9d201cd 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 b65ad4517ff54547039f58f34fc3dd914623d294..8e86d3d151a70fff15c0c5f9ddfc9ef2e1266eca 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 facc8f1c7e245369327526820dd2dbd4b43697af..f43bc1192bd4abe83273946233017099e20e4cf5 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 6311eed79dfc79d2674f4d594713d3aae7a2dd19..6d4a07c34974c3caacd7cb977cb5dd040f13dedb 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 41dddca2bdefe2b2566ced44d7e76bcff2661a47..4536296915ed5da2fe4bad5528fb366057564544 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 1cae9e42e777dd48bbca4cc0ec304e0924a7167e..b1ec0526df2902b96ad1d0ce69190b50669e76c5 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 e8bbad2fcbe09ed6bad13a7f32d74caff43b7573..b482c28cfaa876cee425b63f0d75cf1afe1ff356 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 0000000000000000000000000000000000000000..d3cc7cb00dd51b144fac6fb9a55e6e8d1271012b
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 74830f362c8219d8957afbe7f4b1ce7654cdfa07..0000000000000000000000000000000000000000
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 b3456d17d054b8e58cc2a1ea63276127140bb1fe..9a9d0ff15992d14cb9080655a3103d11b223d578 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 ffefd018499739585000a93764bb8ba9308e0c9a..d8de8b872113b3ebe775a0846696c73cc691a387 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 8c0670465d53f340f92ee479e45697d19e28f75d..892c6c6422c6def357338ebefd39deaa11122a8a 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 625f29ff95246e160bec2ae03efa91e8ad7bfeb4..d1fe9c03c157b5877c7c47d0a1e97514b456c2f9 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 b6888052d72e3e617f55ec16877494312221f64e..213d8de733ba8eca32070f8ea76384c944a0837d 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 44e0314bf3ed3d24865311cd6e884ef392b31cc4..ec1b49e0e493c18ecc2a392822dd03229f870e7f 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 6fe3b61a18d6d8309f5a0ac91b750242ef3d5714..d692003af788c5a656f8d9485eef6b7d6d51646f 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 bd2476db0f694a663de5007a735ac6afda78257f..c419484b54393a4faf69369db0e3bf271856831f 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 c08fa5398739336e1b92b2c694c989220dc2f114..0e349e6f4822fd492a57d8b9d74a9b15da1966de 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 79701f5b747ac9dd5e9575eb9c8a57bfbe663277..0aba97668e78bdb7b5b0744deeded2a5d0cbc14f 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 354e9acb54b2f3d2031c05b77adf91c7be521238..e22a19e5f7306a66942b1e6159a090aba246b5ae 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 c4bea7c577834d8556dd0429abaf1ee0dcb032b5..c6170a2eafdd14ba90127aef023f6a27f288b6ac 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 4ca7eed6b64d79bf9d6dc353391155591b8474c0..23ed9ffb6e4fb0313e957b530d10fc7e5430d81d 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 c796a054f8d21e2a8c147f48af96a453f5a1a8ab..90fcdee47be1d4feaced5fd4e710496996de65c6 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 4a0b300c8d03dc26d9853869ff220d4bba719f94..6aecb4dd18fb0449bcdec03750167d3824480855 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 1c1af671b60bdbdc5a02e8c4eb3b3e7289e48733..f7cea23d1afeab42098eb4d26c7ff922d9d3cbe8 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 9faa1ae13cadf0c60f98e9c205042243bbb63500..6280656f2c7ad7544c8baa7023ed0a5f931ee6ed 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 51401d50fc9eba720547fc5aec09e8c929ddf8f3..bebba60474998c610d7a58e97febc5db76042dc1 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 7d86fb4e0239fcda15b0c0aa0784a08567674344..752eaca24c5c8d021ce61103c19b6c37f49959dc 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 18acf04be2becb430a2a425a778c96791f1e4009..f88dcea222f79125cf2b3846f7e21d16df108eab 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 80831955c8c7d5b31717090e0e5d5b077c896f8f..8d1197f84a5ad2e4ab1f11a789b55aebb924be35 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 c9e64e0c0583a7e058a849bb7a48a0c881cb1abb..eca9029cd9fac9c15c20229b4c8aa53cde7e999f 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 0000000000000000000000000000000000000000..9d0cd53c7923f59ca5677f57756c8b8e3a07e4ef
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 ad487938555ac96c1320457fb8964815d743d5c0..0000000000000000000000000000000000000000
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 02b24599f4937e8159a6f90527ebc8072151ea77..c5f244d08c764b80520c54cdd16c1109b08de586 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 e7c3886641f378e00f3d75b6eb068092c8564334..1af70430c6778145f8a86010657381d8f25d6bb4 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 ba1d2854321fff61850b7e11259863cc092d1700..40db41b85e9d58e046a626f970abc56c1543af68 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 43e2ff48eebbf2429b4030bca589775dc786d033..c8ba3003dd201965395c3f6534f1fcbcc6dbc6e1 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 ac648e8496ef57bac952cb285538ef0326533ce0..9d0f66497d037ab1d1c2dfbd5ae92ed4966c3c7f 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 1b29928981b09749ac7156f2962f9daa52a9802d..e6ab99015854baa14ca4e77f9e9a4f7732df5604 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 0000000000000000000000000000000000000000..58e42290939f8703dfa0e419c05c113e44cc98fd
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 cbcaa7f99dad700743b719fb5bfbbb73d7415101..0000000000000000000000000000000000000000
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 fcce3ba127ec827e736043e98d65acc91cb6e7f8..1f9d1a59e23827dd772fc227d8c28e85d056e6c2 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 0000000000000000000000000000000000000000..295c920182414f96d0ef516cf6e7d5bd728a0ba4
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 36b54358732d3a982a41d42e74b12adbfcf321c7..0000000000000000000000000000000000000000
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 97355d2162cbec19e7004c05790d5b8e0a2e284a..935beed37464ca3a9679d2614397984959fcc417 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 0000000000000000000000000000000000000000..a9938ed37386ad30abad3647b75a0c49d9f22ef5
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 7770c5cc39f86c1d1322d9fea8d36cdfcf845b90..0000000000000000000000000000000000000000
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 347b5afa67d39e34feb670b713396e7e99c1ca87..002c4210f5266fa693a47ede9fefc0d5c018318e 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 5ffde5616b997a7ac099d59b33b13beee377b477..4038149ccd0d37108a3fa921577c4a415fe57589 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 cf8617dea6e20aaad838eefbb79336bcbbb9085d..71440f797fa5851f7c75f651b3de68f8ebd917eb 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 0000000000000000000000000000000000000000..369dd8b015015a7b505c28b3295c344f7ae55e51
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 ede49b20aaa25d82d593e6bd9c8a2cebf8711ec7..0000000000000000000000000000000000000000
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 8e5a42a16cfe9330713610a4d9037dd6823eae5a..859d6d232b5c4bc62ef1fbe65368f55705e11572 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 0000000000000000000000000000000000000000..369dd8b015015a7b505c28b3295c344f7ae55e51
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 ede49b20aaa25d82d593e6bd9c8a2cebf8711ec7..0000000000000000000000000000000000000000
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 5f39f708144b01c2d9b312275732003f046a1038..82d27868cd760e264b701fc33da37a45a3e02857 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 9edf8db57557dc15f25ac75ec597b23a81827ae3..8082ed6d6377fb2f63a1a8a09b73202e21e92d73 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 b15da99caca70288d006ca02ae5c3c34b8ea44e2..af994adebbccd2771cb02e6a44191cf3d8b61b2f 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 991f0888046579370f562a4c10fc5172b143e77b..76216fec76906453471604a778b57c8eb50f08e2 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 463df87fc3721bf700a8e03ba69f2b08140cbee4..7f0a28d98726c4fe9ed3b8539db338072db17a5e 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 77f0682ea3ce62155acea1d2f4fcf797b5241bca..e2cfb4092d18388a9eabe4eb163b20ae087a37e9 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 683c7f53336d33030920b26e38c867ba1d0304b4..cfe3d8a547d5cb34d6d0acd7c7a4a81a1ade12f2 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 0000000000000000000000000000000000000000..73ac4b562d235583a73f195ccd00e94029169ff0
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 b20145f109dd19a70dcb7a2e95c5725dd6acfe6e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..bd204d86d55dc14820b1ba0cfa631912e50a5d3b
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 dc9af74309ff8da4522f36059aa72d8840e05d70..0000000000000000000000000000000000000000
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 69c5ed0ea837e9b9ed4353b279df727be81d4f3c..4caae408e212c43d6d41d690e1a2e983949c1e98 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 7cf188f5cd4be637b71e61dde536893362390b97..f780813c123481978dd1236742ca7ac82a10281f 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 a7608e39924678c1f31ea8858e41c8591edfe755..ef724f35376f57ee8bc191a2d9ded0f3a0764440 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 0000000000000000000000000000000000000000..ffea17280df0e5211394b34e198402e9498b2d80
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 8fd93f4fad5d17b44364c714cacc18a1a219894f..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..464d6feedd50d83b392fcdb15a20038b038ab62f
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 1830443e28f403a0892fe0da9cd33e3196a4dcd8..0000000000000000000000000000000000000000
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 42a0cce685e023c4f25ff57597abc05a0b25a7f8..4aa8a9532c2b5763c6219221024ebb8dda079a48 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 fd7e88610c8ddc2e9f313a955461a77e8b58813e..dbf1a306bd1c600036c0fea66a6cc5f33476d0e0 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 3eabcf53daa68dea31996c4501f2de04c06c993c..5a3b11bf17acf27fdef928de4d05cca7faf72c62 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 50b2a53a20019986abdf59bfae1bc2f258547739..1d949074ebaffe788b18226e158e90346befb7c8 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 75c9c9732f0249cb8348c83d3067f48fd34b3249..ba846747efd170a9a3099941288b1b2b266dffe7 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 a8b3a5411142676c7c5718b2dd5892e95f6ad31c..1cf074c03332e09cbc1cdd73a85878f1e4ce19eb 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 4e6f9e55de134bf26bf99d2c8fab21139983197d..d85fa3cf04ccfc777e90c19d7c27aa4cf18310f3 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 a1a63a5285696612cbc731ccb450b36a79dbc14e..82202ec51acb4b3f2fa4dee568c35e6f8a7828d0 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 0000000000000000000000000000000000000000..d24432056363c55d5011ac8107a3ededcddd1ea7
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 57760ec7edd63689aa0bce4f105b7d19983b5453..0000000000000000000000000000000000000000
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 f0daafd116bb1d5ce5a0a96b824178ffd34eb2ec..04de1062b673cb7dc060477b5dbad547bf9716e5 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 b594434b1f4e8d471c44d9f1a35171b910ebd9af..f1c5b5100e17da8be867e7f64517b47571ac0492 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 68662e80a52c107f136c8b15a21ba9ee42708d4a..566c28790157accbf67844c7ba948a01d74e5464 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 93d6c4b92f9b6f628748b01a5caec5986c75c6fd..c6155fdffbd38ce70b2515018b04038acce3c9d0 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 dd3a747b34bd0dbe1fceb96ade4d2a8a5c09f169..eab80fe53b8dc28f77f3207a95490713b3006ad7 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 b821771c98e941557f8abedd999bd4af590646b2..6a28927b1882d4cb695fafd69fbe6a84a00f4196 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 0000000000000000000000000000000000000000..21b5de2616002ecd42fe7ec4cfc0a2cf750e6be1
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 6bb4e839135e0ee388baf1b80ad4fe80b92a9246..0000000000000000000000000000000000000000
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 9d3b0eba46db0a8db929aa940f7332547cd6c60c..ff1f767c4c7f621d829529f8eb9e028d6671e295 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 2af496f4c1143147ee99fa6c899ac38b93186e3e..bb6cc091ad04d037db26aba23ac46765fe911b4f 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 e04a90095473403739766696249d68b378d20b57..6c32b4f3d776d4612dbad488e093bca3b07247df 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 0000000000000000000000000000000000000000..05ab6c4603c7142f136b6dae7c93bf4714a1e25f
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 e245aa880c6a82b7893ef8a7833f5386890513a1..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..d7f2496c50c2bd1e583b59e8ba9ed6ce636843f4
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 fad575c8f3547cd44e0c39edad944c6f6291b753..0000000000000000000000000000000000000000
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 071ce737e3edafad7f8bd39092d9ce90c434cd49..38292648581143b7be456bf5e4bc821a5dc8c40f 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 0e1af257dd08b08db1bc316c559f588f278892ce..315bba1c9b7c2018d488dfed851f34f53c299c65 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 ee5607d73f28a1041add012c2e7a586c31fc92fa..77bf7df995b7fb1ede7c38c6b05a47a94cf49b5c 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 c9ac685e4a1080217c82c0c676d122b7ce9975d5..139409b279e0440f5b1b8cca7aed9bfe10bd18fd 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 02012368e889fc2d73ccc7f1adb959da152017a4..5e5711b8c9594f511e703e9e6dc678b3de9c66e6 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 0000000000000000000000000000000000000000..9a469b9cac6e5ec24eb6f1c823df0f1bf6d7476c
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 142fcc1eede7072cf2cb35a8aa1bbd920a4c0448..0000000000000000000000000000000000000000
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 4a2040c60f4ad6d99d05ced16f5aab6140631a40..9ded085dc6f0fe5be9180afab9f63fd245534f3a 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 0000000000000000000000000000000000000000..cc11e6ace71cf38f7671959cb7874d3f522df01f
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 36d545d98758fa310fac5d4eb9f4ff2164d683dd..0000000000000000000000000000000000000000
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 dc3d2c13fdcf84c7b5c9049380b9a7159f1c8ff2..06f6b6326f8e43f4338795d093b131fdf38ad588 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 0000000000000000000000000000000000000000..171041792930242dda3c77a5a677e6cd443fc703
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 cfd235792ddfd8cd9c85fb5d01c9862f0e871013..0000000000000000000000000000000000000000
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 2694229bcb5a840ea70a7e11cd46b62ab189ba58..6b2473c1050e543847157d2c29909a4d55f81602 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 141cac977307d2e727b358abeaf0c8445deec000..addc9b79d971d487ee3cb176835fa3f28c7a3f61 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 0000000000000000000000000000000000000000..6ff3b64cac2a1c7bb6f1164ad4cd73f0f6e5a84c
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 c665681c30c36a7155d257bb18a4fa85b712f6f2..0000000000000000000000000000000000000000
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 837f41aa357fbdd7f6198917a376607f863b5f33..91eef722fa30f580be4c23fd0ed6b610381cb26b 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 58453503b76835e8ec29f0624ab7f4132b64d308..183a4e1aab1c657f0d037a5f2956057d09355220 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 0000000000000000000000000000000000000000..6786d76a40e4747c29fc8c2a8a7fb9846cc2b9f2
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 3e097350440931918e52cedbed9d31e7c81776ed..0000000000000000000000000000000000000000
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 32149bf165a46c67a73eea94e7e7f9d218d0b9b7..baff6aadc428a87f6dc78b2eeb475a716dc3041a 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 141cac977307d2e727b358abeaf0c8445deec000..addc9b79d971d487ee3cb176835fa3f28c7a3f61 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 0000000000000000000000000000000000000000..9773b27441c31e5e44c5dabbde7bb577a90a7967
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 d62ac2151e519da09c09512248c10495142d514f..0000000000000000000000000000000000000000
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 b30a587d0485387f9809f534de82710443644275..d609c74391944ced625df1dd28853d3722e39824 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 141cac977307d2e727b358abeaf0c8445deec000..addc9b79d971d487ee3cb176835fa3f28c7a3f61 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 0000000000000000000000000000000000000000..2429be97e0fa441c792a8e97a9f7378e82c6610f
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 60763d8fc7da0b72294bd5dcb099d493de5ab84d..0000000000000000000000000000000000000000
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 f6da1987955a6239acb85beb2037f012ebcb5d31..136b935790f58ea511f0132985d8b6d505be63a5 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 141cac977307d2e727b358abeaf0c8445deec000..addc9b79d971d487ee3cb176835fa3f28c7a3f61 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 0000000000000000000000000000000000000000..4fc3a037b642eab2b92cd7496141e6677f7d6724
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 8e25636a0f3b3191b0e030f9508eafcb09a99b86..0000000000000000000000000000000000000000
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 802d48a4610695b5cbd91be294faf36bf95e87b6..01bba89c089155b53efe4d5c5d50a5ad2b41b42d 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 0000000000000000000000000000000000000000..8cba49cd4dd53d19c95ee98f0499c0c24f1c43e1
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 126841bb7bc1ea757bda762c1d784e9f98dda98e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..09e927c018b1d68add44be8752337193f501aca0
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 d221f1e0ce77fc95129fb4994530f4b04b7f16e8..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..2c51055d4e032e3c2a3aadbd3e84bc0796c20c5c
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 e72c3f5b770935e180706ad68234ae2b9b39adf8..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a0af2294a0cdcc1e68f0bf8f91a09b3ab7a49163
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 02dd89a23d0bad877a3c00d2c6eeb0b61a5d0049..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..bf3a8f0b029c9e370c20987c12d560d75d30b32d
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 9a5532498c43b88f13daee18c58bb7b88688b454..0000000000000000000000000000000000000000
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 668e09e2ef7584ba1b356cfe961659d3ff08d698..d4ae50dd7f6a907ab0f46f7744209f6026e66d70 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 8cec14f83d81d6e6bd7348c724262a4668d74fed..484a0ee7b40e27f747b0f8a35464ca00d527ad73 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 0000000000000000000000000000000000000000..1ec6a5a5d6ebdd43e0dd725f0e0f9783f3a23140
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 149b244c8fa0070a0baaf13096195d317672b573..0000000000000000000000000000000000000000
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 f85976aba08c45a89351d1a17beebcba77c04bae..e774c8282c9ed041fadde3e3004dbc469e426c54 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 94626b4ad6fd221b6be8bc1f98a0b2ed5f8aee21..5c738d19cf5a2195c49272540bf896e38c0bca54 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 0000000000000000000000000000000000000000..275dfd0e13a2efba0bb57875bb0545cb1ade933f
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 8cb167a146e33cb68903371a95d1e4d69232d36b..0000000000000000000000000000000000000000
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 2f17685d7db17d8eb61f120c62cee15382b1a1ef..78cf267a1be6a4ec17f7bf59c214ac365769f6d2 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 0000000000000000000000000000000000000000..c53ea57828714267518247a2926701978114c73e
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 68c23ff4c16f2a147b731adc5ce79119faaf3cae..0000000000000000000000000000000000000000
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 09b55adfcf545b41d9ca79a42f34bfaa87ddfb78..28a804c367c531e701aa5631f93571497635d6cd 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 53bb9a276de5c83d223b843b2df333e14a165588..4fc6c911a7dd14a04a521378055ab05ceb016a4b 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 8cec14f83d81d6e6bd7348c724262a4668d74fed..484a0ee7b40e27f747b0f8a35464ca00d527ad73 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 0000000000000000000000000000000000000000..e12bd3b97bede9ed6ae5335d354781e4d088d389
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 1708aa1dd4093b532d7ba18910997510346f5b15..0000000000000000000000000000000000000000
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 3ba734c90ce2d1fe90e1c082bc5e846a9ca2da8d..422f9f86ba16870020c9b7ee6f189ee414bb0289 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 0000000000000000000000000000000000000000..25a44602f19ce43079cfe1db50a8b1c4b00f3633
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 cd71f8f6835e6961dae37ef422e1d2f94f09a777..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..8926b10d6641f44f10ff3a449cbd218cce70eba9
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 922e3f2501dfd55ab36be985988bbe71352bc471..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..549ecaf0302ce88f5c265ae4f0b0d3bb6b9d1387
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 6951a3287cdb3a30e2de5154b380a76c2aac635a..0000000000000000000000000000000000000000
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 fa9892cda26953b59343a7622c4e3e19c5f96013..c4aaff7c73f886d718a7a4d4b165e126dcb89cff 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 0000000000000000000000000000000000000000..6aca60dfb7480ce5445d7f78fbd0d279a56bf482
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 01e8af581709b42e5009892cbd865bb86662bdf5..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..e1841ce5a0c1332e30530c5158a2f9b55374b381
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 06c6d04a5dc849b2cdbaf1e1a75ba985c1bfab8e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a0faa6600ac6a906a67217c81180b953715e6d81
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 da44a370fc0449f2a98e3c035cb2182b9e0d929c..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..bc9084a9d1774af438dfed7036469b662a910d71
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 6b6bc52cfd9eb8daa8122b3a31a7f01b34a7a3cf..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..d12ba5c3a500459fa0b10a4d5fa474e0a4a353a4
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 02e959a39e526a4a5eff2dd32e7899a4a20074a7..0000000000000000000000000000000000000000
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 68f1fa46dd89b5c2f1f518ab67fafcc0b765791d..d629044fc11bc15c6de2df8db2db78d760211d55 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 0000000000000000000000000000000000000000..25a44602f19ce43079cfe1db50a8b1c4b00f3633
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 cd71f8f6835e6961dae37ef422e1d2f94f09a777..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..0d724c9ed67bb5c162594062caa904035c20eedf
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 2803578a83d46a657d6794f591ef096d1ba19b41..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..46450793e819cef54930677d3f0e58658216fdef
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 616883eb3bc4086c4b0870969b993bc874493411..0000000000000000000000000000000000000000
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 c60f54072737ea1072991161e85663e233d2e6e7..48e4813eb77a035747b0f39903063a2cf2ab0aea 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 0000000000000000000000000000000000000000..8cba49cd4dd53d19c95ee98f0499c0c24f1c43e1
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 126841bb7bc1ea757bda762c1d784e9f98dda98e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..dc111e918859bf8fedc7c49a96c8b4bb54e29982
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 8d1eb23519e3a0973529f2dc021cb40d2487a241..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..656cb3ea017c770009b5361446ec65769fa25fd1
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 cb045527a42da68807336946e99d78b53f445515..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..812968b8a80a08ded589e6b3946df3e80b5df8ed
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 23d0facf82178ed1535f29005aa07128ec1f7e83..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..d8327da59dd3ed01cf96db970322287184dc258d
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 0e8d2622a1936bdb05a76419e4b77037fec4b4d4..0000000000000000000000000000000000000000
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 c67e8d29f5dbfe19b74ded97c6bac414dac82c4c..024382af888d9adc2b3fe6a10efacbbd3a1add4e 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 0000000000000000000000000000000000000000..cf1adcf2739564ea6f8f63ae0ac33bb308d91dd7
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 d6e91821b96cdb6fbadf74c7bd6504f26232da47..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a34ee7aa978e7f1da1f6812dabc81bdd923d1d25
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 e70f4104631e6c5b92fac7671d2e9c29b19de938..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..961df3b4325d7406806ed46e34701af5bfe07acd
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 962459b7b3d3b350d4a11d0d9c731e9d3936f449..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..f506076defc72ac5a98e9818952f635b50c854fb
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 1a87689b14bc3e4d067d460601c9005c88fe5e0f..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..858a4255278750a328971cbdc88985c407244f33
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 82f8c27f01e6477e979e6232a9e22d5faddbc3d9..0000000000000000000000000000000000000000
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 6269270ce4b2176581811f78f4c5236c20d4b5bc..ca6bfd52a15ba79f4ac1054e00d45a84a12e85ef 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 0000000000000000000000000000000000000000..1fb864721eb178836a66fcabe37d831ce1e11eef
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 8eaab41961651ef63e04f254eb3afed30007beec..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ee2e1a0db0191a53495a9d2e3a4ca81c8ae5148d
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 af6c491964210e33cd586848335fdce783292116..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..be5d68dc5f04aa06a5a08c60b931006b93ee7b30
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 f1216b676738c008a3a6dd99e49511f1cbf0ea37..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..e754eb03141805bb0b85d88d96f9ca63ad455e20
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 0b497834987cc7b0e03f6ed2959eeadc9a1779ab..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..f5917b433c04dfb549782fd9431159ec9bc6c81a
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 a44ef825fca622c5d16b1b0ac1f9f29d1047c2ab..0000000000000000000000000000000000000000
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 58b5b9bb74840a18d55c2b5c08d0464a2a67a6b7..8bb1d0fee853301ec677cb5e7910d66f7f5de37e 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 0000000000000000000000000000000000000000..6aca60dfb7480ce5445d7f78fbd0d279a56bf482
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 01e8af581709b42e5009892cbd865bb86662bdf5..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..276b8f3b22827a93e5b2527e7bfbc2113f3c7c0d
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 b0b7f5dda5e0d8b609d3a00b6d8edda4883616db..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..260d8e88f2b823f3f5f951d3dc50838bdb541bb7
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 1abddbc9a43f355f90a375bac78ef4ee97b08c2b..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..0f6d4f3cb9b03a9bdac04f377c7a23206d60a13f
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 0b1e6179a15d1bedcc7919c72f8ee1b7ab433290..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..946ce6927fecfe87ab4a2d92f3305e4c45e35cb5
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 1ad1a70b10c95009b3245493ec9301f0445dfe53..0000000000000000000000000000000000000000
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 81be80ee940638f09fcb73a455b507600759a9d6..07005c58cdaf94f3503591fe5215085021cebcac 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 b25f4b96b116f33957f984eb1d0deb4302338a7e..05f137f0e2e7bad44230f0f5ab78d3ef72e59c92 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 0000000000000000000000000000000000000000..302ea5846111e32adae7591f798d35a910e8ab73
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 eaccabfe3f1ed1ab7ad3cf8abdcdf3bd7f6a8802..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..2f1f8daf35c68fc63b30e6ab0417ecd941f7b253
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 c398a1677f28e672de7da06cfa8a76c44b3751d0..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..3563a738883688b7fb13bc0e3ea30a8a147adac4
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 e3234b101ad1ab823a9917cfe1dbeca808488197..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..4f39dc8b2f6ecd085f83a9d207dbb74a43cdd768
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 4213a53ef47da251c7d93653a1b819bcc4d1cdd9..0000000000000000000000000000000000000000
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 65e1abe4e4ba01bfa5888db19c15cddb03fdc73b..0c7b4fcb8747839a696a3dbc78defe1dd29c5df7 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 da87faff187f9a9a9253d870875150ffc4a78195..ce1f3f091216e0d9774594357aa858705fad4bc0 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 ba4dabe30981d06bdcbffd92c7f6b2df9e15af98..bc419c612c4a56ac96bbee38ca5ec00b89010300 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 da87faff187f9a9a9253d870875150ffc4a78195..ce1f3f091216e0d9774594357aa858705fad4bc0 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 ed7d2a339f53a8983c13d3ad559a8807e0447360..299eb9e4c7b5bb9f69eadd3bd6208978a152fdc3 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 da87faff187f9a9a9253d870875150ffc4a78195..ce1f3f091216e0d9774594357aa858705fad4bc0 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 1bd38ad492c3e3dba819f3185d1cf83ea02c317b..bf6f1c68b921d1f3b9042e384cec5808c5a05da7 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 9d1a48567ac843ceb2ab64d2caf0cc90468ba952..77ba56f17237185016b31af87ecb25d4967f312f 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 d416fcfee7aee1c2de631308aac04ca4cfb28151..1b32a1fb59e2584799a76fecfd5edd231f51112d 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 88abf814bcc003bd063853a06abb70c2349f57a5..f45d9debdc10e9ea50d8a5302cbf31945638aa14 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 55f040a117f666867e9b2411d7757af31ba570d2..81d05439ef8b3f1243a2579b617b88669d01945c 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 7d4ffc5344359364bcdbf9f6f404d649e6f4d6df..527c667160c1d3dbe2c74ac6133675cdd13cfd06 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 5d16853684f791b19cf1c2013e5b39f516d74dcf..1e59c1604676c4fd0047b7cff3eac2ffb2d01b5d 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 12ba6142db9444c974431305ba486320883e9f4b..a10e67849672a77822b22a6816a804614f60d679 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 c3a2141bbae2859be660cb224b1c0b9c0a516e53..db18f702cdc3b3b90a5c61f368c76113a95b508c 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 12ba6142db9444c974431305ba486320883e9f4b..a10e67849672a77822b22a6816a804614f60d679 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 a1a88007ca2d6b18e4c45f7aad90f5c0e59ea3be..b21265795be99cad8dfff63c41a7554f251e4f15 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 ae9b6ba730058530cdf98cf8dbe9796473e71909..c9816742a86ac8177d81d48788405c20046cb4a5 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 4bf531006b8e0bdc6b9a1213ee859b745d833a66..d27c7367aca122ece3a79842e66ee44f935b6f7c 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 da87faff187f9a9a9253d870875150ffc4a78195..ce1f3f091216e0d9774594357aa858705fad4bc0 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 c20e84051e08462d7ef23aeee448f2380503b4dd..b2c2b7e6d4fe486bd26d6db2128b43dbd5b6d7b8 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 f97400174ae4a9abadc693cf807976016fbfe267..2294319b97b6059ad940fad6a48806e96af38c7a 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 6ddce2382fa9fb1e7b8b245324093805f1bf0290..99afb70898de969f4bec65e136e59971890da502 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 f97400174ae4a9abadc693cf807976016fbfe267..2294319b97b6059ad940fad6a48806e96af38c7a 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 f591ec54f7851a2e99b28eb7ee0519d1e863bba6..8c52f7a4a27fdc74946c93989a72954090fb9452 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 2cb1ad2e6b718e07e72fdf245bcc78f333e7c0da..f3a22eefae832e6ebb17a086d52aa8ac9e96d9fb 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 de1461e8c698a3009426ba26d13db7a78dc77ecb..92dfbd98deb313aedcd5f915a93235c06fb82ee1 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 ca0471e4fa3dd3f0c9d6df3a66059e2c554dc868..9ecc2ced2e72d4ae56ee85ea2563d4d2047ddc7d 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 d6bb446fff3e960c2cc59cc1d86e098b4f4ac037..6d5831a37b0b37c3ca4255d2217107107866f1bf 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 ca0471e4fa3dd3f0c9d6df3a66059e2c554dc868..9ecc2ced2e72d4ae56ee85ea2563d4d2047ddc7d 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 de456941dd6c5cb0b2f6f11fd6ac3b931a138ffb..cc9803e7857f724d31cfbd4d62aa4c5578ebbe09 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 88abf814bcc003bd063853a06abb70c2349f57a5..f45d9debdc10e9ea50d8a5302cbf31945638aa14 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 0000000000000000000000000000000000000000..2a3d64cc6e38c798569728607b2e675a78d32f88
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 5aeccdcbf71a77ba9c5565390e86f16e296af6b4..0000000000000000000000000000000000000000
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 0a5fe45cb221d1cf8bb495b6d58cebeef7062226..5e55da0fbd266097a5f758098c77c2f385eb948a 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 9d1ef3df99228fdbd718843f7f1b8eb95937fe4c..1cd53f4471dd22739c2fa1bdd4830cafb737df3b 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 0000000000000000000000000000000000000000..92b15ce656d0ff8f51c063f1bb0c7e28989f252a
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 7e86d0382f5434ae3e98f97fff9c03f9989d5f16..0000000000000000000000000000000000000000
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 a9c6fb7f109409389fdede7901ca3ae61ac84abf..7d38c0e910278c9a10484d149f2bd6c15e351047 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 9d1ef3df99228fdbd718843f7f1b8eb95937fe4c..1cd53f4471dd22739c2fa1bdd4830cafb737df3b 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 0000000000000000000000000000000000000000..7eb69f7e9ef1d3e67b8a4951b25dbf451a8ab51e
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 3c4b7cb084a063cdc51a03d7a85f9f9f6cce8535..0000000000000000000000000000000000000000
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 ea2835befd63e16d2b3017bdf5d5872faeb52d10..15af98074949b86d00757fca4987851cb05462ac 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 9259256906f7b73bad4aa87ceda0db095e1565e1..fb52d5757f5f58b97f0274576b229a58544ff007 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 0000000000000000000000000000000000000000..4bfec41a3643aaba2b8266665cb19289c7d1658c
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 5026ebea47a5f2272e927d9ba2750e57f26fda07..0000000000000000000000000000000000000000
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 1d81371fd4d5a001349bd62d9022a828680626b4..007ae04379dc7f7f81f83311331c4e42ecc6b682 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 6be9bdb367e0d437bda893992a9868d9faa18326..23d964cfd3a6c5c0469e0b61d5b55c90978deead 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 0000000000000000000000000000000000000000..4c18279c43d399d6a686cde8dbdd7b259582f1f0
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 95e9e97c62cb52c0ab553fd06884b4db0421e049..0000000000000000000000000000000000000000
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 7fadf13c268ed16aedc52cc8e9f942bea74a21c4..fc9bfc51d08c21c498b57dad25285135d446e2ce 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 0000000000000000000000000000000000000000..f37956c8cea1e2052b26ba34ea752eb3741a3eb9
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 e10e778fc1bc32203bee56695ee0d01afbb146b4..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..4bfec41a3643aaba2b8266665cb19289c7d1658c
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 5026ebea47a5f2272e927d9ba2750e57f26fda07..0000000000000000000000000000000000000000
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 9f01827259bc7785c5059ef39f8494ba66931134..f4903d59b166369a40968f68d8343bc5539a8034 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 173eb5b6a68e056f6872028fbba395b4b48de583..74bf55c1ad9a7783aa6d919df36014dcb2ac67e4 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 0000000000000000000000000000000000000000..f999efbf6cf2468303a981ecdd0fa1301c18814c
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 54a64e8901c8be01d1afaa758ba7eb5ea1c33414..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ea2bcb9663c3374e6b3fc1dafa057f9ec2dc8666
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 174538ace64e45229be8062804f6be3b9c0952ea..0000000000000000000000000000000000000000
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 c779e0287463b2fbcf08b6b373d03b1f14f4b09a..4b68d032be17811c06fdbdae21079827468ba320 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 eb5648cef142be5e1b580df8885c38fdbfb953d6..6de319b24ee7595eb14dc225e5774ac8bb1412bc 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 0000000000000000000000000000000000000000..f2ddb42dbe303c5ed12b8e9dc47588e4f047e98b
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 f1014ba5a22db73c33cabcdbdc7188f662cb9630..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..885d7dfa974354f528d84bd6ce1c37fcecacb07c
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 7dd69bb76a83ac4effcde6fb9b6d7870ef691ade..0000000000000000000000000000000000000000
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 7f96d46ceebbfe2d7c91d469c97186a609c7b62c..765657b6a9eb338a1105cd0228d0906ab1d6ec2c 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 683fec72d8a7ebf56859d9973e163e494f0d3fcf..214eca0b43c2c4da9943a769bee95efe1965d0be 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 e9330f4ab26e8cd396a16927fc74643a327a03ea..9f7c99597173a189bd8a26b2ba050c33aad56f71 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 db147253626bf50fc9dc0e06fb10625989768902..934e5949bb73cbf813ea7ce35743ea9844e2496f 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 683fec72d8a7ebf56859d9973e163e494f0d3fcf..214eca0b43c2c4da9943a769bee95efe1965d0be 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 9fc3b182fd1ae167bf3c76a3b9c79322828ee8d9..f2d2739991302a584e15041d37466e514382302f 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 12903b5682d819f5f497490a602619b151d7359b..eeaa029540507b8ef79b36ac63052d187e3c2322 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 0000000000000000000000000000000000000000..8d3aa68a12b8690c954a2ee0df7bfbc57559001e
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 6ffbdaddbb9858740d9f06b29b165540f6666a94..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..c039b3fe255c807e3d1f34763b9fee95cc181132
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 addb782a86afdd369a567bda9764c8b174ee1623..0000000000000000000000000000000000000000
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 5f730357a6db9c6b1c7d26a089bd7cc18b1c9806..de2a4b4b5582f1c74b65e83b9c878b38b1b37d60 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 ef408f43224cf55095afd763a6f970b580c9304a..88d795d9292c0b26fa9773c45776834a6454ce74 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 c9124bad979eef73667063a895eea0d01d744137..fe03035e9e899eee6e8af00a081fa0df29306384 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 539ffc3f8a79885edc8bfeba23a96f12809f2fd2..7fba96b71f77d9ed67cdafca0b4bef61d48835f1 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 301c88e9725bf8c95338d50268229abbdfbbfe5a..4b0a2937b05c2cb146d84d09b31ddbc2efd77e7d 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 fc70a417a609633e45daeca6f1d5ddbd1962184f..e5d30c7b764b2edb8de47992c07e2da60b5f0952 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 e8d755a3d1ecb51db894d3c4f876ff8a9444f7cb..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..c4afe2a9d0323aa95364e61423bf163b6f147b03
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 1ffa862c8948628e02e23e5eedffd49b91f4a447..fb006670900bec911792fe85d4e464098dd9891a 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 0000000000000000000000000000000000000000..d7e27e662f28330ccc7b840e1f7d73737a702a69
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 206c7e1a736b9a19f592ed74f28835ff3d9a33b9..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ee39a677d1d7a3572e9efd35d37a9aefd5874c6d
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 a5607dac20c7113d17698714fdac95730ff6520c..0000000000000000000000000000000000000000
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 1ed630cbff56ad7cf485586344396a200f1588f3..de5393f4b1148131aead4627a6155eeed5aa98cf 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 e48e08dcec13b4b7d53366e8d434e8ced266da8b..829a9b3396a9cd1b18644c80092358c6a6736016 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 fbf0e21f121604cacf33d260078c23a49499b8e4..71f8600080ed79289bc6cad54d11ae16ff1fe480 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 35e6506e9d28c078602a5e44037d23836fb14255..702bff46d616a404aab262839203d20eb9e690ae 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 52da7454ea1078a713bce76fd2c5bd0e3d26b839..ab051345b9c031978f9412cab25ab99b9363f9e1 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 bb0e0ae3b18f9d2ed958fc52b702e68b2c0ef8b0..8c275f128bf47ab8a618825aae95e1fcc3bbf494 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 86370609eab41dda7de6e5e901166ec046b8e5c3..24cdfd3efdde66192956792d16eab971b9aea3a0 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 0000000000000000000000000000000000000000..b6efcb37bd69f4ddd0ccbc72d266182fb74e8665
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 be1a0a67dcce9b2b6d714eff0a92785f10244f42..0000000000000000000000000000000000000000
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 16b9b0cd1109bc874cf8ffc22246cf89e67cc730..4cf1124ff1ea0340a944d6fc90061ba91b459d22 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 327e33642699db4036d97df05f3fb1a8730265a8..25cd752612edc07c407dd44dfaae7277765d4243 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 0000000000000000000000000000000000000000..354a407620f87aed9797502cc4fa5905cbadac04
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 428f19110ec217acaaf26bd0f700be3a08bbc8e9..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..b5c27e0e5084f907c34b4d6d8d976d7b87254c59
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 e0ab16aff60997a4f2998e91b0e774e539d1087d..0000000000000000000000000000000000000000
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 fd038195ec5fef22f7280cd425dea42a319e35de..9aa053e90a0135e1d48ee3f703fb98d43f6e0989 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 0000000000000000000000000000000000000000..a1cb6449ff1e594dad53d3bafb4ab80a0387be7e
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 8ca0bc352794f3aa08b011615693c8c029e34f62..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..40247d8bd3ed6486556ee445eb9ad3ce9cc97a6e
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 aaf10a1c26efa0a3448811df872fd730fdcfb75d..0000000000000000000000000000000000000000
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 f1150452c256d300ede113a8332ba18734188c06..ce5a2407ac9539da7c083540730bd4bfde9cd902 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 07d3be49736fd45ee6a738e1678719ad04bfe78f..dd0efd1c8c41616deab819701a3f5eaf05743879 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 0000000000000000000000000000000000000000..45b398b8501c484d5c4e2bd62f2ccd546586c993
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 7515d8c79fc68a7078fdad0d18c48cde6ca0c179..0000000000000000000000000000000000000000
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 eac03f741ae3e20d04a841365e208acb3dbf4127..714b7b870f4265ec9b0d4af5245cc134de81ec9c 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 0000000000000000000000000000000000000000..6d1f2c4ee2f1012ca321169881c6f6cd16b986bb
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 516b2b8e53b04c7451ed8477c9781c795b668ff5..0000000000000000000000000000000000000000
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 1284ce6400b8c68b7712874fe61203dadf4d154a..312aa581e0105cc9528e22ef069cf354a887d7f0 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 0000000000000000000000000000000000000000..d6a2a92f208f381a828c289e9d03291fb9a9b4a9
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 f69858b6944d6915d1353516253b04b0b49b77e0..0000000000000000000000000000000000000000
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 051071ea647519343b057814db57f11f8efb3983..c69b23c7bdc59fc68ba38a7058befafe6874dde4 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 0000000000000000000000000000000000000000..348dee314e9abced0ec081ce857ea7ea4c9c93b3
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 6c6e9c5942797b7d5ecf2e82b8431ed7609abcc3..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..76eb0fa4705c0a457b5ed808f4d3cd794d2fdc72
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 d25589436ba313598d67b9b3913281ba4baf12d8..0000000000000000000000000000000000000000
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 33662c88627f23e0d7a26e734ceef74e38a38fc3..446b0a349dd0ad76e25fd316216eb617d16af894 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 0000000000000000000000000000000000000000..2238ab9a9f7dbac99eee3c5633f96e0db872c193
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 ae814bb7748f89eace970869dcce7142e6e782c8..0000000000000000000000000000000000000000
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 020b51f77f41b15c4e31b49f1d406167233ceb3e..1f26fc09b6ce626dda0f2d35f6c34e550a08df45 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 0000000000000000000000000000000000000000..d8eeb2b506d74ea65d2910ca1cf3218ac9f1fbb9
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 5f24c773b8adcc34b0c4a93d251668b5db62f268..0000000000000000000000000000000000000000
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 87a123eb19f56d0cab0ac0c7958920ca64a4810c..5d011b0de0dd886b1a683ad704093ab2df65f58f 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 7a34b2315ab47e9b2c83296e3e8d592649785e20..8e3c4e832c81ad0be4ee1b4ef808976201854d27 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 0000000000000000000000000000000000000000..0a4c3974a00287e7cd165634083100384bb2cb51
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 297c223e968e95bc53e16a9221705fec388ce158..0000000000000000000000000000000000000000
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 6c5f2dcec517aa0ed72dde06afc15fb81af50adf..a32a22c6f0a8775d96b690d04c685ec1b0db4ca4 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 bdb3a03a1bd2f3c7c850a6bc8b45f5bb766bc39b..ca44559933e7b8677b2cab49de16000b225e1722 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 3b48af59a51a8fc99b993a70294ea376e7773f69..8077093ac8396f1e114900a12bed9a5dba9097b7 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 93f5d1f9bfade7d6236e54eeb6b7aa846359d9d8..0a50bf07f60a3ff46a15e8a5a37c3eb8cf2ea403 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 0da7273786f6effc978d8045fd9bc6057b8d62d0..a5070161312ed09e2a972c9135036465dd296e7c 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 f07ce468c3e1ba07b5656949c5b0f5509ac7179f..7b5028a8f770271eb0744136bb488bb2cfd0a79c 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 0000000000000000000000000000000000000000..34a568e94bfee9356237292a27e1a32cca2dfb9b
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 cd821341941a16645bb0ae29b8e12bcad8b74aa7..0000000000000000000000000000000000000000
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 92ca212f332d180a0d15fb0940f5f84e16058922..dd79c8c8f74d678cdd6b0965b81a709b45bb53d6 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 4ee9193bad5cd87fa88b5ef4e508eaf539d95a9f..21d882536e603b38b51de920b6cedef15cded4f8 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 63b330e68b899fd23d43a7b8c756a0fe9e8e359e..e25593816d5b5066c07bbf15cb398fb5100849d4 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 62b7e283ebe019fc2e6bf14dc77b063ba7868a15..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..f61be06f19c976d248d8c91ed858e691dffefd53
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 1e81e3c38c433ce458cb101f656e972143a066b8..9ca09035d009bbb5341b4206cd853a2240e0d9c2 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 8916127a5a84416600463dbf1d3f7cae01f5269b..c85ed1908df2e0c8620e1bd943d8d7a6cca5addc 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 330b279e6b7b3e25c11de4243de6682c219f43cc..3f788baf4860cc121fb8b4a091d3584ee8548ec9 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 002a774fcc58ff18f7494326920b5d62799ef89a..31b725981ff6619d80a909813ba66947c776e25e 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 391b3bba0f275e772451cb060039fe7e620bbfaf..d3b9b292867d9676e63cf7f1b6d8c99a26178701 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 330b279e6b7b3e25c11de4243de6682c219f43cc..3f788baf4860cc121fb8b4a091d3584ee8548ec9 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 a9b6411076c89412dd2275ce2c32d2bb582f1697..84c607278103b9eeb58e7f7a31708960782326f2 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 f196e8e7cd9e1ec4f65bf08db48024b8e5f65398..5705248f15b5ec60f913ead93b1b3160f61eda1d 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 78385d5ad1baa55305744d881d64114e8a8624d2..7c348cc6e97df8fb3f7980aa607cf05e474e956b 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 9e6f68fc8e3fa2e6029ed9bb98b882a9c21de450..9afcb929224b9643a9d0f3e263a24d20337abb6a 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 0000000000000000000000000000000000000000..b458e7a35b3c89def75268ebf72386f7333dc78b
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 183a38e3acfc6ee9d3a469fe4d0889c5e9b77ac4..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..959e257076b7916c9884e9b4859dcc44e1d70a27
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 4380df8d49c1106414aaa64e0fd1662ea64fc0fd..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..e7628e56588e5499e4c94a649b28f6aa7066a999
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 cffa9e306bff5e57317636f9453c9eac9d42e289..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a17516561f294cb473446baa014a55af9d37ba5e
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 069af7bfda3741c10aae1bcf753e0d0b55be7aa6..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..697e2be2fe3153caf75ec40a43bd705dcd104f95
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 3ec24848f78f3d4cbb1a05f887cd176cae253206..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..cbe102a1a587871562eefcc908c104c762fe50a8
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 eeaa5b8d58f9fb883af79f257268a108b3477bd7..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..98faeee0b314aea5c49f4d798c48aa2a4eff28a7
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 81dfdc965285322386e1d562b9b6550fc78afca4..0000000000000000000000000000000000000000
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 0ecc004c62e3bda9261222ee72e95293d61656b4..2dfe60ffeff2e4f859344a9cab7bca5b7ca61960 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 0000000000000000000000000000000000000000..2f01f08359d081997dff97494aced2c23fd9a0f6
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 ae0f3ebd82b4c612528a2841ebe415406f22be03..0000000000000000000000000000000000000000
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 73e4a6be9fe376dbab5eb73a23a122a7d20eaf9f..bf47036d86442f02290a8a8722e43fec69af557b 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 1cef6fdf07d9c15d171d1c29b4e95da5c942eb0d..694ec3719e56060a706d8b98cb9c110665db3568 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 0000000000000000000000000000000000000000..b12bdb711ac402c4f7f175af7817741b518fb225
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 c2f6af822fab74c20a0dc08cbbffd8ee75a8293c..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..4c6031c5670eceec14f775aa8ccc612cb391e6ef
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 9096909f3dfb8f38d2e55bff01fa4f75f6674333..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..06032b737decee561648e3e5f24b1028e2f17574
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 58ccd3da6855b4bf8185633446e7ed744a9548c8..0000000000000000000000000000000000000000
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 4ca8165ec9ba1ffa672ee1786f066db23a5becf2..7866dc1dafd4f5e4d672743141e441b5dcc50778 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 f731242bedcf491dc5977e53786819b0b3de82f7..998a6f0052f48105f8050181379576835f770941 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 0000000000000000000000000000000000000000..4fadbe158fe718824e0625a46ad44ad4df3a267c
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 0b223bb334bd9eb361431363c89ae00a9eb746d8..0000000000000000000000000000000000000000
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 60fa7816fab6a1cbd826387a3c8c50f5745f12b1..4d629fa313a4bd3928f2b3929346bb71d27f4969 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 43e132274713b53201797f9e0dbc8ba1034f1e0f..c1b06ee34befd2a3be691117ac0b3eeabb2a6149 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 ced2abf8f2148ae18efc49f0a3da57eaabf5c627..db8264fbb7784d4ffbd57490e0b04cf2d4928dc4 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 85f41df79b0b67c2f7365eef265ed5998d90321e..9e827c0941ba8a5e4bea4bdc2f90a03b4b8950bf 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 30a5450bd2d352636612153dbdc0827c944e6013..661ead46fd56219b90f66b4768d21334c59020b5 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 8dadd1d8b723a52d8a73b319ca0883d66652dfe8..e4fac875d7bb5f2fd2a7d9bf5b2a7cffd76aafa5 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 9cd04e49a2927ed67758dfc80168dee44680ea62..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..2a5e0dd694b12f232fcbf884bb46b8322196d312
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 6bc5e39900e953f4dbde391d4bb2de3ea3356cf4..ee5d71201718d90f56691e0dedfc61b370fff590 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 0000000000000000000000000000000000000000..a558742a67b7741d433f666c8825cc60b203ae5d
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 bdc8048532d517c41b20e2ae2d3d16df9cab09a4..0000000000000000000000000000000000000000
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 dd1b7d647de524c658d969667c3e599be6e284ff..b84fd85e7a8cee83d05d164eb9061942311f318b 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 0000000000000000000000000000000000000000..dbc80a6381c49294b300249f4be66bcadd0073d0
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 519df522afcd1aa87d2b3c2a33e35ba66543eb80..0000000000000000000000000000000000000000
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 c8d5e087ca346380e2af303563e2b00fbb089b6a..7a71c3a4b4482c502e9edfde27aefccfb5c53bcd 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 cee4255e6b412a7bb86075ede971aa5797eb9ada..f9c94f175cc604b9e599dbfde35cf7e0941681dd 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 ae58e0a21cebc2f53d3f7a981ed7f9771bb072fc..9875de9cb93d10516749b1d58ada5886a9a8855f 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 ac7ad48d95af76a666b5fb461ae904cf836bad4f..fd6f82e0b8e0c3b8dbb989698738ff4218b92673 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 95b6f409318cd78c800301249b942bd579f99181..6b70c0e8b38bd5b1751d020ec5ce210ed15f99d0 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 0000000000000000000000000000000000000000..3b715c6692933ef8b423cfe39495af3df62ba8a7
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 910a9f08a3b55771b834752e328a76fba9b5ccd0..0000000000000000000000000000000000000000
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 8b0c48e4e68a32d90892a8b2b4b2d17ab6862ef1..d94473e3f65e970d0e1bf920dc22095a48762931 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 0000000000000000000000000000000000000000..239cda718d348b4cb29f5564d19a04be3c32f120
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 4d026b1dfd773f2f12b888ec1b64e42a9bffe424..0000000000000000000000000000000000000000
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 6b240b247a763e2f943628e59b1e7b805c3fd3cd..83fb6924e7aee86644483148200d159caa7d0634 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 7291f51ce67d52ea5753e6ad8c261cdb54a3bdba..56f1bc7d9393eb8a07740c550771510461000deb 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 77071ff483e822dd6f1e339f0fe77ae7fd4d51ac..a6cabf9b359962d375db1c8ad12c25a30e00844d 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 e2cd4b52304c066e8eb2b7348bc105f45f45efec..62cb6a0596d5da731b665b8bcb680c41c444f9ba 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 29a9475055c04652074bbafed997404e4ff61c28..79e014898bb42378551738e8e6f6d5d91d0afdc8 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 268b9983bbf01cd0d43208734809995b1dbc2a6f..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..9a660ea0d56f32cdec700732a6283ca5d931742a
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 5c828299dc17d21d0f9ae7a665c9ddaed8f748d6..6e89811a5af259c1b5ade3ca20ba93af021fde01 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 90d92506784351620cc73a19d8d76c4b958413dc..f12c8d55bc76c24a0a8ba60514827c930002be16 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 3c9a869d71fbc409c3df3d918c92879d2738ce4b..f28685e7fa92352e4379e6618ed45b9c673bd8c9 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 2ee9bb69b626e131d48f74843ae62b4b8e99118c..7c5be01bfc689d9fac054e48965c3f48f69c74ed 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 0000000000000000000000000000000000000000..acb5e7fe09cb4b2863bbbc66d3dd11801201c6ec
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 e370abcbd159940880599df38eba7c522ef26603..0000000000000000000000000000000000000000
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 2b9483625852fbf97c03774c5ba3803e22ee82b2..6ec151a1cec43562a5df169ce1480074eabf07f0 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 c1bec80a8c20e9592eb9e9067a475eae018af94e..e497856e9620bdde58c162ed54f464a07ec1fb6f 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 0000000000000000000000000000000000000000..7ebe653fd558b2c6a0e418752ae77ecd5f9bc2b4
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 fadb7ed0f9bd1c792006c04e1baac6921ef8986c..0000000000000000000000000000000000000000
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 91a8af7fc5d263340d38e868d09898ee2b8d3459..2f27c57d0d443f2f1f94f71bed3ec55ad04afa83 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 d3f2a1258cfa7ba2ce93ecb4036122c0545033d6..dedefdd6fd13c2b334c491d98567ce0387d6bcbc 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 5de6708ec3bbf240e9cb598548478cbd152ceb74..f15956686b6567eeb31178d0f169baf9b8dd219d 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 d4f59158dd3a85661dfb706d8ae692fead935543..728191c15f0b89ae024a022412c96feb83098b0c 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 0000000000000000000000000000000000000000..1f2abcd3257cc77eb367151b0e018a56726a86dc
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 38d549ba501f664a46eb4398d208c8cda593132a..0000000000000000000000000000000000000000
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 52899e2d1dc348a1b5598c9e78f50167167d6bc4..3c57989be0a92bcfb9fffa1a08c0f1dcb2302da9 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 9cc23c826bc64f7c9c01db45a4163b59497ba0ec..bc268cbf53ba28152f997d57d3928d9f66a4ad6e 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 345aa2c4a62c3b85e602c48f1f09010dad9b62b1..3aee4131b9b04712e5e1ac52829142e3a27259af 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 c46929e22ff06dda5034d4f3a10db360fd452aa4..0d1ccbf86283f2ce972866d3e1d8ed1b743f1293 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 a91160ebd8cd4d7682919b6c316d977182cf05ee..b01d9decc0093313fc3366497237ba46b0eb10c6 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 22e1e3d0777bfa93013331e7b8ee2742a6c73371..f795a6102798f787049261e7bcd4757424f9cea6 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 87cfcb652595efdba99e00bb6ed08f7260c84b3b..b528f22adc92712d0089851ef7bc8a7980bed9a7 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 5190c82e89559ba0efaa79eee94a0d0c10f528da..c181cf6f00958f0ed90a78c0a9c3770031574bb4 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 1108e0344af8802efe1264d6fb83580de09a2e64..7ae698f10a150a717ece44b296a06343669833b2 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 2e1fcd471ae0cb7d891f26031a5e18c527b17777..24650ba082f331a0df6c7a00ba6826d0d6e98669 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 af5a1de1a10f54bc063d52678be91363062f5bd7..cf16dcbeb372ab908875e6332472d7a08660d240 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 1247b0ddac9361ba1412bbe3ae1eeb9b9004d6a3..b8c4fce59ff004a371612ddd831cb82ba89e6649 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 370c4b06d53c331da263b232aa7413543d8156ec..f0ccbfd7fca14001272ea83513c733f484183880 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 46aad195b822141866e24a2dc6b2512cfe958e8a..6a7bb77894aa901b3df2a9a5c34dade5f80b4c1d 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 0b005921176c433275bf2c2069d7c31e4d49d7a8..d8dbd21fa7cf9ac1eaaec691ea896ffd973bd83f 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 a6884fe330ffb11c748fa5e3488feef708cef983..5c8749012f7daf6d3c8d0c1b6c49b0e5b7c450a7 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 3e95b0690dc399edc14ab67a6d1a64a89873b859..78de8f7d9b8aed2c40a823855a792463ef27a267 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 ef92f71846c00374b406765d0524f9a83a7abbe4..3849a0d7b9d7a9440c288f0cbb7e370282fb15c3 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 0000000000000000000000000000000000000000..d45664d26ccf91fc59a5611659e9eada21e59f0c
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 cb3ad9621a2bc998b493d9321327847ab0e12c59..0000000000000000000000000000000000000000
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 aed5f667172e832f748a9867337a2ee9bf2dd162..d397c414e4fc44deedd000293ea2ce3f87c70dfb 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 f0de6daae21c0b97234d7d5ce20d5ce630020810..45187233d6872c47d4818e38104164ce425ce52e 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 727871863b0a710da8f2b1a204f438176b809900..c3d564da97880cb13e36cf95a763d1adb234908f 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 dab19d209b0c4953b71273a1d0d03fda1b23fb7c..f85c6cf68e3a8603329a2b2e80a53adb87b9b879 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 b18a2bedc49e9898fe2f7e0903412967dddd0561..1aa228d12b851f7b855ea450c1f988ee2a5eda01 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 f1b83a7b4d112879b183dabd5be9ffdbccc624f0..ee6f994afe35e97da0ffd0b3b4d16ba5566b3aee 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 5e131081a301b20a6038a703f2771a0e1858a2c2..8fe202a75c39a7587cc333f8108dfb1d5da9b769 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 cd7562c258fb60440eb69a6192dafad7bb7b7116..566de415c51aaed334edd1395678213855c07cd3 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 508426a1323456294b4ac6b8d8441daddb8c3b70..579b19cffc8ef1b420914e079f440885c388de14 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 48a857c8ff267ea04298de2e02c88b7f515c0516..a222788a04e70f23ff2da08d36580433ad1f8b48 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 d065cef65b91c176047432ab9a24f12b66afe0d2..e20d0ea3236d099bf7e8ddf2fbab1ba18a1c9290 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 9d36d984f20970fa09dc198b6a68cbeb5c0e3e1e..4d8bdc0bd90372540bb95469c200a6b7dd02cc9d 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 01dc7473dba95f6cfab267ad5a02fa905d72d3e4..4346f67fbc1092b8d456b57404beaddcb12dc61c 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 964ce753c22b3df688d14182776e46a4a5ea7942..8c3514ed4d5ba7d1dcd6ef155c2fb8a27c923a3b 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 303a6d63c5be0529c5d4cad6c6ac584be3afecec..793e3c98aa896377e10e34ce72dd5453caea9f92 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 e304ae620967f8f13ef2383a447a8dc49e29aba1..e8a12c8dfb2453e84a26e07649b03fb5c6aaede4 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 656e93f9e47cbb54cd84c8f40e91b33da5170b36..5f9dd31381cf8a343d4e65693f8d39b2041dc612 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 fb916e8e42fae1c47b68ae65cb6e88ee39619147..fd9fba7966c2b7d2973f04dfce382abdfcb9bd92 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 b317ab275c5d9bf94896bc3134efc6cfa0f3c67c..84d9e18c61e18cc85d42f98e56f3a64422f1e41f 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 9a492d94ad7c26c2fcc3ff4730c56bd13d1a9469..15ca53d1d2d00de34f62705493cdb46313e6e8cb 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 0521f619f7dad0b6c109c9c40676e39aa96a115a..24d92341f88afea4486c1edd5314c4459802cc45 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 684fcc09ae881274ab1ecdd30505044be1cea17c..dbf783efa4281c7d7db8a4a9dc443dc55f7b0e3f 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 cabea3778c5719ae60935a22c4b6590f31f10cba..97ae2f00d321584640d1c17c67b5ace86c9795eb 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 8017664ebc885362f381d6410072f8f24051d94e..84966014463af0e4fc7e7ebbaade9a44477852cc 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 a5776b393d629d6c73a2e852762d6211f66a013a..0d88747c0669cfb26472b16c1d2a8db3f60f7bba 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 74a72c89bfa89bbb22066d3e5cb88dfc725ca3e9..ea54ca684300f576ee1529b35da78d15fad917f1 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 0513ad809fdd489004494f6c8832c5507f3ec862..549594bb3cc8b3cc8420bb4da78da7fc50d8d71c 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 8b3564c1876031c6da3af19c304e8c3460c13c3c..46fda1379ea3bdb904f5d70f53730e27fb8395b4 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 f8c9d1dc0b17f07e1a4bde8ea0ac84afe29ae455..87064ada2003422a8f887a1cee71039163575363 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 bc683bcf3f2cdde78ce7b4670f46db6cca0a8433..4ff8de98406401a59640b4683f955b31494dbc8c 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 c8869cf6ed756530606d70bc74a637d41e5745b7..61f2e5b59a4f3825473456e65d11a47198272021 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 3129fca2d9974b55f5cd1dc3809dcb3eaae8556e..4edd461378171ab2f75e984a7c5fba16bb69b628 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 90043fb3e99bdc478ec4ab8fb2ce033471a53dfb..bb0be5243ade1e065a0126a1af572d3acc9e8d66 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 4a89f61212b887238e36e3d89fb862d3a9391103..96266be0482dd57adaf52d2ce1f7deca1101b408 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 7c4050f230b7d1341309543dfcc71fec4f5107c8..22e5ec16465cc5ece91418db6a419b3d80fca797 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 2e1fdbcfb96b6a84abebfc1b21005227529791c5..0eabb067e7300e4ecb4bb36237c5e5633eb73616 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 2a5632295dc556b38e8ab0de93accfe3bd7a17b2..65442f1abc973b131513a67dfa6acc5696e9697f 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 8b0f8fd5c746610d9332727f22ce9b4848d635ab..24b0d26ee02739a7fc1447d0268f9983f1f039a8 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 694b2bfb92b9d211dd2ce8bb1dd6924278957a4c..e7a20a3b3e4e509661eba1f4316c7d2ba1673077 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 1ec40a46ce3eb2f4bd3c134c4bb75bd13cce26a4..2564d61e22de8c332ffb37d96e029609cf9bb2d2 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 36fb7af9ca070a51391169afdada5d64dbdf4842..8a70207bf5887be9a1a9934df2b27b1796b4fcd9 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 c3ccd3e2823fa794eed35880641af6b394b3194b..4ddf0cda69d3e2ff68d2cd9f22fe198cde0e3296 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 405a3394ade13673c3463f48dddea16cbc73bbcc..c4fed0375e6dfabdb19f7d670018cdf7f432d941 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 70f79ba985e9f3d397d3ccd23e81078b3903a5dd..02ac4de8aae097a252d5335632bb9e185eaeaab6 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 56f50a07e569b4025c17e8e29cefdb6330eb2682..2d60c387a48c6ab49685f7bcecc13d42ee1550ea 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 e64b657c961c9ab8387bbdbfff21c605d9de557d..432c4addd82401e20249ae0ea991726424dca888 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 97dcb892ef00fedc6e8244c75c80e4a6ab08e873..c3763109099e613c36ad1af70f3ccff80c28e903 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 5d1529f3e5532d17de2e7acd61353cd155225dad..96044ee9df412a996b27aecb2ae552271268a984 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 d57e42c26f88c988e08e97d5e66d0749dea4dde5..005ebba21309a0f7fa4738d5ac6a1052ca7d9761 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 7f1c33640981530f226e6416c17fb9f2543e4822..336099ddca0cb86bb85ab6d1112996e981f36ced 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 4db15b35c2ef38aa9d1631b3ac195c2372dcbb46..f29129ecd76b7885a3e111359cd732fba8ee732f 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 6098207f751bc293062cbdc4be50c6bfb34b3ff2..7ebc6060da2d7b12e47d74d2028380b4f1447e40 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 0000000000000000000000000000000000000000..071a6d55a395c263fd467e0701640f8171d63fec
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 d7e798c57b52be81db79e93b316597b2cc5dcb83..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a6168fe97bf47cba5a5c78b646c4f12610dc7d16
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 59685fa07e28b41fb0a2a9239e2f79d9c226e781..0000000000000000000000000000000000000000
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 c6e012bc0ffb860145afcf6cb9e5d13c09dbdbf3..4cf272153c05f4d50fdfbe0416ca37ee27f55533 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 0000000000000000000000000000000000000000..071a6d55a395c263fd467e0701640f8171d63fec
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 d7e798c57b52be81db79e93b316597b2cc5dcb83..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a6168fe97bf47cba5a5c78b646c4f12610dc7d16
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 59685fa07e28b41fb0a2a9239e2f79d9c226e781..0000000000000000000000000000000000000000
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 ef42892532487f9492d2e76553252f5dd2f5892b..56ede10d98bcdbf9c4c0c3e3f9b1f0818551d27f 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 0000000000000000000000000000000000000000..d7437216ae2c8201992fc5f40eb38a17b707eeb3
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 7237f1ddb371dfabd4334031b26415984f154c29..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ee26e1c90d527ccd0457472e8cade676f9b618d0
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 2b85be0af3f4efde4a49b45739379a4e2eef7dea..0000000000000000000000000000000000000000
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 87fe3891c8477713eabdda131fe8552e576e8d01..513f7dbdc8a637e81eff0aef6585b75c162e77c3 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 0000000000000000000000000000000000000000..d8e2b764fec743b39a98b76b64289118634a8794
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 463c31ab761ef65423651339cc22cb86a1999fad..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..0a567e47fc84074e3358d4529f5f242e756824fc
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 6fef4df1e8ec6bb817243e9fc4e972f5d6fae7cc..0000000000000000000000000000000000000000
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 efa54259ebb5921cd10dfda91eb00c126fe19764..7404ebd90535943ce8c5e9986bc4577eb7f859aa 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 0000000000000000000000000000000000000000..071a6d55a395c263fd467e0701640f8171d63fec
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 d7e798c57b52be81db79e93b316597b2cc5dcb83..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..a6168fe97bf47cba5a5c78b646c4f12610dc7d16
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 59685fa07e28b41fb0a2a9239e2f79d9c226e781..0000000000000000000000000000000000000000
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 b1c11668578abd6d7582fb60d122623b190a7d53..c81d8b4ab7ebe2102b0611f83b05ced148883d58 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 0000000000000000000000000000000000000000..d7437216ae2c8201992fc5f40eb38a17b707eeb3
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 7237f1ddb371dfabd4334031b26415984f154c29..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ee26e1c90d527ccd0457472e8cade676f9b618d0
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 2b85be0af3f4efde4a49b45739379a4e2eef7dea..0000000000000000000000000000000000000000
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 5ad8da78095ce40a16f64dcc9ec0228e3693ff0a..e76334dd96a753c47f7e464b26a1988719397c2c 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 0000000000000000000000000000000000000000..8cd3e596c0e99fb02495bd009cf9de2e5e3e00f9
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 cb020e984c41d728f3f91040a67dd99ebb9a58d6..0000000000000000000000000000000000000000
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 8d932d190a7455260e3a77fe0998898ce5e76b9e..8a4702f331c1745c4b4766891f9f578b908bf9af 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 cbb8d9b2d960a15f8c4bbfd02fbd2c06c25d920d..35101c88dcd1e5931a3eb107b6186399cbcb325c 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 0000000000000000000000000000000000000000..e4bcd6e4da6e6b2f76e3fe04b8b2e1a78b6f12f9
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 008b324ab75c157ed305aa3abae8d30c818521b7..0000000000000000000000000000000000000000
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 dbfc25b0a5f187ec03d6526df76f6e3e26755a69..6fc01e40a976ea6a3247dc9ae082e4688b36c8a6 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 0000000000000000000000000000000000000000..8f4e0aa58a8a976cc0d057522b296e0c54c50977
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 a845bc1b1cfdb902cac367e37bdb04b67320e668..0000000000000000000000000000000000000000
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 8e4adb9b42b07036c052f9402e3794f47a824a58..abdb7754a9d1b160c01c4635465b1fab8a004cfc 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 b3b22805973f662da6ab640de736526e8a5d707e..f3c11e3dd316689df3972525c102747f547a7ce7 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 e07b9c7c07c5ec51da28f23437f24b95ad83f8c5..e01e832bf794d468b226dcff8958cffe61b14cb8 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 0000000000000000000000000000000000000000..9388b363c79ac0165f4d8aabdade3f49a7871842
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 dc3e1906f18e58d6f0a8d6312ba2a73f2e48a6ba..0000000000000000000000000000000000000000
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 08e7ead420eb2db26240ab001491acf5698376d5..ccb66696519a34a59e6dc12dd20dbe04c4811384 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 0000000000000000000000000000000000000000..0eae92bcc3802e2f673ecc9997bbe2d57e47e688
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 ca85ba8063824ecbe4095730044988eada19631b..0000000000000000000000000000000000000000
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 cb9761de7fd9c1116efce4e822c3308f1eaa7846..49ee086678ae147d433c6a023c45554a0d288c4f 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 0000000000000000000000000000000000000000..6e55f47ccd69b0c25e2437cb6d4b180fd886b7f5
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 3711f06e0fc468ce68c6364844a55a14882acb48..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..836a6e111418255c2f5a95bbe67cdea249a18364
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 3765e65b0f81b5134c13008174b0d8bfdb1545d0..0000000000000000000000000000000000000000
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 f7c771ad974aea33517c4db993d416bcbaa4cd98..2c37d12543690db45df235cb96c33c0f418aa6b5 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 a7abb6ad59b4c2badba9e23499190691e08d20d4..bc1d60a406808b2b0a1e3ef10d6cde87826b2e1f 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 0000000000000000000000000000000000000000..92638c1ecff220614d0413b1eaa8a7ddd7055577
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 fb8fea9c079896a0d34f3e3586f78d9bd28f6a79..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ba3c346263879b3786c8ca70abf9744ec6d16fd3
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 dd4fa01eb775f68d1a340e3b26c64c4c677640dc..0000000000000000000000000000000000000000
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 05fa3ec618a30e2f2579f28176fcf0edf2336401..2cd9c7a6ac03ddff4b582ba210cbf3770b55922b 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 20503bd4c55e14e7a16f78c323ea80f261912b4f..8e98d985da0e2bd04dac8cf165e0c60a187d6645 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 ddee346fdbd2d1d7be6c122226a47bb29d3559b2..ea523c2fcf26c2a098873e2e9f0e6164d0b63c3a 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 40fc0be9d2ddd4a4479b0ff8dce8a1495c53238d..a9b30800e080dda0d1600efa3620b5a940dc001c 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 783bac9b8c3e5b5c5bcb2dab7f9edbe4c2c7a482..316d961c6474036694c242622427f8f4768d2473 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 bbc15af2bea3cd9412c897992097aa4d9b4838f9..27ce0185b0dd53d66c9e7fd28e97a602d6438a3d 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 972af4b7d75eaaeca14255aab52097246c5c3a60..608f366716adef3f6f06f3ad06aedbcfa1ef30c3 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 0000000000000000000000000000000000000000..7a459cd3b5208d58fdc9b386291742f4bb206134
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 8c8eef39ad5047b089a4885593e888985799c711..0000000000000000000000000000000000000000
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 93bf5ef2b9cadb631ea4020fa49f916d65240ff6..c0644725bb5ce4ad3dd4cf29707779cf94d44197 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 ad1ac346bf7efd1d22cd32539ef74c08655c62c1..59a37bc2b6ad88b699baae77d4f9bb9a52531d39 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 15a5adc8464233795a1e7359378682cbca582c69..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..7711e02c040b5f61be6b6f1f6f8b04370b186218
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 d48e59801fa43b0433cc74a3b0813a04bfddfd59..44810e666ce31320b988e990de0e318fdfa8f3c0 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 0000000000000000000000000000000000000000..9b6f808c454eb44ce74315d8bd869de8a62cc587
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 eb78e27b3af702772d9b0d6c608816d0e0ac44a0..0000000000000000000000000000000000000000
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 4df72d608116ad8542b4a68c9bb9fa2c15aad9bd..8515b4218df353571eecbede9307ece8f3883029 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 0000000000000000000000000000000000000000..64d35dc53a2be9608feab25925d6cfd21782dcfa
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 0c611e0dabea8ffaf8b819aef0e8e67cd1d4649e..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..eb7b6dc6980e534d089b730cf8f34d6908b44b0d
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 f2e92f2a5293595e9eab97e203fcb96706a1999f..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..3d34355db59a6b5ab3cb39b43b3c0f8b98b2f684
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 6d5d0b761003f6a4e1db142afbf42dd2d88f4d12..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..acfc38fe95905079afa242ef4d866f7d661f5598
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 5b950b13bb328bd53cc13610714576458e8a6f08..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..d2846d5a482d2cad51a6ac6b803c65c165d013e8
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 7db82252fbb382c7c574f47b7813320747327380..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..9736cdc15c15e78f4c7906b091ceed972f3780c3
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 0d85c15f1b67c201ad27b38ac529f58c8d640f3c..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..c790091900ab2365766b1542e761b4dbd799af20
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 764fef843da213ad45d6b578d5c01dfe3221d059..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..d472dab5580a715969795bbdbb6d243eea9846f1
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 0b17c0986aa7b4394a0abc1d17b4167bcc7152d8..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..7753ece1fb3984bd76fedfa56f635bc3415966a7
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 990640cb6f19141c07e42316f0397fbf14fff149..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..0e6c8c1a10a323952b92f6b6ff74abd9a3ab583c
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 9b08ed650b675e0d7d4e14dae59ec7f8bc61d5d4..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..e83748e708ac2a6ddb3ce48e597774c5a55bcf2e
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 0b2de806d2748477a7ab059d1b8acb42f3916dab..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..9f7f87169f93dd6863b01a655830187b835d1448
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 f5a9348cecc3c420c94d23a10694bf0c1ed8ab96..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..cbaa0a21049533a878a23814970fb392197d2766
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 8e776d971d6a463fe20794d7abddde2417daf0fd..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..6c463b7fa8c6e51b92f120aeaf0436eebaecc935
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 d92855e3ee2c850abfc544284d483cdc14a10739..0000000000000000000000000000000000000000
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 a72e5afa598e5cb1455f02d7987be04987b3a020..5c71d7bf80d8c986370b7e4ecf70a58ffb4fd303 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 0b98f6d5c414ea0a6ac768e919cfbd60ee5bef42..51d5424c2f8f57b7ce7103aa32f2b074327fcf66 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 f96710075f56464ab6f761b3f6018be0bb4d75d1..030ca65e1051c333dd559ce19a827aaff80193b1 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 0000000000000000000000000000000000000000..da9d52aaa02bae52fde4b6524c4d599f55445650
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 38ca5294f0990e8169e32b35389aeccced269322..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..e08a657fba7664b43037150c6bef9c3f894dbcc9
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 592bce499536e8e7127db8d247c0d592ec7352ae..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..52e6efee2ce92dd979e97d6f13f0ab9ed3d62c01
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 353b6aaa6733338d3d114fdb3f86bc30618f9b10..0000000000000000000000000000000000000000
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 e8a202cd5fd7f25eac8efccca7323da904cc9df1..8c6d7fc14f82d3ad985de9b2da82e83ccdddffe0 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 80e41120d9709eb8bff2b25b42842b5c44d48f56..3d2d4640a75ae75f7fbcb9f988960350ac49cc9d 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 37736d3d1f58da229afc3c779f8bdb6bdb4827da..abdf23747d0bef18f7911c0f90c8f1eb1eb9cc5a 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 cabe5130114a0034a8a8e4cd14488e05a4c1760d..95a914377dc285c4c44eb642c5b647d476e05759 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 3dbdb6a4c26b1b93288ed8e55bb13329c7e00301..9482a6ad0d4b7177ea3f8cc647cd0e99df03cda6 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 3cd30d8c25da419f87c4495fdf9e5588770a7864..e08329a1bc5a6eaa1f4edf1d05f1aba639f40c93 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 9e76f2b6eda6178f7d998d38d45ec220d9104b0b..843192fe2cc1928708787149310d1a35d2940316 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 b477ec8311d2a4d57351a0351e767f4d50f1e788..438d56c446ae992c8793b55999f8af60e8ed4ec0 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 f0a906216d201f446092c26aab509eb09dfa4946..f2dd987ff033ff0b959f63042f2a21e8a4a13644 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 0000000000000000000000000000000000000000..62129543c635cd34bb78621f20683806bd075791
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 35b760833065a8b4d975ccafbd8ce04a2912b4fd..0000000000000000000000000000000000000000
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 873225c3f99f5db8b573ee8d94fdddc7caeafd67..da374e37679edb2db65ed501673c7177003d6837 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 31301523e91d021889c01f6757c9288beb9cad45..72c69604690ad5781404d1e8bcdada1b164740a4 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 fc2d62e359b28d35888ede8b726c67a9ddcba3da..860334ed147780ba99e9f1d64f07410b2b03baa2 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 d326d205b15605a3d669bc7a5dbdf7397840ab04..d2833fcdb33fa58948771de203ea985ad4e56347 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 63a6b92f6dbbeb22a8f3047855e09b0373cea2b2..0d1f4f5e95de8c54f9e9324265431b6351b8905c 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 0000000000000000000000000000000000000000..76f0087494152ff6a631c1460916c3a90e6a4197
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 bc2fd5ec7a3be4c80adc824ae6501c2ec0f07d0a..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..02571f6b5444144b77e354f6e2017ac5dd7fa4ad
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 260acae4cf0c0d62407c088d6677c161fb689f3a..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..292050be904cd3487f454162d7715a448345997b
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 b572a295e5eeca57bb318f1d8e9841790e2bef42..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..36a0bee3918e882546c33a2db4a659d46f8aa7f4
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 601cdb7c25e7d8b2212a02ab71180e78f164a05a..0000000000000000000000000000000000000000
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 f59878409541e2db23a9391d1ee2e86eb2dde9cc..b28f38444e7c5e8624a95d89f54cc0892743acfd 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 7a7bb483c0f61188765c1b3baae461c2cd761f5c..0364849577043367e42b0f4ca07b474c80d7c545 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 b2cd11317fd93fe77267f94504b7b6117b5df68f..b3a56a411bd922f31cc26c78e4e4dfd2f85436de 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 a959c37b6b7ec79dea510afdfac187b7bd2f9284..ae3454bcc7e4ac1933b1e1c668e57effd3a0e8aa 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 fa2a87dd8e29a5f22f1b8063b2b0bf151f9590bb..5b99c930816320b458b892197acf43c946708c7b 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 fd8032387bb45a4bace827a2170816b2c70cf6a7..e092030957e5c0ae7c83217549cbd628d1c15128 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 0000000000000000000000000000000000000000..63b9193409afb87fd4fdf910d1472cb047178cde
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 1f3d4c2ec5174a7a6bcfa33588d1320201fff9f3..0000000000000000000000000000000000000000
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 7104f55871d1379511f7f4be9bc904a7c8d1579b..bb33520cb68f42951fe1021bd57189c57d824723 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 7256f3eb7c94105cb6d4524dc8f9b94288a21d5a..defd9177435420c24f6104a8e95c81d554e51ffb 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 f119572c517a376d5e1fd02f17a13b3095d3381c..6483f98642f6f49afe57436d52ae81420026fddd 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 0000000000000000000000000000000000000000..1e5e5fbc1da899e83f20cfdbfe2dd33efe67286d
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 32bba083e85d567e9201f7837b30bd524965f006..0000000000000000000000000000000000000000
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 8d3a02d1e77c6b93f46f1b4f233c05a754c3c3d1..236dd26947901f7e8b33738427759c0706c9f18f 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 2b0b2818ed3fb7d5962a21bae33c7ea9ddccd6af..2c83775570f321147eb6507ca688144fd729b1bc 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 76f34a9dc9c36ff6354adee4823bb68ee05bad7e..b7d9d9e8a2cfd36fe7e98a4f1da12efbfead3716 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 e1cc3192c32296f1da197c2488439d211d11ba22..62c6b93cf3ab81f57953f64581e41eafe64bfdfe 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 1d5adf11167a63f1ed895f431d3986a485a7c3c1..c598c35ec8390caa86137f17a35dfa94cd379ea0 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 73f281892743a80f3b127bc869f16ced95cae65d..8769fb8d168134e1532d6744dd2478f42c782424 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 e5c270c412af7f5ef9291e13b6f8a73e330c7826..31abe4c03f832468df3f44d76ba17d0cc4b89bb9 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 d8270b90835eb2d17072a3a904796a1ec41a5a0d..9c8b80498c0d9d34aa7cad5bf3c39e5920729bcb 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 4f0480583a979c3c280b09feb4d13e9c8cb4b237..31d996812530b07cb68152b89556e8561591bc88 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 1aa61378d467835de3bc074967cce66e4dfb69e9..204769e2bd959fc204e3a4e17bcf081b599194df 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 afaea1bba05835a9102f2786d0c213c9a07545c2..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..2d3e74236d538214d05ce0593fcc2934205b7eb3
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 0000000000000000000000000000000000000000..ade9d548b4b56c1c992c59563daa1ae6b7877ee8
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 f64774db3edf3b2caa5bc59ed3fab1e0fd862a6f..0000000000000000000000000000000000000000
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 83805ea7aa6ce982b566007bf7980a0160fe7da6..5d3acf6911e91bb954fecf85d742c7b3109e5a4d 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 4d6e4e19b269386e0a79c647bcfe101100eb837d..b8e08be2bd94489d24da7fe5182ae7b80dc0d279 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 31470fed7149a06d344dac08c93fda08c7074df8..99d14af843823b92bfdab2a5fb902e2e82316621 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 fa918c1f5695db0c0fd1c3eb5b39ce1bc201b398..8c38ec99005a9bd32453095c32dbc52c10b27f82 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 60ea89cae57c0b9a9fe41bf7be78ecd6041e34b5..d4f983671bb3164c1e5e81c2d65042e2862ec83b 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 3c02228f6c1a0d83a40e4d725e93e2b3ee3143f5..980af2f3d4e905482326d1703eb4ac584532f1f9 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 a47cf51807aef5fa580b84c0ba9eba9069e3b5e0..720ffee5aa19a0990dbdb16e16c22a3667c8d4a6 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 c7cbc5038a124efb6d5bf6d155f89ecceadd602a..699fd540190af6ab45356e2a31c264a3cd5a9176 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 7996e09544ff2433e7556515c323ad7c5f890d42..10658582054cf1b5506b03073967a57f1db0e7af 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 f225dc20980ede3403f8ce8c6b5e485475f831be..158354408210fe6b424754c12df8ba9184621962 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 0000000000000000000000000000000000000000..d1c4041afd4e4cf9ad46129054ee6b1938dc4581
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 03bfa42fddf9ade56205cdfaa14c589d58594f5e..0000000000000000000000000000000000000000
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 a70694f7da90c4ce8e03838b6009751408e6ebf7..645b6af11efe8bf792459c196598b07130bbf2eb 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 1e55d8dc4f0e4c116fb99438b2c285842d67dfba..3e06d70abdddc839a10142094cff9e56cef1ac39 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 f6f9d79ed762676aaeafeca39ea44ef59ce72d14..0752e4f4f8a6fad77633990c04b9cceeec43a0c3 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 f5dcd8641e75a4ea11503a969d6a8b6b0843acc5..7863410cd07a161a6e455fe8cc46adfe34fa202a 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 ee6a0115e0182d8d7ae83c820e36bbe22c42568c..9b6fd681f1631fd25f9c836f5f3c8c0d63dd5d94 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 0000000000000000000000000000000000000000..25c09a2b71f1b66d259a7a69ead081c7354bc458
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 d0dfe2ac6eff05a473005be78e873988b788c4e1..0000000000000000000000000000000000000000
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 50a61dac52a0fbceb5b817a76e51d80b3ad5507e..eee90a0876b391ae705a1ea6c76048e2e4d10ad4 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 30d8346ecd358cce83cbb1a7a968b345b5334117..41656ab2e367f505d227bac7296f7173983fab37 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 0f1da63e415a7e1b8d2bc566d9d82562d56ddd0c..8673caa4583b567441013ebd610e6310c2b9970d 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 13bfcf42f1ab63023974bbb89c67ab124d66df9a..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..34669d9fe87f99029e85832b3b5e86f7c0f5c7a6
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 481d452be045a51c24b9e7831588a65295d37d97..92f7fbac4fa8a9bd8dcd23922a7e01cfacb58c8a 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 0000000000000000000000000000000000000000..a593038b608e6189df6dd8c3adc7d6cc0ec2aea4
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 ea497f7e07aa7600a315f86841ecb0fd8602f914..0000000000000000000000000000000000000000
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 ba323ac0cb0cd1c3b19e496e214b15745d0754a9..60f780ac43d7cbe0015f60a289e65224d53fbc65 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 ffe17a735baf6c3b68c88515afe5ceb40872fade..d44998fbd1093c9e4fb41f9de7c4613be62a4102 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 e22b69bbbd83899f0a906d9c6e27ceccf80aa07d..ea5a330b514b0802a2ced8e6868c466ca55dd964 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 96797d7b73655dd50a3ad6e3c7fafbf7d2047596..44cc7bed3260b42271184cf3cec9f3b23070bc95 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 bc9e1bdef44cabe279031a051189d5bb1d4ab19a..8f600d976cd1847da8f0232f2bb09715e89f1514 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 229566701201ddbadb62181c084ff694aa2bea6c..11ae6a7213af49aeba5e1213e3d9da181586b8ee 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 30a9dfde8aaccae1f42bd6e2d12acf381e4f0c78..428ef984eeda9cbc4f2bba40c788e118ea0c933e 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 e5fb3eeda44c70b890912139c38f09102eb37dc4..5674ee69e7aba363c1f8cab2c87e28ac567bf119 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 05dedec1f2f469e391677b8530b4628b9460b5b0..ae854d4f79ae7752c57f6e51921670e8d0685b65 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 36c7491b5085e41ce27ae96b9a7784821a1d144e..7cd19653b43356e6152005bb4646bbce68a5caa6 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 03eba48eadb9cb9ce0108993e8d5f6e7dc67a88a..f552fc835683a7c62c7a7bf66b667ba85fea3712 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 577883cb28380a93d20a2595c954dfc1abd7d427..c18647cfb7f475987aa492f7d467cd4d50c5a419 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 560cfe7b75c96d98c6925f78cff67af25b51bdae..e881f9e2575943f709e003dba355edc87f51f774 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 4689c2083b5cbfeb3ad7c77aa7f36d16c0a953ef..2dab5a453f0bac61311801380c96d85dcb0f494e 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 c14ffe92e93f6134b127ef26daf4fedf7fd7ebbd..112552facb38d6f04f2e54b1386814ef8330249e 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 87fd92993f9e3a1a5c61f365d21f040aa65e60dc..c09374996e765ebfcd3478c40e422de721fe038e 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 0000000000000000000000000000000000000000..5bf9c65d27d8785b057b76b6a79a8b6cb30fffa8
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 9eb466d636c2202af189f255286ca426fc704bba..0000000000000000000000000000000000000000
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 943b024413a06dc6cdad8cf53a9c36cea6033f34..39b47a39267a6b7aa8b57fcd10920b3c89c7e022 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 0000000000000000000000000000000000000000..ecc0f6b887b5023df17cbae76807a8f53930530e
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 11f6dda859375c5b4f45d1123bcc182f227f194c..0000000000000000000000000000000000000000
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 2f9d8a126814f3067385265a75ec15a760d8c773..7fb70d017805a25dde4edd29112dfe8e38b7be38 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 0000000000000000000000000000000000000000..2d35b15d57791d1d06a6f08c3b25698e528ce97f
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 65adba51b7be778b6d3006d8bfd32ff4930ad9c2..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..780a9202026edefad5b751cc3a77b40031620346
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 6d05551a0ab6cc757df01d7759b567e0622748ca..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..8cb975f01ce6b5798e5289b4e78c7c63ab35729d
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 a1cf3a421096b310fb2478c65c14fd246cf2d3a2..0000000000000000000000000000000000000000
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 838efef2d49cbafb1f8f2d7de1d5ea59959b87b4..b851756cdc509274a6f03df98cfcacf0121c38c7 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 0000000000000000000000000000000000000000..ad0c86ecbef776215cd53176ec912e89b919ae1f
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 a682b5a240e5748d85abdca1a9a7396a508729b5..0000000000000000000000000000000000000000
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 7a0ed1811659b34c27021b298fda74e892df8807..f3f1839f61a3d0aedabbd951033770a9cb414d34 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 114e6ddc7e3f5d9784246faeddc3d0ba251e4dd1..82759b11afafb3f7a07fc8a1d6ca36154e4e4011 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 22f1a7f8f5be30b022cd72d831395545b1f2a54c..33fdf22a7d29922a7f898ca7189b195d1d3b0674 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 0000000000000000000000000000000000000000..8979ab54d5ed90b70faa82bd8f07fdca1520850a
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 70a83dcf5d47e6e5940fb464dbe688fe8bbe6782..0000000000000000000000000000000000000000
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 0e4a572a69b427cbe0624fe76db3dc1436686983..d8a4b9c59931b10dc0fc0a70860f3f07e1b69171 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)