diff --git a/boards/beagleplay/images/OSHW_mark_US000083.png b/boards/beagleplay/images/OSHW_mark_US000083.png
deleted file mode 100644
index 6a515b975fc47628c7919506564538c290315d70..0000000000000000000000000000000000000000
Binary files a/boards/beagleplay/images/OSHW_mark_US000083.png and /dev/null differ
diff --git a/boards/pocketbeagle/original/images/OSHW_mark_US000083.png b/boards/pocketbeagle/original/images/OSHW_mark_US000083.png
index 879c30c39df97bee6c752feddbadf04fb70331df..6a515b975fc47628c7919506564538c290315d70 100644
Binary files a/boards/pocketbeagle/original/images/OSHW_mark_US000083.png and b/boards/pocketbeagle/original/images/OSHW_mark_US000083.png differ
diff --git a/boards/beagleplay/images/OSHW_mark_US000083.svg b/boards/pocketbeagle/original/images/OSHW_mark_US000083.svg
similarity index 100%
rename from boards/beagleplay/images/OSHW_mark_US000083.svg
rename to boards/pocketbeagle/original/images/OSHW_mark_US000083.svg
diff --git a/boards/pocketbeagle/original/index.rst b/boards/pocketbeagle/original/index.rst
index 4b9ff76eb5f713c82c1f01d97279c075aeda4bd3..6e38371600e0510fe6945a50055ec6e533a4a9c4 100644
--- a/boards/pocketbeagle/original/index.rst
+++ b/boards/pocketbeagle/original/index.rst
@@ -11,6 +11,13 @@ PocketBeagle
- Maintaining author: `Jason Kridner <jkridner@beagleboard.org>`_
- Contributing Editor: `Cathy Wicks <cathy@beagleboard.org>`_
+.. admonition:: OSHWA Certification mark
+
+ .. figure:: images/OSHW_mark_US000083.*
+ :width: 200
+ :target: https://certification.oshwa.org/us000083.html
+ :alt: PocketBeagle OSHW mark
+
.. note::
Make sure to read and accept all the terms & condition provided in the :ref:`boards-terms-and-conditions` page.
@@ -21,17 +28,12 @@ PocketBeagle is an ultra-tiny-yet-complete open-source USB-key-fob computer.
PocketBeagle features an incredible low cost, slick design and simple usage,
making PocketBeagle the ideal development board for beginners and professionals alike.
-.. table::
- :align: center
- :widths: auto
-
- +----------------------------------------------------------+--------------------------------------------------------------+
- | .. image:: images/PocketBeagle-size-compare-small.* | .. image:: images/OSHW_mark_US000083.* |
- | :width: 598 | :width: 200 |
- | :align: center | :align: center |
- | :alt: PocketBeagle | :alt: PocketBeagle OSHW mark |
- | | :target: https://certification.oshwa.org/us000083.html |
- +----------------------------------------------------------+--------------------------------------------------------------+
+
+.. image:: images/PocketBeagle-size-compare-small.*
+ :width: 598
+ :align: center
+ :alt: PocketBeagle
+
.. toctree::
:maxdepth: 1