diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 8001859cac45485381c65e77dfc5932ecd806647..c1a8381124d0ba193d2274c191815726417aa509 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -586,7 +586,8 @@ class pluglist
         $cleanup = $remove_lock = FALSE;
       }
     } catch (Exception $e) {
-      $smarty->assign('header', print_header('geticon.php?context=status&icon=dialog-error&size=32', _('Fatal error!')));
+      $smarty->assign('headline', _('Fatal error!'));
+      $smarty->assign('headline_image', 'geticon.php?context=status&icon=dialog-error&size=32');
       $display = '<h1>'._('An unrecoverable error occurred. Please contact your administator.').'</h1><p>';
       if (ini_get('display_errors') == 1) {
         $display .= nl2br(htmlentities((string)$e, ENT_COMPAT, 'UTF-8'));
diff --git a/include/functions.inc b/include/functions.inc
index 78152279a54fad125ebae64a4b65fdc20f009033..b0c4459df4b78500d85a2b7bb4c9fa7f4a11cb9f 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1065,33 +1065,6 @@ function check_command ($cmdline)
   return TRUE;
 }
 
-/*!
- * \brief Print plugin HTML header
- *
- * \param string $image the path of the image to be used next to the headline
- *
- * \param string $headline the headline
- *
- * \param string $info additional information to print
- *
- * \return the $display variable
- */
-function print_header ($image, $headline, $info = '')
-{
-  $smarty = get_smarty();
-  $smarty->assign('headline', $headline);
-  $smarty->assign('headline_image', $image);
-  $display = '';
-
-  if ($info != '') {
-    $display .= '<div class="pluginfo">'."\n";
-    $display .= "$info";
-    $display .= "</div>\n";
-    $display .= "<div></div>\n";
-  }
-  return $display;
-}
-
 /*!
  * \brief Put netmask in n.n.n.n format
  *
diff --git a/include/management/class_management.inc b/include/management/class_management.inc
index 0bb9b11119ac7c09b98ec4b8c04019a9f19cf284..0e67ce0128c3461d77e0c40f725e2679cea3e505 100644
--- a/include/management/class_management.inc
+++ b/include/management/class_management.inc
@@ -580,11 +580,20 @@ class management
    */
   protected function getHeader (): string
   {
+    global $smarty;
+
     if ($this->skipHeader) {
       return '';
     }
 
-    return print_header($this->icon, $this->title, get_object_info());
+    $smarty->assign('headline', $this->title);
+    $smarty->assign('headline_image', $this->icon);
+
+    $info = get_object_info();
+    if ($info != '') {
+      return '<div class="pluginfo">'.$info."</div>\n";
+    }
+    return '';
   }
 
   function openTabObject ($object)
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index c61471a725533976d62b222f3815c7b10ffa31f2..de90f18a58caa0c9eec27ad975f4e33569af9ba3 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -495,6 +495,8 @@ class simpleManagement
    */
   protected function getHeader ()
   {
+    global $smarty;
+
     if ($this->skipHeader) {
       return '';
     }
@@ -506,7 +508,14 @@ class simpleManagement
     if (!preg_match('/^geticon/', $plIcon)) {
       $plIcon = get_template_path($plIcon);
     }
-    return print_header($plIcon, $plTitle, get_object_info());
+    $smarty->assign('headline', $plTitle);
+    $smarty->assign('headline_image', $plIcon);
+
+    $info = get_object_info();
+    if ($info != '') {
+      return '<div class="pluginfo">'.$info."</div>\n";
+    }
+    return '';
   }
 
   /*!
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index fae13eebd3e9284f9c164a9d84215fbbbd567e0d..4eef41ff4312749e7fcd964084f7d8d1d455bb60 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -2121,7 +2121,7 @@ class simplePlugin implements SimpleTab
    */
   static function mainInc ($classname = NULL, $entry_dn = NULL, $tabs = FALSE, $edit_mode = TRUE, $objectType = FALSE)
   {
-    global $remove_lock, $cleanup, $display, $config, $plug, $ui;
+    global $remove_lock, $cleanup, $display, $config, $plug, $ui, $smarty;
 
     if ($classname === NULL) {
       $classname = get_called_class();
@@ -2198,7 +2198,6 @@ class simplePlugin implements SimpleTab
         }
 
         /* save changes to LDAP and disable edit mode */
-        $info = "";
         if (isset($_POST['edit_finish'])) {
           /* Perform checks */
           $message = $tabObject->save();
@@ -2215,8 +2214,6 @@ class simplePlugin implements SimpleTab
             msg_dialog::displayChecks($message);
           }
         }
-      } else {
-        $info = "";
       }
 
       /* Execute formular */
@@ -2248,7 +2245,7 @@ class simplePlugin implements SimpleTab
         } elseif (strpos($tabObject->by_object[$tabObject->current]->aclGetPermissions(''), 'w') !== FALSE) {
           /* Only display edit button if there is at least one attribute writable */
           $display  .= '<p class="plugbottom">'."\n";
-          $info     .= '<div style="display:inline-block" class="optional"><img class="center" alt="information" '.
+          $info     .= '<div style="float:left;" class="optional"><img class="center" alt="information" '.
                     'src="geticon.php?context=status&amp;icon=dialog-information&amp;size=16"> '.
                     msgPool::clickEditToChange().'</div>';
           $display  .= '<input type="submit" name="edit" value="'.msgPool::editButton().'"/>'."\n";
@@ -2260,7 +2257,9 @@ class simplePlugin implements SimpleTab
       if (!preg_match('/^geticon/', $plIcon)) {
         $plIcon = get_template_path($plIcon);
       }
-      $display = print_header($plIcon, $plHeadline, $info).$display;
+      $smarty->assign('headline', $plHeadline);
+      $smarty->assign('headline_image', $plIcon);
+      $display = '<div class="pluginfo">'.$info."</div>\n".$display;
     }
   }
 }
diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index 8f2a83a71a6899ef1201c7e5228223d23ecb74fa..b623df5a8b48eb12965d99a5c3d775249e2d3896 100644
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -21,7 +21,8 @@
 
 if (!$cleanup) {
   $smarty->assign('iconmenu', $plist->show_iconmenu());
-  $smarty->assign('header', print_header('geticon.php?context=applications&icon=config-welcome&size=48', sprintf(_('Welcome %s!'), $ui->cn)));
+  $smarty->assign('headline', sprintf(_('Welcome %s!'), $ui->cn));
+  $smarty->assign('headline_image', 'geticon.php?context=applications&icon=config-welcome&size=48');
   $smarty->assign('year', date('Y'));
   $smarty->assign('revision', FD_VERSION);
 
diff --git a/plugins/generic/welcome/welcome.tpl b/plugins/generic/welcome/welcome.tpl
index 74dddf8060534389ce9cb1f3af29f38ccae4f676..b0526fad8997a92c2c0b420b88e32c4f32b7e5e0 100644
--- a/plugins/generic/welcome/welcome.tpl
+++ b/plugins/generic/welcome/welcome.tpl
@@ -1,5 +1,3 @@
-{$header}
-
 {$iconmenu}
 
 <br/>