diff --git a/.gitignore b/.gitignore
index 9c1bb94..398193e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.xpi
 .DS_Store
+xpisign.py
diff --git a/build.sh b/build.sh
index cf39783..b4a9982 100755
--- a/build.sh
+++ b/build.sh
@@ -22,3 +22,6 @@ mv $filename.xpi ../
 cd ..
 rm -rf build
 
+# git clone https://github.com/nmaier/xpisign.py.git
+# add this for cert signing
+# python xpisign.py -k cert.pem mailhops.xpi mailhops.signed.xpi
diff --git a/chrome/content/images/mailhops16.png b/chrome/content/images/mailhops16.png
deleted file mode 100644
index e22444f..0000000
Binary files a/chrome/content/images/mailhops16.png and /dev/null differ
diff --git a/chrome/content/images/mailhops32.png b/chrome/content/images/mailhops32.png
index 804e5b0..911e89d 100644
Binary files a/chrome/content/images/mailhops32.png and b/chrome/content/images/mailhops32.png differ
diff --git a/chrome/content/images/mailhops72.png b/chrome/content/images/mailhops72.png
deleted file mode 100644
index c95e180..0000000
Binary files a/chrome/content/images/mailhops72.png and /dev/null differ
diff --git a/chrome/content/images/map.png b/chrome/content/images/map.png
deleted file mode 100644
index f90ef25..0000000
Binary files a/chrome/content/images/map.png and /dev/null differ
diff --git a/chrome/content/images/options.png b/chrome/content/images/options.png
deleted file mode 100644
index 67de2c6..0000000
Binary files a/chrome/content/images/options.png and /dev/null differ
diff --git a/chrome/content/images/refresh.png b/chrome/content/images/refresh.png
deleted file mode 100644
index 0de2656..0000000
Binary files a/chrome/content/images/refresh.png and /dev/null differ
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 2c17a6b..2310a44 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -8,7 +8,7 @@ var mailHops =
 {
   msgURI:	null
   , isLoaded: false
-  , options: {'version':'MailHops Plugin 1.0.8','lan':'en','unit':'mi','api_url':'https://api.mailhops.com','debug':false}
+  , options: {'version':'MailHops Plugin 1.0.9','lan':'en','unit':'mi','api_url':'https://api.mailhops.com','debug':false}
   , message: { secure:[] }
   , client_location: null
 };
diff --git a/chrome/content/tb-overlay.js b/chrome/content/tb-overlay.js
index 442b2c4..22ce6de 100644
--- a/chrome/content/tb-overlay.js
+++ b/chrome/content/tb-overlay.js
@@ -201,6 +201,10 @@ var mailHopsDisplay =
               first = response.route[i];
               if(!!response.route[i].countryCode)
                 image='chrome://mailhops/content/images/flags/'+response.route[i].countryCode.toLowerCase()+'.png';
+                if(response.route[i].city)
+                  this.resultText.setAttribute('tooltiptext','From '+response.route[i].city+', '+response.route[i].state);
+                else
+                  this.resultText.setAttribute('tooltiptext','From '+response.route[i].countryName);
             }
 
             var menuitem = document.createElement('menuitem');
diff --git a/chrome/content/tb-overlay.xul b/chrome/content/tb-overlay.xul
index f3c243e..da232fc 100644
--- a/chrome/content/tb-overlay.xul
+++ b/chrome/content/tb-overlay.xul
@@ -13,32 +13,31 @@
 
 	<rows id="expandedHeader2Rows">
 		<row id="mailhopsBox" collapsed="false">
-			<label id="mailhopsLabel" value="Route " class="headerName"></label>
+			    <label id="mailhopsLabel" value="MailHops Route " class="headerName"></label>
        		<hbox id="mailhopsResult" flex="1">
        			<label id="mailhopsResultText"></label>
        			<label id="mailhopsResultWeather"></label>
 
        			<button type="menu" class="msgHeaderView-button msgHeaderView-flat-button" label="hops" tooltiptext="Click to view route.">
-       				<menupopup id="mailhopsDataPaneDetails">
-					</menupopup>
-				</button>
+         				<menupopup id="mailhopsDataPaneDetails">
+  					    </menupopup>
+    				</button>
 
-				<button id="mailhopsMapLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_map_label;"></button>
+    				<button id="mailhopsMapLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_map_label;"></button>
 
-				<button id="mailhopsDataPaneRefreshLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_refresh_label;"></button>
+    				<button id="mailhopsDataPaneRefreshLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_refresh_label;"></button>
 
-				<button id="mailhopsDataPanePrefsLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_options_label;"></button>
+    				<button id="mailhopsDataPanePrefsLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_options_label;"></button>
 
-				<label id="mailhopsDataPaneMailer" class="auth-item" value="" tooltiptext="Mailer"></label>
+    				<label id="mailhopsDataPaneMailer" class="auth-item" value="" tooltiptext="Mailer"></label>
 
-				<label id="mailhopsDataPaneSPF" class="auth-item" value="" tooltiptext="SPF"></label>
+    				<label id="mailhopsDataPaneSPF" class="auth-item" value="" tooltiptext="SPF"></label>
 
-				<label id="mailhopsDataPaneDKIM" class="auth-item" value="" tooltiptext="DKIM"></label>
+    				<label id="mailhopsDataPaneDKIM" class="auth-item" value="" tooltiptext="DKIM"></label>
 
-				<label id="mailhopsDataPaneDNSBL" class="text-link auth-item" value="" tooltiptext="DNSBL"></label>
+    				<label id="mailhopsDataPaneDNSBL" class="text-link auth-item" value="" tooltiptext="DNSBL"></label>
 
        		</hbox>
-
 		</row>
 	</rows>
 
diff --git a/chrome/skin/classic/tb-styles.css b/chrome/skin/classic/tb-styles.css
index 415fe7b..f77b80a 100644
--- a/chrome/skin/classic/tb-styles.css
+++ b/chrome/skin/classic/tb-styles.css
@@ -26,3 +26,7 @@ tab {
 	padding: 5px;
 	color: #333;
 }
+
+#mailhopsResult label {
+	margin-top: 8px;	
+}
diff --git a/install.rdf b/install.rdf
index 0cad09b..5d35bc7 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,10 +5,10 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:type>2</em:type>
 		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>1.0.8</em:version>
+		<em:version>1.0.9</em:version>
 
 		<em:name>MailHops</em:name>
-		<em:description>MailHops maps the route an email traveled to get to you.  Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender.</em:description>
+		<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>
 		<em:iconURL>chrome://mailhops/content/images/mailhops32.png</em:iconURL>
 		<em:homepageURL>https://www.mailhops.com</em:homepageURL>
 		<em:creator>Andrew Van Tassel</em:creator>
@@ -29,7 +29,7 @@
 			<Description>
 				<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
 				<em:minVersion>3.0.*</em:minVersion>
-				<em:maxVersion>45.*</em:maxVersion>
+				<em:maxVersion>47.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>