diff --git a/webui/src/main/css/i2pbote.css b/webui/src/main/css/i2pbote.css
index ef4b2b02..5f4e8ae1 100644
--- a/webui/src/main/css/i2pbote.css
+++ b/webui/src/main/css/i2pbote.css
@@ -323,28 +323,40 @@ See also .menu-icon
     font-weight: 300;
     margin: 0 24px 0 48px;
 }
-.menuitem.identities .menu-icon:before {
-    content: url("images/identities.png");
-}
-.menuitem.address-book .menu-icon:before {
-    content: url("images/addressbook.png");
-}
+
 .menuitem.settings .menu-icon:before {
-    content: url("images/settings.png");
+    content: url("images/ConfigurationPage.png");
 }
 .menuitem.downloads .menu-icon:before {
-    content: url("images/inbox.png");
+    content: url("images/Downloads.png");
 }
 .menuitem.uploads .menu-icon:before {
 	content: url("images/uploads.png");
 }
 .menuitem.search .menu-icon:before {
-    content: url("images/delay.png");
+    content: url("images/Search.png");
 }
 .menuitem.shared .menu-icon:before {
-    content: url("images/folder.png");
+    content: url("images/SharedFiles.png");
+}
+.menuitem.browse .menu-icon:before {
+	content : url("images/BrowseHost.png")
+}
+.menuitem.feeds .menu-icon:before {
+	content : url("images/Feeds.png")
+}
+.menuitem.trustUsers .menu-icon:before {
+	content : url("images/TrustUsers.png")
+}
+.menuitem.trustList .menu-icon:before {
+	content : url("images/TrustList.png")
+}
+.menuitem.aboutMe .menu-icon:before {
+	content : url("images/AboutMe.png")
+}
+.menuitem.muStatus .menu-icon:before {
+	content : url("images/MuStatus.png")
 }
-
 
 /* Main content */
 
diff --git a/webui/src/main/js/conncount.js b/webui/src/main/js/conncount.js
index d4b81ab4..12e1d223 100644
--- a/webui/src/main/js/conncount.js
+++ b/webui/src/main/js/conncount.js
@@ -11,7 +11,7 @@ function refreshConnectionsCount() {
 			var countString = ""+count;
 			connectionCountSpan.innerHTML = countString;
 			if (count > 0)
-			    image = "connected.png";
+			    image = "Connect.png";
 			else
 			    image = "connecting.png";
 			connectionIcon.innerHTML = "<img src=\"images/" + image + "\" alt=\"\">";
diff --git a/webui/src/main/webapp/BrowseHost.jsp b/webui/src/main/webapp/BrowseHost.jsp
index 30ec3a9a..e2d59e5f 100644
--- a/webui/src/main/webapp/BrowseHost.jsp
+++ b/webui/src/main/webapp/BrowseHost.jsp
@@ -42,7 +42,7 @@ if (request.getParameter("currentHost") != null) {
 			<form action="/MuWire/Browse" method="post">
 				<input type="text" name="host">
 				<input type="hidden" name="action" value="browse">
-				<div class="menuitem shared">
+				<div class="menuitem browse">
 				  <div class="menu-icon"></div>
 				  <input type="submit" value=<%=Util._t("Browse")%>>
 				</div>
diff --git a/webui/src/main/webapp/Feeds.jsp b/webui/src/main/webapp/Feeds.jsp
index f466b77d..2acd3e0f 100644
--- a/webui/src/main/webapp/Feeds.jsp
+++ b/webui/src/main/webapp/Feeds.jsp
@@ -27,7 +27,7 @@ String pagetitle=Util._t("Feeds");
 			<form action="/MuWire/Feed" method="post">
 				<input type="text" name="host">
 				<input type="hidden" name="action" value="subscribe">
-				<div class="menuitem shared">
+				<div class="menuitem feeds">
 				  <div class="menu-icon"></div>
 				  <input type="submit" value=<%=Util._t("Subscribe")%>>
 				</div>
diff --git a/webui/src/main/webapp/sidebar.jsi b/webui/src/main/webapp/sidebar.jsi
index 2b3067b0..ae192333 100644
--- a/webui/src/main/webapp/sidebar.jsi
+++ b/webui/src/main/webapp/sidebar.jsi
@@ -3,7 +3,7 @@
                 <h2><%=Util._t("Status")%></h2>
                 <div class="menuitem">
                     <div class="menu-icon" id="connectionsIcon">
-                         <img src="images/not_started.png" alt="">
+                         <img src="images/NotStarted.png" alt="">
                     </div>
                     <div class="menu-text">
                         <%=Util._t("Connections")%>: <span id="connectionsCount">0</span>
@@ -37,13 +37,13 @@
                       <%=Util._t("Shared Files")%>
                   </div>
                 </a>
-                <a class="menuitem shared" href="BrowseHost">
+                <a class="menuitem browse" href="BrowseHost">
                   <div class="menu-icon"></div>
                   <div class="menu-text">
                       <%=Util._t("Browse")%>
                   </div>
                 </a>
-                <a class="menuitem shared" href="Feeds">
+                <a class="menuitem feeds" href="Feeds">
                   <div class="menu-icon"></div>
                   <div class="menu-text">
                       <%=Util._t("Feeds")%>
@@ -54,13 +54,13 @@
             <div class="menubox">
                 <h2 class="accordion"><%=Util._t("Trust")%></h2>
                 <div class="panel">
-	                <a class="menuitem identities" href="TrustUsers">
+	                <a class="menuitem trustUsers" href="TrustUsers">
 	                  <div class="menu-icon"></div>
 	                  <div class="menu-text">
 	                      <%=Util._t("Users")%>
 	                  </div>
 	                </a>
-	                <a class="menuitem address-book" href="TrustLists">
+	                <a class="menuitem trustList" href="TrustLists">
 	                  <div class="menu-icon"></div>
 	                  <div class="menu-text">
 	                      <%=Util._t("Subscriptions")%>
@@ -82,11 +82,11 @@
             <div class="menubox">
             	<h2 class="accordion"><%=Util._t("About")%></h2>
             	<div class="panel">
-	            	<a class="menuitem settings" href="AboutMe">
+	            	<a class="menuitem aboutMe" href="AboutMe">
 	                  <div class="menu-icon"></div>
 	                  <div class="menu-text"><%=Util._t("About Me")%></div>
 	                </a>
-	                <a class="menuitem settings" href="MuStatus">
+	                <a class="menuitem muStatus" href="MuStatus">
 	                  <div class="menu-icon"></div>
 	                  <div class="menu-text"><%=Util._t("MuWire")%></div>
 	                </a>