diff --git a/app/templates/ajax/overivewWaf.html b/app/templates/ajax/overivewWaf.html
index 522be652..81744a1b 100644
--- a/app/templates/ajax/overivewWaf.html
+++ b/app/templates/ajax/overivewWaf.html
@@ -16,13 +16,13 @@
 			<td>
 			{% if role <= 1 %}
 				<a id="{{ service.1 }}" class="start-waf" title="Start WAF service">
-					<img src=/image/pic/start.png alt="start" class="icon">
+					<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;">
 				</a>
 				<a id="{{ service.1 }}" class="stop-waf" title="Stop WAF service">
-					<img src=/image/pic/stop.png alt="start" class="icon">
+					<img src=/inc/images/stop.png alt="start" class="icon" width="17px">
 				</a>
 				<a id="{{ service.1 }}" class="restart-waf" title="Restart WAF service">
-					<img src=/image/pic/update.png alt="restart" class="icon">
+					<img src=/inc/images/update.png alt="restart" class="icon">
 				</a>
 			{% endif %}
 			</td>
diff --git a/app/templates/ajax/overview.html b/app/templates/ajax/overview.html
index 9d03f642..521bf7e1 100644
--- a/app/templates/ajax/overview.html
+++ b/app/templates/ajax/overview.html
@@ -7,9 +7,9 @@
 				{% if service.5.0.0|int() >= 1 %}
 					<img 
 						{% if service.6.0.0|int() >= 1 %}
-							src="/image/pic/shield.png" title="Auto start enabled"
+							src="/inc/images/shield.png" title="Auto start enabled"
 						{% else %}
-							src="/image/pic/shield-red.png" title="Auto start enabled, but keep alive service does not work"
+							src="/inc/images/shield-red.png" title="Auto start enabled, but keep alive service does not work"
 						{% endif %}
 						width=18 style="padding-left: 5px; margin-bottom: -3px;">
 				{% endif %}
@@ -26,23 +26,23 @@
 		<td>
 		{% if role <= 1 %}
 			<a id="{{ service.1 }}" class="start" title="Start HAProxy service">
-				<img src=/image/pic/start.png alt="start" class="icon">
+				<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;">
 			</a>
 			<a id="{{ service.1 }}" class="stop" title="Stop HAProxy service">
-				<img src=/image/pic/stop.png alt="start" class="icon">
+				<img src=/inc/images/stop.png alt="start" class="icon" width="17px">
 			</a>
 			<a id="{{ service.1 }}" class="restart" title="Restart HAProxy service">
-				<img src=/image/pic/update.png alt="restart" class="icon">
+				<img src=/inc/images/update.png alt="restart" class="icon">
 			</a>
 		{% endif %}
 		{% if role <= 2 %}
 			<a href="/app/config.py?serv={{ service.1 }}" target="_blank" title="Working with HAProxy configs">
-				<img src="/image/pic/edit.png" alt="edit" class="icon">
+				<img src="/inc/images/edit.png" alt="edit" class="icon" width="15px">
 			</a>
-			<a href="/app/viewsttats.py?serv={{ service.1 }}" target="_blank"  title="Show stats">
-				<img src="/image/pic/show.png" alt="show" class="icon">
-			</a>	
 		{% endif %}
+			<a href="/app/viewsttats.py?serv={{ service.1 }}" target="_blank"  title="Show stats">
+				<img src="/inc/images/show.png" alt="show" class="icon" width="20px" style="margin-bottom: -3px;">
+			</a>			
 		</td>
 		<td>
 			{{ service.3 }}
diff --git a/app/templates/ajax/overviewServers.html b/app/templates/ajax/overviewServers.html
index 627d0d63..d464588b 100644
--- a/app/templates/ajax/overviewServers.html
+++ b/app/templates/ajax/overviewServers.html
@@ -25,7 +25,6 @@ Too old version HAProxy
 		{% else %}
 {{ service.4 }}
 		{% endif %}
-
 			</pre>
 		</td>
 		<td></td>
diff --git a/app/templates/base.html b/app/templates/base.html
index f7ae7e97..fb9ed0c4 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -5,7 +5,7 @@
 		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
 		<meta http-equiv="Pragma" content="no-cache" />
 		<meta http-equiv="Expires" content="0" />
-		<link href="/image/pic/favicon.ico" rel="icon" type="image/png" />
+		<link href="/inc/images/favicon.ico" rel="icon" type="image/png" />
 		<script>
 			FontAwesomeConfig = { searchPseudoElements: true, observeMutations: false };
 		</script>
@@ -115,7 +115,7 @@
 					</ul>
 				</nav>
 				<div class="copyright-menu">
-					<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.7</a>
+					<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.8</a>
 					<br>
 					<a href="https://www.patreon.com/haproxy_wi" title="Donate" target="_blank" style="color: #fff; margin-left: 30px; color: red;" class="patreon">  Patreon</a>
 				</div>
@@ -135,8 +135,8 @@
 						<span class="auto-refresh">
 							<a onclick="pauseAutoRefresh()" class="auto-refresh-pause" style="display: none; margin-top: 4px;"></a>
 							<a onclick="pauseAutoResume()" class="auto-refresh-resume" style="display: none; margin-top: 4px;"></a>
-							<a id="0"><img  src="/image/pic/update.png" alt="restart" class="icon"> Auto-refresh</a>
-							<a id="1" style="display: none;"><img  src="/image/pic/update.png" alt="restart" class="icon"> Auto-refresh</a>
+							<a id="0"><img  src="/inc/images/update.png" alt="restart" class="icon"> Auto-refresh</a>
+							<a id="1" style="display: none;"><img  src="/inc/images/update.png" alt="restart" class="icon"> Auto-refresh</a>
 						</span>		
 					{% endif %}
 				</h2>
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
index 1627b7ba..12db6fac 100644
--- a/app/templates/ovw.html
+++ b/app/templates/ovw.html
@@ -23,7 +23,12 @@
 			{% set counter = counter + loop.index0 %}
 			{% if counter <= 2 %}
 				<tr class="{{ loop.cycle('odd', 'even') }}">
-					<td class="padding10 first-collumn"> {{ USER.1 }}</td>
+					<td class="padding10 first-collumn"> 
+						<a href="users.py#users" title="Edit user" style="color: #000;">
+							{{ USER.1 }}
+							<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px;" />
+						</a>
+					</td>
 					<td class="padding10 second-collumn"> {{ USER.2 }}</td>
 					{% for group in groups %}
 						{% if USER.5 == group.0|string() %}
@@ -35,7 +40,12 @@
 				</tr>
 			{% else %}
 				<tr style="display: none;" class="show-users {{ loop.cycle('odd', 'even') }}">
-					<td class="padding10 first-collumn"> {{ USER.1 }}</td>
+					<td class="padding10 first-collumn"> 
+						<a href="users.py#users" title="Edit user" style="color: #000;">
+							{{ USER.1 }}
+							<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px;" />
+						</a>
+					</td>
 					<td class="padding10"> {{ USER.2 }}</td>
 					{% for group in groups %}
 						{% if group.0|string() == USER.5 %}
@@ -58,31 +68,35 @@
 	<tr>
 		<td class="padding10 first-collumn">
 		{% if metrics_master|int() >= 1 %}
-			<span title="running {{ metrics_master }} master processes"><span class="serverUp"> UP</span> Metrics master</span>
+			<span title="running {{ metrics_master }} master processes"><span class="serverUp"> UP</span> 
 		{% else %}
-			<span title="running {{ metrics_master }} master processes"><span class="serverDown"> DOWN</span> running {{metrics_master }} master processes
+			<span title="running {{ metrics_master }} master processes"><span class="serverDown"> DOWN</span>
 		{% endif %}
+			<span>Metrics master</span>
 		</td>
 		<td class="padding10 second-collumn">
 		{% if metrics_worker|int() >= 1 %}
-			<span title="running {{metrics_worker}} worker processes"><span class="serverUp"> UP</span> Metrics workers</span>
+			<span title="running {{metrics_worker}} worker processes"><span class="serverUp"> UP</span> 
 		{% else %}
-			<span title="running {{metrics_worker}} worker processes"><span class="serverDown"> DOWN</span> Metrics workers</span>
+			<span title="running {{metrics_worker}} worker processes"><span class="serverDown"> DOWN</span> 
 		{% endif %}
+			<span>Metrics workers</span>
 		</td>
 		<td class="third-collumn">
 		{% if checker_master|int() >= 1 %}
-			<span title="running {{ checker_master }} master processes"><span class="serverUp"> UP</span> Checker master</span>
+			<span title="running {{ checker_master }} master processes"><span class="serverUp"> UP</span>
 		{% else %}
-			<span title="running {{ checker_master }} master processes"><span class="serverDown"> DOWN</span> Checker master</span>
+			<span title="running {{ checker_master }} master processes"><span class="serverDown"> DOWN</span> 
 		{% endif %}
+			<span>Checker master</span>
 		</td>
 		<td>
 		{% if checker_worker|int() >= 1 %}
-			<span title="running {{ checker_worker }} worker processes"><span class="serverUp"> UP</span> Checker workers</span>
+			<span title="running {{ checker_worker }} worker processes"><span class="serverUp"> UP</span>
 		{% else %}
-			<span title="running {{ checker_worker }} worker processes"><span class="serverDown"> DOWN</span> Checker workers</span>
+			<span title="running {{ checker_worker }} worker processes"><span class="serverDown"> DOWN</span> 
 		{% endif %}
+			<span>Checker workers</span>
 		</td>
 	</tr>
 </table>
@@ -102,7 +116,7 @@
 			Last edit
 		</td  class="padding10">
 		<td>
-			<a onclick="showOverview()" title="Refresh" style="float: right; margin-right: 25px;"><img  src="/image/pic/update.png" alt="restart" class="icon"></a>
+			<a onclick="showOverview()" title="Refresh" style="float: right; margin-right: 25px;"><img  src="/inc/images/update.png" alt="restart" class="icon"></a>
 		</td>
 	</tr>
 <tbody id="ajaxstatus"></tbody>
@@ -122,7 +136,7 @@
 			WAF mode
 		</td  class="padding10">
 		<td>
-			<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img  src="/image/pic/update.png" alt="restart" class="icon"></a>
+			<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img  src="/inc/images/update.png" alt="restart" class="icon"></a>
 		</td>
 	</tr>
 <tbody id="ajaxwafstatus"></tbody>	
@@ -142,7 +156,7 @@
 			Front/Back-ends
 		</td>
 		<td>
-			<a onclick="showOverviewServers()" title="Refresh Server Info" style="float: right; margin-right: 25px;"><img  src="/image/pic/update.png" alt="restart" class="icon"></a>
+			<a onclick="showOverviewServers()" title="Refresh Server Info" style="float: right; margin-right: 25px;"><img  src="/inc/images/update.png" alt="restart" class="icon"></a>
 		</td>
 	</tr>
 <tbody id="ajaxservers"></tbody>
diff --git a/app/templates/waf.html b/app/templates/waf.html
index b875ec2d..d1d1f86c 100644
--- a/app/templates/waf.html
+++ b/app/templates/waf.html
@@ -18,7 +18,7 @@
 			Metrics
 		</td>
 		<td>
-			<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img  src="/image/pic/update.png" alt="restart" class="icon"></a>
+			<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img  src="/inc/images/update.png" alt="Refresh" class="icon"></a>
 		</td>
 	</tr>
 <tbody id="ajaxwafstatus"></tbody>	
diff --git a/image/pic/compare.png b/inc/images/compare.png
similarity index 100%
rename from image/pic/compare.png
rename to inc/images/compare.png
diff --git a/image/pic/edit.png b/inc/images/edit.png
similarity index 100%
rename from image/pic/edit.png
rename to inc/images/edit.png
diff --git a/image/pic/favicon.ico b/inc/images/favicon.ico
similarity index 100%
rename from image/pic/favicon.ico
rename to inc/images/favicon.ico
diff --git a/image/pic/map.png b/inc/images/map.png
similarity index 100%
rename from image/pic/map.png
rename to inc/images/map.png
diff --git a/image/pic/shield-red.png b/inc/images/shield-red.png
similarity index 100%
rename from image/pic/shield-red.png
rename to inc/images/shield-red.png
diff --git a/image/pic/shield.png b/inc/images/shield.png
similarity index 100%
rename from image/pic/shield.png
rename to inc/images/shield.png
diff --git a/image/pic/show.png b/inc/images/show.png
similarity index 100%
rename from image/pic/show.png
rename to inc/images/show.png
diff --git a/image/pic/start.png b/inc/images/start.png
similarity index 100%
rename from image/pic/start.png
rename to inc/images/start.png
diff --git a/image/pic/stop.png b/inc/images/stop.png
similarity index 100%
rename from image/pic/stop.png
rename to inc/images/stop.png
diff --git a/inc/images/ui-bg_flat_0_aaaaaa_40x100.png b/inc/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 00000000..a2e6bfc0
Binary files /dev/null and b/inc/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/inc/images/ui-icons_444444_256x240.png b/inc/images/ui-icons_444444_256x240.png
new file mode 100644
index 00000000..df4e3737
Binary files /dev/null and b/inc/images/ui-icons_444444_256x240.png differ
diff --git a/inc/images/ui-icons_777777_256x240.png b/inc/images/ui-icons_777777_256x240.png
new file mode 100644
index 00000000..b01ff3de
Binary files /dev/null and b/inc/images/ui-icons_777777_256x240.png differ
diff --git a/image/pic/update.png b/inc/images/update.png
similarity index 100%
rename from image/pic/update.png
rename to inc/images/update.png