diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
index 83a6b0f3..cc4e32b6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
@@ -89,7 +89,8 @@
 
 	<ModuleData id="SpaceIcons">
     <Group pageID="SpaceHome" titleresourcekey="System">
-		  <Icon pageID="SpaceDomains" resourceGroup="OS" imageUrl="icons/domains_48.png" />
+      <Icon pageID="SpaceHome" titleresourcekey="SpaceStatistics" imageUrl="icons/spacehome_48.png" />
+      <Icon pageID="SpaceDomains" resourceGroup="OS" imageUrl="icons/domains_48.png" />
       <Icon pageID="SpaceFtpAccounts" resourceGroup="FTP" imageUrl="icons/ftp_48.png"/>
       <Icon pageID="SpaceFileManager" resourceGroup="OS" quota="OS.FileManager" imageUrl="icons/filemanager_48.png"/>
       <Icon pageID="SpaceApplicationsInstaller" resourceGroup="OS" quota="OS.AppInstaller" imageUrl="icons/applicationsinstaller_48.png"/>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/exchange_contacts_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/exchange_contacts_48.png
new file mode 100644
index 00000000..931287bc
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/exchange_contacts_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/exchange_dlists_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/exchange_dlists_48.png
new file mode 100644
index 00000000..931287bc
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/exchange_dlists_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/organization_home_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/organization_home_48.png
new file mode 100644
index 00000000..9aea056f
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/organization_home_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/spacehome_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/spacehome_48.png
new file mode 100644
index 00000000..9aea056f
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/spacehome_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
index 34c7128b..f6b465ae 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
@@ -284,4 +284,5 @@ UL.ActionButtons LI {margin-bottom: 12px;}
 .disabled {width:20px; height:20px; background: transparent url(../Icons/block.png) left center no-repeat; border:medium none;}
 .enabled {width:20px; height:20px; background: transparent url(../Icons/ok.png) left center no-repeat; border:medium none;}
 p.warningText {font-size:14px; color:Red; text-align:center;}
-.Hidden {display: none;}
\ No newline at end of file
+.Hidden {display: none;}
+.LinkText {color:#428bca;}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
index 585341ab..b66cd9a8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
@@ -148,7 +148,7 @@
     <value>BlackBerry Users</value>
   </data>
   <data name="Text.Contacts" xml:space="preserve">
-    <value>Contacts</value>
+    <value>Exchange Contacts</value>
   </data>
   <data name="Text.CRM2013Group" xml:space="preserve">
     <value>CRM 2013</value>
@@ -166,7 +166,7 @@
     <value>Disclaimers</value>
   </data>
   <data name="Text.DistributionLists" xml:space="preserve">
-    <value>Distribution Lists</value>
+    <value>Exchange Distribution Lists</value>
   </data>
   <data name="Text.DomainNames" xml:space="preserve">
     <value>Domains</value>
@@ -217,7 +217,7 @@
     <value>Organization</value>
   </data>
   <data name="Text.OrganizationHome" xml:space="preserve">
-    <value>Organization Home</value>
+    <value>Orginization Statistics</value>
   </data>
   <data name="Text.PublicFolders" xml:space="preserve">
     <value>Public Folders</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx
index 02874ca9..8e396d55 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx
@@ -159,4 +159,7 @@
   <data name="Web.Text" xml:space="preserve">
     <value>Web &amp; Applications</value>
   </data>
+  <data name="SpaceStatistics.Text" xml:space="preserve">
+    <value>Space Statistics</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
index f56b0e70..5d01bb2a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
@@ -74,6 +74,7 @@ namespace WebsitePanel.Portal.UserControls
 
         public void BindMenu(MenuItemCollection items)
         {
+
             //Organization menu group;
             if (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations))
                 PrepareOrganizationMenuRoot(items);
@@ -193,13 +194,13 @@ namespace WebsitePanel.Portal.UserControls
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, Cntx))
                 exchangeItems.Add(CreateMenuItem("Mailboxes", "mailboxes", @"Icons/mailboxes_48.png"));
 
-            if (ShortMenu) return;
-
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_CONTACTS, Cntx))
-                exchangeItems.Add(CreateMenuItem("Contacts", "contacts"));
+                exchangeItems.Add(CreateMenuItem("Contacts", "contacts", @"Icons/exchange_contacts_48.png"));
 
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_DISTRIBUTIONLISTS, Cntx))
-                exchangeItems.Add(CreateMenuItem("DistributionLists", "dlists"));
+                exchangeItems.Add(CreateMenuItem("DistributionLists", "dlists", @"Icons/exchange_dlists_48.png"));
+
+            if (ShortMenu) return;
 
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_PUBLICFOLDERS, Cntx))
                 exchangeItems.Add(CreateMenuItem("PublicFolders", "public_folders"));
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
index 77a76bef..8ade5af5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
@@ -15,6 +15,17 @@
                     <br />
                     <asp:HyperLink ID="lnkIcon" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink>
                 </asp:Panel>
+                <asp:Panel ID="IconMenu" runat="server" CssClass="IconMenu" Visible='<%# IsIconMenuVisible(Eval("ChildItems")) %>'>
+                    <ul>
+                        <asp:Repeater ID="MenuItems" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'>
+                            <ItemTemplate>
+                                <li><asp:HyperLink ID="HyperLink1" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink></li>
+                            </ItemTemplate>
+                        </asp:Repeater>
+                    </ul>
+                </asp:Panel>
+                <ajaxToolkit:HoverMenuExtender TargetControlID="IconPanel" PopupControlID="IconMenu" runat="server"
+                    PopupPosition="Right" HoverCssClass="Icon Hover"></ajaxToolkit:HoverMenuExtender>
             </ItemTemplate>
         </asp:DataList>
     </div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
index aa753946..4a72bd03 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
@@ -110,6 +110,8 @@ namespace WebsitePanel.Portal
             {
                 MenuItemCollection items = new MenuItemCollection();
 
+                items.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png"));
+
                 BindMenu(items);
                 UserOrgPanel.Visible = true;
 
@@ -139,5 +141,16 @@ namespace WebsitePanel.Portal
 
             return item;
         }
+
+        public MenuItemCollection GetIconMenuItems(object menuItems)
+        {
+            return (MenuItemCollection)menuItems;
+        }
+
+        public bool IsIconMenuVisible(object menuItems)
+        {
+            return ((MenuItemCollection)menuItems).Count > 0;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
index e003e191..da26021d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
@@ -25,9 +25,8 @@
 
                     <asp:Repeater ID="PackageGroups" runat="server" DataSource='<%# GetIconsDataSource((int)Eval("PackageID"))  %>' > 
                         <ItemTemplate>
-                            <asp:hyperlink id="lnkGroup" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'>
-		                        <%# Eval("Text") %>
-	                        </asp:hyperlink>
+
+                            <asp:Label ID="lblGroup" runat="server" CssClass="LinkText" Text='<%# Eval("Text") %>' />
 
                             <asp:DataList ID="PackageIcons" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'
                                 CellSpacing="1" RepeatColumns="5" RepeatDirection="Horizontal">
@@ -57,7 +56,7 @@
                 </div>
             </div>
             <asp:Panel ID="OrgPanel" runat="server" Visible='<%# IsOrgPanelVisible((int)Eval("PackageID")) %>'>
-                <asp:hyperlink ID="linkOrg" runat="server" NavigateUrl='<%# GetOrgPageUrl((int)Eval("PackageID")) %>' meta:resourcekey="linkOrg" Text="Hosted Organization" />
+                <asp:Label ID="lblOrg" runat="server" CssClass="LinkText" meta:resourcekey="lblOrg" Text="Hosted Organization" />
                 <wsp:UserOrganization ID="UserOrganization" runat="server" PackageId='<%# (int)Eval("PackageID") %>' />
             </asp:Panel>
         </ItemTemplate>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
index 4b6d9e40..2ffe738a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
@@ -113,6 +113,8 @@
     <Content Include="App_Themes\Default\Icons\crm_users_48.png" />
     <Content Include="App_Themes\Default\Icons\domains_48.png" />
     <Content Include="App_Themes\Default\Icons\enterprisestorage_folders_48.png" />
+    <Content Include="App_Themes\Default\Icons\exchange_contacts_48.png" />
+    <Content Include="App_Themes\Default\Icons\exchange_dlists_48.png" />
     <Content Include="App_Themes\Default\Icons\filemanager_48.png" />
     <Content Include="App_Themes\Default\Icons\ftp_48.png" />
     <Content Include="App_Themes\Default\Icons\lync_users_48.png" />
@@ -124,9 +126,11 @@
     <Content Include="App_Themes\Default\Icons\mail_lists_48.png" />
     <Content Include="App_Themes\Default\Icons\odbc_48.png" />
     <Content Include="App_Themes\Default\Icons\OK.png" />
+    <Content Include="App_Themes\Default\Icons\organization_home_48.png" />
     <Content Include="App_Themes\Default\Icons\scheduledtasks_48.png" />
     <Content Include="App_Themes\Default\Icons\sharedssl_48.png" />
     <Content Include="App_Themes\Default\Icons\sharepoint_sitecollections_48.png" />
+    <Content Include="App_Themes\Default\Icons\spacehome_48.png" />
     <Content Include="App_Themes\Default\Icons\vpsforpc_48.png" />
     <Content Include="App_Themes\Default\Icons\vps_48.png" />
     <Content Include="App_Themes\Default\Icons\webapplicationsgallery_48.png" />