diff --git a/lectures/latexkurs.cls b/lectures/latexkurs.cls
index 2971105..12e0f2a 100644
--- a/lectures/latexkurs.cls
+++ b/lectures/latexkurs.cls
@@ -102,14 +102,26 @@
 
   }}
 
-\setbeamertemplate{headline}{}
+\setbeamertemplate{frametitle}{
+  \vskip0.01\paperheight
+  \hskip0.02\textwidth
+  \begin{beamercolorbox}[rounded=true,dp=0.5ex,wd=0.96\textwidth]{frametitle}
+    \insertframetitle
+  \end{beamercolorbox}
+}
+
+\setbeamertemplate{headline}{
+  \hbox{%
+    \includegraphics[height=0.12\paperheight]{pics/fsfw-banner}
+  }
+  \vskip-0.12\paperheight
+}
 \setbeamercolor{footline}{bg=fsfwblue,fg=white}
 \setbeamertemplate{footline}{
   \hbox{%
-    \begin{beamercolorbox}[wd=\paperwidth,ht=2.25ex,dp=1ex]{footline}
-      ~
-    \end{beamercolorbox}%
+    \includegraphics[height=0.12\paperheight]{pics/fsfw-banner}
   }
+  \vskip-0.08\paperheight
 }
 
 \setbeamertemplate{blocks}[rounded][shadow=false]
@@ -142,7 +154,7 @@
 \AtBeginSection{{
   \setbeamertemplate{blocks}[rounded][shadow=true]
   \setbeamercolor{block body}{bg=fsfwgreen,fg=white}
-  \begin{frame}{~}
+  \begin{frame}
     \begin{block}{}
       \begin{center}
         \Large\strut\smash{\textbf{\insertsection}}
@@ -152,18 +164,10 @@
 }}
 
 \AtBeginDocument{{%
-    \addtobeamertemplate{frametitle}{\vspace*{-\headheight}}{}
+    \addtobeamertemplate{headline}{\hspace*{1cm}\hspace*{-1.05cm}\vspace*{1cm}}{}
     \frame{\usebeamertemplate{title page}}
   }}
 
-%%% make beamer always use the frametitle template, even if frametitle is empty
-
-% https://tex.stackexchange.com/questions/133698/calling-beamertemplate-frametitle-even-for-empty-frametitle
-
-\RequirePackage{etoolbox}
-\patchcmd{\endbeamer@frameslide}{\ifx\beamer@frametitle\@empty}{\iffalse}{}{\errmessage{failed to patch}}
-
-
 %%% misc
 
 \newcommand{\GNULinux}{GNU\lower-0.25ex\hbox{/}Linux}
diff --git a/lectures/pics/fsfw-banner.png b/lectures/pics/fsfw-banner.png
new file mode 100644
index 0000000..1992f7b
Binary files /dev/null and b/lectures/pics/fsfw-banner.png differ