diff --git a/boards/actinius/icarus/doc/index.rst b/boards/actinius/icarus/doc/index.rst
index 8092c53c8c9..4ac623efe2f 100644
--- a/boards/actinius/icarus/doc/index.rst
+++ b/boards/actinius/icarus/doc/index.rst
@@ -1,17 +1,8 @@
-.. _actinius_icarus:
-
-Actinius Icarus
-###############
+.. zephyr:board:: actinius_icarus
 
 Overview
 ********
 
-.. figure:: img/Icarus_front.jpg
-     :align: center
-     :alt: Icarus IoT Dev Board
-
-     Icarus IoT Dev Board (nRF9160 Feather)
-
 The Icarus is a cost-effective cellular IoT board in Adafruit's Feather/FeatherWing
 form factor. It is built around Nordic Semi's nRF9160 modem and combines
 LTE-M, NB-IoT, GPS, accelerometer, USB, LiPo charger as well as
diff --git a/boards/actinius/icarus_bee/doc/index.rst b/boards/actinius/icarus_bee/doc/index.rst
index 630d0aa07c7..32378c92d45 100644
--- a/boards/actinius/icarus_bee/doc/index.rst
+++ b/boards/actinius/icarus_bee/doc/index.rst
@@ -1,17 +1,8 @@
-.. _actinius_icarus_bee:
-
-Actinius Icarus Bee
-###################
+.. zephyr:board:: actinius_icarus_bee
 
 Overview
 ********
 
-.. figure:: img/icarus-bee.jpg
-     :align: center
-     :alt: Icarus Bee
-
-     Icarus Bee (nRF9160 Bee)
-
 The Icarus Bee is a cellular IoT board in Bee/xBee form factor.
 It is built around Nordic Semi's nRF9160 modem and combines
 LTE-M, NB-IoT, GPS, accelerometer, SPI Flash, RGB LED, Button,
diff --git a/boards/actinius/icarus_som/doc/index.rst b/boards/actinius/icarus_som/doc/index.rst
index f3206e63fe3..ea4f47a4cf3 100644
--- a/boards/actinius/icarus_som/doc/index.rst
+++ b/boards/actinius/icarus_som/doc/index.rst
@@ -1,17 +1,8 @@
-.. _actinius_icarus_som:
-
-Actinius Icarus SoM
-###################
+.. zephyr:board:: actinius_icarus_som
 
 Overview
 ********
 
-.. figure:: img/icarus-som.jpg
-     :align: center
-     :alt: Icarus SoM
-
-     Icarus SoM (nRF9160)
-
 The Icarus SoM is a coin-sized, easy-to-solder cellular IoT Module
 built around Nordic Semi's nRF9160 modem and combines
 LTE-M, NB-IoT, GPS, accelerometer as well as an eSIM and option for
diff --git a/boards/actinius/icarus_som_dk/doc/index.rst b/boards/actinius/icarus_som_dk/doc/index.rst
index 7f9291489a5..bca73ddbde7 100644
--- a/boards/actinius/icarus_som_dk/doc/index.rst
+++ b/boards/actinius/icarus_som_dk/doc/index.rst
@@ -1,18 +1,8 @@
-.. _actinius_icarus_som_dk:
-
-Actinius Icarus SoM DK
-######################
+.. zephyr:board:: actinius_icarus_som_dk
 
 Overview
 ********
 
-.. figure:: img/icarus_som_dk.jpg
-     :width: 450px
-     :align: center
-     :alt: Icarus SoM DK
-
-     Icarus SoM Development Kit (nRF9160)
-
 The Icarus SoM DK is a single board development kit for
 evaluation and development on the Icarus SoM (`Icarus SoM Docs`_).
 The Icarus SoM features the nRF9160 SiP from Nordic Semiconductor,
diff --git a/samples/sensor/lis2dh/README.rst b/samples/sensor/lis2dh/README.rst
index be2216e8c9c..23a86bd1523 100644
--- a/samples/sensor/lis2dh/README.rst
+++ b/samples/sensor/lis2dh/README.rst
@@ -29,7 +29,7 @@ Building and Running
 The LIS2DH2 or compatible sensors are available on a variety of boards
 and shields supported by Zephyr, including:
 
-* :ref:`actinius_icarus`
+* :zephyr:board:`actinius_icarus`
 * :ref:`thingy52_nrf52832`
 * :ref:`stm32f3_disco_board`
 * :ref:`x-nucleo-iks01a2`
@@ -40,7 +40,7 @@ and get access to the console where acceleration data is displayed.
 Building on actinius_icarus
 ===========================
 
-:ref:`actinius_icarus` includes an ST LIS2DH12 accelerometer which
+:zephyr:board:`actinius_icarus` includes an ST LIS2DH12 accelerometer which
 supports the LIS2DH interface.
 
 .. zephyr-app-commands::