diff --git a/images/settings.png b/images/settings.png
new file mode 100644
index 0000000..36ab365
Binary files /dev/null and b/images/settings.png differ
diff --git a/tpl/options.tpl b/tpl/options.tpl
index 487a849..e9f465a 100644
--- a/tpl/options.tpl
+++ b/tpl/options.tpl
@@ -1,6 +1,7 @@
 <table class="title">
 <tr>
 	<td class="header">
+        <img class="icon" src="images/settings.png" alt="" />
 		{$lang_options}
 	</td>
 	<td align="right">
diff --git a/tpl/optionseditdisplay.tpl b/tpl/optionseditdisplay.tpl
index e23e5cc..a5102f5 100644
--- a/tpl/optionseditdisplay.tpl
+++ b/tpl/optionseditdisplay.tpl
@@ -1,112 +1,111 @@
-	<form method="POST" action="submit.php">
-	<input type="hidden" name="edit" value="optionsdisplay">
-	
-	<table class="title">
-		<tr>
-			<td class="header">
-				{$lang_options}
-			</td>
-			<td align="right">
-				<a href="#" onClick="history.go(-1)"><img src="image.php?icon=back" alt="{$lang_cancel}"></a>
-				<input type="image" src="image.php?icon=save" alt="{$lang_submit}">
-			</td>
-		</tr>
-	</table>
-	
-	<p>
-	
-	<table class="info">
-		<tr>
-			<td class="header">
-				{$lang_options_display}
-			</td>
-			<td class="header_right">
-				&nbsp;
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_language_help}">{$lang_user_language}</span>
-			</td>
-			<td class="value">
-				<input type="text" name="user_language" value="{$user_language}" size="2">
-				({$language})
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_imagesize_help}">{$lang_options_imagesize}</span>
-			</td>
-			<td class="value">
-				<input type="text" name="user_imagesize" value="{$user_imagesize}" size="3">
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_imagecount_help}">{$lang_options_imagecount}</span>
-			</td>
-			<td class="value">
-				<input type="text" name="user_imagecount" value="{$user_imagecount}" size="3">
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_mac_help}">{$lang_options_mac}</span>
-			</td>
-			<td class="value">
-				<input type="text" name="user_mac" value="{$user_mac}">
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_dateformat_help}">{$lang_options_dateformat}</span>
-			</td>
-			<td class="value">
-				<input type="text" name="user_dateformat" value="{$user_dateformat}">
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_dns1suffix_help}">{$lang_options_dns1suffix}</span>
-			</td>
-			<td class="value">
-				<input type="text" name="user_dns1suffix" value="{$user_dns1suffix}">
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_dns2suffix_help}">{$lang_options_dns2suffix}</span>
-			</td>
-			<td class="value">
-				<input type="text" name="user_dns2suffix" value="{$user_dns2suffix}">
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_menu_help}">{$lang_menu}</span>
-			</td>
-			<td class="value">
-				<input type="checkbox" name="user_menu_assets" {$user_menu_assets_checked}>{$lang_assets}<br />
-				<input type="checkbox" name="user_menu_assetclasses" {$user_menu_assetclasses_checked}>{$lang_assetclasses}<br />
-				<input type="checkbox" name="user_menu_assetclassgroups" {$user_menu_assetclassgroups_checked}>{$lang_assetclassgroups}<br />
+<form method="POST" action="submit.php">
+<input type="hidden" name="edit" value="optionsdisplay">
+
+<table class="title">
+<tr>
+    <td class="header">
+        <img class="icon" src="images/settings.png" alt="" />
+        {$lang_options}
+    </td>
+    <td align="right">
+        <a href="#" onClick="history.go(-1)"><img src="image.php?icon=back" alt="{$lang_cancel}"></a>
+        <input type="image" src="image.php?icon=save" alt="{$lang_submit}">
+    </td>
+</tr>
+</table>
+
+<table class="info">
+<tr>
+    <td class="header">
+        {$lang_options_display}
+    </td>
+    <td class="header_right">
+        &nbsp;
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_language_help}">{$lang_user_language}</span>
+    </td>
+    <td class="value">
+        <input type="text" name="user_language" value="{$user_language}" size="2">
+        ({$language})
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_imagesize_help}">{$lang_options_imagesize}</span>
+    </td>
+    <td class="value">
+        <input type="text" name="user_imagesize" value="{$user_imagesize}" size="3">
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_imagecount_help}">{$lang_options_imagecount}</span>
+    </td>
+    <td class="value">
+        <input type="text" name="user_imagecount" value="{$user_imagecount}" size="3">
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_mac_help}">{$lang_options_mac}</span>
+    </td>
+    <td class="value">
+        <input type="text" name="user_mac" value="{$user_mac}">
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_dateformat_help}">{$lang_options_dateformat}</span>
+    </td>
+    <td class="value">
+        <input type="text" name="user_dateformat" value="{$user_dateformat}">
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_dns1suffix_help}">{$lang_options_dns1suffix}</span>
+    </td>
+    <td class="value">
+        <input type="text" name="user_dns1suffix" value="{$user_dns1suffix}">
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_dns2suffix_help}">{$lang_options_dns2suffix}</span>
+    </td>
+    <td class="value">
+        <input type="text" name="user_dns2suffix" value="{$user_dns2suffix}">
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_menu_help}">{$lang_menu}</span>
+    </td>
+    <td class="value">
+        <input type="checkbox" name="user_menu_assets" {$user_menu_assets_checked}>{$lang_assets}<br />
+        <input type="checkbox" name="user_menu_assetclasses" {$user_menu_assetclasses_checked}>{$lang_assetclasses}<br />
+        <input type="checkbox" name="user_menu_assetclassgroups" {$user_menu_assetclassgroups_checked}>{$lang_assetclassgroups}<br />
 {if $suser_admin}
-				<input type="checkbox" name="user_menu_cables" {$user_menu_cables_checked}>{$lang_cables}<br />
+		<input type="checkbox" name="user_menu_cables" {$user_menu_cables_checked}>{$lang_cables}<br />
 {/if}
-				<input type="checkbox" name="user_menu_locations" {$user_menu_locations_checked}>{$lang_locations}<br />
-				<input type="checkbox" name="user_menu_nodes" {$user_menu_nodes_checked}>{$lang_nodes}<br />
-				<input type="checkbox" name="user_menu_subnets" {$user_menu_subnets_checked}>{$lang_subnets}<br />
-				<input type="checkbox" name="user_menu_vlans" {$user_menu_vlans_checked}>{$lang_vlans}<br />
-				<input type="checkbox" name="user_menu_zones" {$user_menu_zones_checked}>{$lang_zones}
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<span class="help" title="{$lang_options_tooltips_help}">{$lang_tooltips}</span>
-			</td>
-			<td class="value">
-				<input type="checkbox" name="user_tooltips" {$user_tooltips_checked}>{$lang_tooltips}<br>
-			</td>
-		</tr>
-	</table>
-	
-	</form>
+        <input type="checkbox" name="user_menu_locations" {$user_menu_locations_checked}>{$lang_locations}<br />
+        <input type="checkbox" name="user_menu_nodes" {$user_menu_nodes_checked}>{$lang_nodes}<br />
+        <input type="checkbox" name="user_menu_subnets" {$user_menu_subnets_checked}>{$lang_subnets}<br />
+        <input type="checkbox" name="user_menu_vlans" {$user_menu_vlans_checked}>{$lang_vlans}<br />
+        <input type="checkbox" name="user_menu_zones" {$user_menu_zones_checked}>{$lang_zones}
+    </td>
+</tr>
+<tr>
+    <td class="label">
+        <span class="help" title="{$lang_options_tooltips_help}">{$lang_tooltips}</span>
+    </td>
+    <td class="value">
+        <input type="checkbox" name="user_tooltips" {$user_tooltips_checked}>{$lang_tooltips}<br>
+    </td>
+</tr>
+</table>
+
+</form>
diff --git a/tpl/optionseditpassword.tpl b/tpl/optionseditpassword.tpl
index 507355b..04cdff8 100644
--- a/tpl/optionseditpassword.tpl
+++ b/tpl/optionseditpassword.tpl
@@ -4,6 +4,7 @@
 <table class="title">
 <tr>
     <td class="header">
+        <img class="icon" src="images/settings.png" alt="" />
         {$lang_options}
     </td>
     <td align="right">