diff --git a/agenda/preempt-rt-agenda.tex b/agenda/preempt-rt-agenda.tex
index 3172fab020..f100619a3d 100644
--- a/agenda/preempt-rt-agenda.tex
+++ b/agenda/preempt-rt-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{onsite}
 \def \agendalanguage{english}
@@ -9,11 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onsiteagenda
 
diff --git a/agenda/preempt-rt-fr-agenda.tex b/agenda/preempt-rt-fr-agenda.tex
index d451049123..b9656c91d6 100644
--- a/agenda/preempt-rt-fr-agenda.tex
+++ b/agenda/preempt-rt-fr-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{onsite}
 \def \agendalanguage{french}
@@ -9,11 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onsiteagenda
 
diff --git a/agenda/preempt-rt-online-agenda.tex b/agenda/preempt-rt-online-agenda.tex
index fc9bc718e3..ab22effe99 100644
--- a/agenda/preempt-rt-online-agenda.tex
+++ b/agenda/preempt-rt-online-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{online}
 \def \agendalanguage{english}
@@ -9,11 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onlineagenda
 
diff --git a/agenda/preempt-rt-online-fr-agenda.tex b/agenda/preempt-rt-online-fr-agenda.tex
index d91878d815..73172a785a 100644
--- a/agenda/preempt-rt-online-fr-agenda.tex
+++ b/agenda/preempt-rt-online-fr-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{online}
 \def \agendalanguage{french}
@@ -9,11 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onlineagenda
 
diff --git a/agenda/preempt-rt.inc.tex b/agenda/preempt-rt.inc.tex
index e274007ddf..bcd3cb5810 100644
--- a/agenda/preempt-rt.inc.tex
+++ b/agenda/preempt-rt.inc.tex
@@ -17,6 +17,8 @@
   \def \trainingduration{2}
 }
 
+\def \trainingicon{common/flaticon-preempt-rt-training.png}
+
 % Training objectives
 \ifthenelse{\equal{\agendalanguage}{french}}{
   \def \traininggoals{
@@ -291,7 +293,24 @@
   \end{itemize}
 }
 
+\def \feshowboards{
+    \ifthenelse{\equal{\agendalanguage}{french}}{
+      \section{Plateforme matérielle pour les travaux pratiques}
+    }{
+      \section{Hardware platform for practical labs}
+    }
+
+  \showboarditem{stm32mp1}
+  \newpage
+}
+
 \def \onlineagenda {
+  \ifthenelse{\equal{\agendalanguage}{french}}{
+    \section{Programme de la formation}
+  }{
+    \section{Training Schedule}
+  }
+  \begin{tabularx}{\textwidth}{p{2cm}p{5cm}p{11cm}}
   \showagendaday{1}
   \showagendaitem{intro}{lecture}
   \showagendaitem{preemptrtpatch}{lecture}
@@ -305,8 +324,15 @@
   \showagendaitem{realtime}{lecture}
   \showagendaitem{debug}{lab}
   \showagendaitem{qna}{misc}
+  \end{tabularx}
 }
 \def \onsiteagenda {
+  \ifthenelse{\equal{\agendalanguage}{french}}{
+    \section{Programme de la formation}
+  }{
+    \section{Training Schedule}
+  }
+  \begin{tabularx}{\textwidth}{p{2cm}p{5cm}p{11cm}}
   \showagendaday{1}
   \showagendaitem{intro}{lecture}
   \showagendaitem{preemptrtpatch}{lecture}
@@ -321,4 +347,5 @@
   \showagendaday{4}
   \showagendaitem{debug}{lab}
   \showagendaitem{qna}{misc}
+  \end{tabularx}
 }
diff --git a/common/flaticon-preempt-rt-training.png b/common/flaticon-preempt-rt-training.png
new file mode 100644
index 0000000000..6295778842
Binary files /dev/null and b/common/flaticon-preempt-rt-training.png differ