diff --git a/lam/lib/html.inc b/lam/lib/html.inc
index 3b6b7254..5b447af8 100644
--- a/lam/lib/html.inc
+++ b/lam/lib/html.inc
@@ -728,7 +728,7 @@ class htmlButton extends htmlElement {
 		$name = ' name="' . $this->name . '"';
 		// image button
 		if ($this->isImageButton) {
-			$class = ' class="smallImageButton"';
+			$class = ' class="smallImageButton align-middle"';
 			$style = ' style="background-image: url(../../graphics/' . $this->value . '); background-color: transparent;"';
 		}
 		// text button
@@ -2308,7 +2308,7 @@ class htmlLink extends htmlElement {
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
 		$image = '';
 		if ($this->image != null) {
-			$image = '<img src="' . $this->image . '" alt="' . $this->text . '">&nbsp;';
+			$image = '<img class="align-middle" src="' . $this->image . '" alt="' . $this->text . '">&nbsp;';
 		}
 		$title = '';
 		if ($this->title != null) {
diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index 4a084857..87be2d0c 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -122,19 +122,19 @@ foreach ($toSort as $key => $value) {
 		</td>
 	<td align="right" height=30>
 	<ul id="dropmenu" class="dropmenu">
-		<li><a href="<?php echo $headerPrefix; ?>logout.php" target="_top"><img height="16" width="16" alt="logout" src="<?php echo $headerPrefix; ?>../graphics/exit.png">&nbsp;<?php echo _("Logout") ?></a></li>
+		<li><a href="<?php echo $headerPrefix; ?>logout.php" target="_top"><img class="align-middle" height="16" width="16" alt="logout" src="<?php echo $headerPrefix; ?>../graphics/exit.png">&nbsp;<?php echo _("Logout") ?></a></li>
 		<?php
 		if (is_dir(dirname(__FILE__) . '/../docs/manual')) {
 		?>
 	    <li>
-			<a target="_blank" href="<?php echo $headerPrefix; ?>../docs/manual/index.html"><img width="16" height="16" alt="help" src="<?php echo $headerPrefix; ?>../graphics/help.png">&nbsp;<?php echo _("Help") ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>
+			<a target="_blank" href="<?php echo $headerPrefix; ?>../docs/manual/index.html"><img class="align-middle" width="16" height="16" alt="help" src="<?php echo $headerPrefix; ?>../graphics/help.png">&nbsp;<?php echo _("Help") ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>
 		</li>
 		<?php
 		}
 		if (sizeof($tools) > 0) {
 		?>
 		<li>
-			<a href="<?php echo $headerPrefix; ?>tools.php"><img height="16" width="16" alt="tools" src="<?php echo $headerPrefix; ?>../graphics/tools.png">&nbsp;<?php echo _("Tools") ?></a>
+			<a href="<?php echo $headerPrefix; ?>tools.php"><img class="align-middle" height="16" width="16" alt="tools" src="<?php echo $headerPrefix; ?>../graphics/tools.png">&nbsp;<?php echo _("Tools") ?></a>
 				<ul>
 				<?php
 					for ($i = 0; $i < sizeof($tools); $i++) {
@@ -165,7 +165,7 @@ foreach ($toSort as $key => $value) {
 		if ($_SESSION['config']->get_Suffix('tree') != "") {
 		?>
 	    <li>
-			<a href="<?php echo $headerPrefix; ?>tree/treeViewContainer.php"><img height="16" width="16" alt="tree" src="<?php echo $headerPrefix; ?>../graphics/process.png">&nbsp;<?php echo _("Tree view") ?></a>
+			<a href="<?php echo $headerPrefix; ?>tree/treeViewContainer.php"><img class="align-middle" height="16" width="16" alt="tree" src="<?php echo $headerPrefix; ?>../graphics/process.png">&nbsp;<?php echo _("Tree view") ?></a>
 		</li>
 		<?php
 		}