diff --git a/code/map_data_calc_tools.js b/code/map_data_calc_tools.js
index 884acc40..a2c3369c 100644
--- a/code/map_data_calc_tools.js
+++ b/code/map_data_calc_tools.js
@@ -6,7 +6,7 @@
 // tile and a quadkey. Both the bounds and the quadkey are “somewhat”
 // required to get complete data.
 //
-// Convertion functions courtesy of
+// Conversion functions courtesy of
 // http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
 
 
diff --git a/code/map_data_render.js b/code/map_data_render.js
index 6606a022..53ce23a4 100644
--- a/code/map_data_render.js
+++ b/code/map_data_render.js
@@ -470,7 +470,7 @@ window.Render.prototype.addPortalToMapLayer = function(portal) {
 
   this.portalClusters[cid].push(portal.options.guid);
 
-  // now, at this point, we could match the above re-clustr code - sorting, and adding/removing as necessary
+  // now, at this point, we could match the above re-cluster code - sorting, and adding/removing as necessary
   // however, it won't make a lot of visible difference compared to just pushing to the end of the list, then
   // adding to the visible layer if the list is below the limit
   if (this.portalClusters[cid].length < this.CLUSTER_PORTAL_LIMIT || portal.options.guid == selectedPortal || artifact.isInterestingPortal(portal.options.guid)) {
diff --git a/code/portal_detail.js b/code/portal_detail.js
index e99d5b7a..0f5557ab 100644
--- a/code/portal_detail.js
+++ b/code/portal_detail.js
@@ -1,5 +1,5 @@
 /// PORTAL DETAIL //////////////////////////////////////
-// code to retrieve the new potal detail data from the servers
+// code to retrieve the new portal detail data from the servers
 
 // NOTE: the API for portal detailed information is NOT FINAL
 // this is a temporary measure to get things working again after a major change to the intel map
@@ -54,6 +54,6 @@ window.portalDetail.request = function(guid) {
 
 
 
-})(); // anonumous wrapper function end
+})(); // anonymous wrapper function end
 
 
diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index 874ec60a..ec9dc817 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -99,7 +99,7 @@
             android:enabled="true"
             android:excludeFromRecents="true"
             android:exported="false"
-            android:icon="@drawable/copy"
+            android:icon="@drawable/ic_action_copy"
             android:label="@string/activity_share_to_clipboard"
             android:noHistory="false">
             <intent-filter>
diff --git a/mobile/res/drawable-hdpi/action_about.png b/mobile/res/drawable-hdpi/action_about.png
deleted file mode 100644
index 6eaf08ae..00000000
Binary files a/mobile/res/drawable-hdpi/action_about.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/action_search.png b/mobile/res/drawable-hdpi/action_search.png
deleted file mode 100644
index f12e005e..00000000
Binary files a/mobile/res/drawable-hdpi/action_search.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/action_settings.png b/mobile/res/drawable-hdpi/action_settings.png
deleted file mode 100644
index 3e4580e0..00000000
Binary files a/mobile/res/drawable-hdpi/action_settings.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/alerts_and_states_warning.png b/mobile/res/drawable-hdpi/alerts_and_states_warning.png
deleted file mode 100644
index 1fefdd8b..00000000
Binary files a/mobile/res/drawable-hdpi/alerts_and_states_warning.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/av_full_screen.png b/mobile/res/drawable-hdpi/av_full_screen.png
deleted file mode 100644
index 52601b03..00000000
Binary files a/mobile/res/drawable-hdpi/av_full_screen.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/browser.png b/mobile/res/drawable-hdpi/browser.png
deleted file mode 100644
index e154afdb..00000000
Binary files a/mobile/res/drawable-hdpi/browser.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/collections_view_as_list.png b/mobile/res/drawable-hdpi/collections_view_as_list.png
deleted file mode 100644
index e45ea1fd..00000000
Binary files a/mobile/res/drawable-hdpi/collections_view_as_list.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/content_remove.png b/mobile/res/drawable-hdpi/content_remove.png
deleted file mode 100644
index 094eea58..00000000
Binary files a/mobile/res/drawable-hdpi/content_remove.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/copy.png b/mobile/res/drawable-hdpi/copy.png
deleted file mode 100644
index 623b7150..00000000
Binary files a/mobile/res/drawable-hdpi/copy.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/device_access_location_found.png b/mobile/res/drawable-hdpi/device_access_location_found.png
deleted file mode 100644
index d7fae7e9..00000000
Binary files a/mobile/res/drawable-hdpi/device_access_location_found.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/drawer_shadow.9.png b/mobile/res/drawable-hdpi/drawer_shadow.9.png
deleted file mode 100644
index 224cc4ff..00000000
Binary files a/mobile/res/drawable-hdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/ic_action_about.png b/mobile/res/drawable-hdpi/ic_action_about.png
new file mode 100644
index 00000000..b1f14062
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_about.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_add_to_queue.png b/mobile/res/drawable-hdpi/ic_action_add_to_queue.png
new file mode 100644
index 00000000..ecebce71
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_add_to_queue.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_cc_bcc.png b/mobile/res/drawable-hdpi/ic_action_cc_bcc.png
new file mode 100644
index 00000000..3c6eb02b
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_cc_bcc.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_copy.png b/mobile/res/drawable-hdpi/ic_action_copy.png
new file mode 100644
index 00000000..f97df1d5
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_copy.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_error.png b/mobile/res/drawable-hdpi/ic_action_error.png
new file mode 100644
index 00000000..7837289c
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_error.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_full_screen.png b/mobile/res/drawable-hdpi/ic_action_full_screen.png
new file mode 100644
index 00000000..22f30d31
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_full_screen.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_group.png b/mobile/res/drawable-hdpi/ic_action_group.png
new file mode 100644
index 00000000..d043de6c
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_group.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_location_found.png b/mobile/res/drawable-hdpi/ic_action_location_found.png
new file mode 100644
index 00000000..4748e901
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_location_found.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_map.png b/mobile/res/drawable-hdpi/ic_action_map.png
new file mode 100644
index 00000000..945cf8ce
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_map.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_refresh.png b/mobile/res/drawable-hdpi/ic_action_refresh.png
new file mode 100644
index 00000000..00d70792
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_refresh.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_search.png b/mobile/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 00000000..a70393b5
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_search.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_settings.png b/mobile/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 00000000..f50c2d3a
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_share.png b/mobile/res/drawable-hdpi/ic_action_share.png
new file mode 100644
index 00000000..d52b66ab
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_share.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_view_as_list.png b/mobile/res/drawable-hdpi/ic_action_view_as_list.png
new file mode 100644
index 00000000..07fde4ac
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_view_as_list.png differ
diff --git a/mobile/res/drawable-hdpi/collections_view_as_list_compact.png b/mobile/res/drawable-hdpi/ic_action_view_as_list_compact.png
similarity index 100%
rename from mobile/res/drawable-hdpi/collections_view_as_list_compact.png
rename to mobile/res/drawable-hdpi/ic_action_view_as_list_compact.png
diff --git a/mobile/res/drawable-hdpi/ic_action_warning.png b/mobile/res/drawable-hdpi/ic_action_warning.png
new file mode 100644
index 00000000..12f9dd4b
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_warning.png differ
diff --git a/mobile/res/drawable-hdpi/ic_action_web_site.png b/mobile/res/drawable-hdpi/ic_action_web_site.png
new file mode 100644
index 00000000..8c4add42
Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_web_site.png differ
diff --git a/mobile/res/drawable-hdpi/ic_debug.png b/mobile/res/drawable-hdpi/ic_debug.png
deleted file mode 100644
index 8ed186b4..00000000
Binary files a/mobile/res/drawable-hdpi/ic_debug.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/ic_drawer.png b/mobile/res/drawable-hdpi/ic_drawer.png
index ff7b1def..6614ea4f 100644
Binary files a/mobile/res/drawable-hdpi/ic_drawer.png and b/mobile/res/drawable-hdpi/ic_drawer.png differ
diff --git a/mobile/res/drawable-hdpi/ic_layer_chooser.png b/mobile/res/drawable-hdpi/ic_layer_chooser.png
deleted file mode 100644
index b03e2f34..00000000
Binary files a/mobile/res/drawable-hdpi/ic_layer_chooser.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/location_map.png b/mobile/res/drawable-hdpi/location_map.png
deleted file mode 100644
index e5907072..00000000
Binary files a/mobile/res/drawable-hdpi/location_map.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/navigation_refresh.png b/mobile/res/drawable-hdpi/navigation_refresh.png
deleted file mode 100644
index bb9d855f..00000000
Binary files a/mobile/res/drawable-hdpi/navigation_refresh.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/share.png b/mobile/res/drawable-hdpi/share.png
deleted file mode 100644
index c329f58d..00000000
Binary files a/mobile/res/drawable-hdpi/share.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/social_cc_bcc.png b/mobile/res/drawable-hdpi/social_cc_bcc.png
deleted file mode 100644
index 8c4f8b31..00000000
Binary files a/mobile/res/drawable-hdpi/social_cc_bcc.png and /dev/null differ
diff --git a/mobile/res/drawable-hdpi/social_group.png b/mobile/res/drawable-hdpi/social_group.png
deleted file mode 100644
index dbf88a85..00000000
Binary files a/mobile/res/drawable-hdpi/social_group.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/action_about.png b/mobile/res/drawable-mdpi/action_about.png
deleted file mode 100644
index d7b7e698..00000000
Binary files a/mobile/res/drawable-mdpi/action_about.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/action_search.png b/mobile/res/drawable-mdpi/action_search.png
deleted file mode 100644
index 587d9e0b..00000000
Binary files a/mobile/res/drawable-mdpi/action_search.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/action_settings.png b/mobile/res/drawable-mdpi/action_settings.png
deleted file mode 100644
index d3e42edc..00000000
Binary files a/mobile/res/drawable-mdpi/action_settings.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/alerts_and_states_warning.png b/mobile/res/drawable-mdpi/alerts_and_states_warning.png
deleted file mode 100644
index a39f97d4..00000000
Binary files a/mobile/res/drawable-mdpi/alerts_and_states_warning.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/av_full_screen.png b/mobile/res/drawable-mdpi/av_full_screen.png
deleted file mode 100644
index 6fdcd5fc..00000000
Binary files a/mobile/res/drawable-mdpi/av_full_screen.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/browser.png b/mobile/res/drawable-mdpi/browser.png
deleted file mode 100644
index 41b56ec9..00000000
Binary files a/mobile/res/drawable-mdpi/browser.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/collections_view_as_list.png b/mobile/res/drawable-mdpi/collections_view_as_list.png
deleted file mode 100644
index 9c748b0b..00000000
Binary files a/mobile/res/drawable-mdpi/collections_view_as_list.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/content_remove.png b/mobile/res/drawable-mdpi/content_remove.png
deleted file mode 100644
index 3336760d..00000000
Binary files a/mobile/res/drawable-mdpi/content_remove.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/copy.png b/mobile/res/drawable-mdpi/copy.png
deleted file mode 100644
index efb2445f..00000000
Binary files a/mobile/res/drawable-mdpi/copy.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/device_access_location_found.png b/mobile/res/drawable-mdpi/device_access_location_found.png
deleted file mode 100644
index 9d1f4403..00000000
Binary files a/mobile/res/drawable-mdpi/device_access_location_found.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/drawer_shadow.9.png b/mobile/res/drawable-mdpi/drawer_shadow.9.png
deleted file mode 100644
index 3797f99c..00000000
Binary files a/mobile/res/drawable-mdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/ic_action_about.png b/mobile/res/drawable-mdpi/ic_action_about.png
new file mode 100644
index 00000000..7ede67d8
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_about.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_add_to_queue.png b/mobile/res/drawable-mdpi/ic_action_add_to_queue.png
new file mode 100644
index 00000000..1262bcf5
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_add_to_queue.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_cc_bcc.png b/mobile/res/drawable-mdpi/ic_action_cc_bcc.png
new file mode 100644
index 00000000..8e6d3ce9
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_cc_bcc.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_copy.png b/mobile/res/drawable-mdpi/ic_action_copy.png
new file mode 100644
index 00000000..507b1391
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_copy.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_error.png b/mobile/res/drawable-mdpi/ic_action_error.png
new file mode 100644
index 00000000..57274d77
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_error.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_full_screen.png b/mobile/res/drawable-mdpi/ic_action_full_screen.png
new file mode 100644
index 00000000..e4a9ff0a
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_full_screen.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_group.png b/mobile/res/drawable-mdpi/ic_action_group.png
new file mode 100644
index 00000000..fa3a4399
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_group.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_location_found.png b/mobile/res/drawable-mdpi/ic_action_location_found.png
new file mode 100644
index 00000000..9251ee49
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_location_found.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_map.png b/mobile/res/drawable-mdpi/ic_action_map.png
new file mode 100644
index 00000000..8ce5f3d5
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_map.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_refresh.png b/mobile/res/drawable-mdpi/ic_action_refresh.png
new file mode 100644
index 00000000..c2920a7a
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_refresh.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_search.png b/mobile/res/drawable-mdpi/ic_action_search.png
new file mode 100644
index 00000000..4edb1ff9
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_search.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_settings.png b/mobile/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 00000000..04f61dea
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_share.png b/mobile/res/drawable-mdpi/ic_action_share.png
new file mode 100644
index 00000000..cce0ab97
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_share.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_view_as_list.png b/mobile/res/drawable-mdpi/ic_action_view_as_list.png
new file mode 100644
index 00000000..ccb4c7d7
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_view_as_list.png differ
diff --git a/mobile/res/drawable-mdpi/collections_view_as_list_compact.png b/mobile/res/drawable-mdpi/ic_action_view_as_list_compact.png
similarity index 100%
rename from mobile/res/drawable-mdpi/collections_view_as_list_compact.png
rename to mobile/res/drawable-mdpi/ic_action_view_as_list_compact.png
diff --git a/mobile/res/drawable-mdpi/ic_action_warning.png b/mobile/res/drawable-mdpi/ic_action_warning.png
new file mode 100644
index 00000000..9a04694a
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_warning.png differ
diff --git a/mobile/res/drawable-mdpi/ic_action_web_site.png b/mobile/res/drawable-mdpi/ic_action_web_site.png
new file mode 100644
index 00000000..c073fa5e
Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_web_site.png differ
diff --git a/mobile/res/drawable-mdpi/ic_debug.png b/mobile/res/drawable-mdpi/ic_debug.png
deleted file mode 100644
index ac20ea13..00000000
Binary files a/mobile/res/drawable-mdpi/ic_debug.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/ic_drawer.png b/mobile/res/drawable-mdpi/ic_drawer.png
index fb681ba2..b05c026c 100644
Binary files a/mobile/res/drawable-mdpi/ic_drawer.png and b/mobile/res/drawable-mdpi/ic_drawer.png differ
diff --git a/mobile/res/drawable-mdpi/ic_layer_chooser.png b/mobile/res/drawable-mdpi/ic_layer_chooser.png
deleted file mode 100644
index 8ba65bd8..00000000
Binary files a/mobile/res/drawable-mdpi/ic_layer_chooser.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/location_map.png b/mobile/res/drawable-mdpi/location_map.png
deleted file mode 100644
index 21de2011..00000000
Binary files a/mobile/res/drawable-mdpi/location_map.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/navigation_refresh.png b/mobile/res/drawable-mdpi/navigation_refresh.png
deleted file mode 100644
index bd611e8e..00000000
Binary files a/mobile/res/drawable-mdpi/navigation_refresh.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/share.png b/mobile/res/drawable-mdpi/share.png
deleted file mode 100644
index 056deb57..00000000
Binary files a/mobile/res/drawable-mdpi/share.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/social_cc_bcc.png b/mobile/res/drawable-mdpi/social_cc_bcc.png
deleted file mode 100644
index 9ec127ed..00000000
Binary files a/mobile/res/drawable-mdpi/social_cc_bcc.png and /dev/null differ
diff --git a/mobile/res/drawable-mdpi/social_group.png b/mobile/res/drawable-mdpi/social_group.png
deleted file mode 100644
index a19796c3..00000000
Binary files a/mobile/res/drawable-mdpi/social_group.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/action_about.png b/mobile/res/drawable-xhdpi/action_about.png
deleted file mode 100644
index 4ee903f0..00000000
Binary files a/mobile/res/drawable-xhdpi/action_about.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/action_search.png b/mobile/res/drawable-xhdpi/action_search.png
deleted file mode 100644
index 3549f84d..00000000
Binary files a/mobile/res/drawable-xhdpi/action_search.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/action_settings.png b/mobile/res/drawable-xhdpi/action_settings.png
deleted file mode 100644
index 09b01483..00000000
Binary files a/mobile/res/drawable-xhdpi/action_settings.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/alerts_and_states_warning.png b/mobile/res/drawable-xhdpi/alerts_and_states_warning.png
deleted file mode 100644
index 4f11628f..00000000
Binary files a/mobile/res/drawable-xhdpi/alerts_and_states_warning.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/av_full_screen.png b/mobile/res/drawable-xhdpi/av_full_screen.png
deleted file mode 100644
index 791240fd..00000000
Binary files a/mobile/res/drawable-xhdpi/av_full_screen.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/browser.png b/mobile/res/drawable-xhdpi/browser.png
deleted file mode 100644
index 9b77be96..00000000
Binary files a/mobile/res/drawable-xhdpi/browser.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/collections_view_as_list.png b/mobile/res/drawable-xhdpi/collections_view_as_list.png
deleted file mode 100644
index 95708234..00000000
Binary files a/mobile/res/drawable-xhdpi/collections_view_as_list.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/content_remove.png b/mobile/res/drawable-xhdpi/content_remove.png
deleted file mode 100644
index f391760e..00000000
Binary files a/mobile/res/drawable-xhdpi/content_remove.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/copy.png b/mobile/res/drawable-xhdpi/copy.png
deleted file mode 100644
index 00bff33c..00000000
Binary files a/mobile/res/drawable-xhdpi/copy.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/device_access_location_found.png b/mobile/res/drawable-xhdpi/device_access_location_found.png
deleted file mode 100644
index 52ca8ab7..00000000
Binary files a/mobile/res/drawable-xhdpi/device_access_location_found.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/drawer_shadow.9.png b/mobile/res/drawable-xhdpi/drawer_shadow.9.png
deleted file mode 100644
index fa3d853e..00000000
Binary files a/mobile/res/drawable-xhdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_about.png b/mobile/res/drawable-xhdpi/ic_action_about.png
new file mode 100644
index 00000000..4536a8d1
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_about.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_add_to_queue.png b/mobile/res/drawable-xhdpi/ic_action_add_to_queue.png
new file mode 100644
index 00000000..8190ee04
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_add_to_queue.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_cc_bcc.png b/mobile/res/drawable-xhdpi/ic_action_cc_bcc.png
new file mode 100644
index 00000000..124ddcb3
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_cc_bcc.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_copy.png b/mobile/res/drawable-xhdpi/ic_action_copy.png
new file mode 100644
index 00000000..4aa5778e
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_copy.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_error.png b/mobile/res/drawable-xhdpi/ic_action_error.png
new file mode 100644
index 00000000..0933154a
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_error.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_full_screen.png b/mobile/res/drawable-xhdpi/ic_action_full_screen.png
new file mode 100644
index 00000000..2c1df53b
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_full_screen.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_group.png b/mobile/res/drawable-xhdpi/ic_action_group.png
new file mode 100644
index 00000000..7a6efaf6
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_group.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_location_found.png b/mobile/res/drawable-xhdpi/ic_action_location_found.png
new file mode 100644
index 00000000..f5031892
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_location_found.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_map.png b/mobile/res/drawable-xhdpi/ic_action_map.png
new file mode 100644
index 00000000..537c5a49
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_map.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_refresh.png b/mobile/res/drawable-xhdpi/ic_action_refresh.png
new file mode 100644
index 00000000..6aa33d59
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_refresh.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_search.png b/mobile/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 00000000..19658e4a
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_settings.png b/mobile/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 00000000..3f2f394f
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_settings.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_share.png b/mobile/res/drawable-xhdpi/ic_action_share.png
new file mode 100644
index 00000000..40771e48
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_share.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_view_as_list.png b/mobile/res/drawable-xhdpi/ic_action_view_as_list.png
new file mode 100644
index 00000000..45a3fc70
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_view_as_list.png differ
diff --git a/mobile/res/drawable-xhdpi/collections_view_as_list_compact.png b/mobile/res/drawable-xhdpi/ic_action_view_as_list_compact.png
similarity index 100%
rename from mobile/res/drawable-xhdpi/collections_view_as_list_compact.png
rename to mobile/res/drawable-xhdpi/ic_action_view_as_list_compact.png
diff --git a/mobile/res/drawable-xhdpi/ic_action_warning.png b/mobile/res/drawable-xhdpi/ic_action_warning.png
new file mode 100644
index 00000000..5cd44b97
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_warning.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_action_web_site.png b/mobile/res/drawable-xhdpi/ic_action_web_site.png
new file mode 100644
index 00000000..2d759def
Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_web_site.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_debug.png b/mobile/res/drawable-xhdpi/ic_debug.png
deleted file mode 100644
index aeb96b06..00000000
Binary files a/mobile/res/drawable-xhdpi/ic_debug.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/ic_drawer.png b/mobile/res/drawable-xhdpi/ic_drawer.png
index b9bc3d70..bcf49dd7 100644
Binary files a/mobile/res/drawable-xhdpi/ic_drawer.png and b/mobile/res/drawable-xhdpi/ic_drawer.png differ
diff --git a/mobile/res/drawable-xhdpi/ic_layer_chooser.png b/mobile/res/drawable-xhdpi/ic_layer_chooser.png
deleted file mode 100644
index 46089e5b..00000000
Binary files a/mobile/res/drawable-xhdpi/ic_layer_chooser.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/location_map.png b/mobile/res/drawable-xhdpi/location_map.png
deleted file mode 100644
index f5ce90a3..00000000
Binary files a/mobile/res/drawable-xhdpi/location_map.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/navigation_refresh.png b/mobile/res/drawable-xhdpi/navigation_refresh.png
deleted file mode 100644
index a7fdc0df..00000000
Binary files a/mobile/res/drawable-xhdpi/navigation_refresh.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/share.png b/mobile/res/drawable-xhdpi/share.png
deleted file mode 100644
index 15549b04..00000000
Binary files a/mobile/res/drawable-xhdpi/share.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/social_cc_bcc.png b/mobile/res/drawable-xhdpi/social_cc_bcc.png
deleted file mode 100644
index 4153807e..00000000
Binary files a/mobile/res/drawable-xhdpi/social_cc_bcc.png and /dev/null differ
diff --git a/mobile/res/drawable-xhdpi/social_group.png b/mobile/res/drawable-xhdpi/social_group.png
deleted file mode 100644
index 32d24d2c..00000000
Binary files a/mobile/res/drawable-xhdpi/social_group.png and /dev/null differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_about.png b/mobile/res/drawable-xxhdpi/ic_action_about.png
new file mode 100644
index 00000000..f3db0887
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_about.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_add_to_queue.png b/mobile/res/drawable-xxhdpi/ic_action_add_to_queue.png
new file mode 100644
index 00000000..c30aade6
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_add_to_queue.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_cc_bcc.png b/mobile/res/drawable-xxhdpi/ic_action_cc_bcc.png
new file mode 100644
index 00000000..b66fd656
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_cc_bcc.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_copy.png b/mobile/res/drawable-xxhdpi/ic_action_copy.png
new file mode 100644
index 00000000..a381cdc3
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_copy.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_error.png b/mobile/res/drawable-xxhdpi/ic_action_error.png
new file mode 100644
index 00000000..b8a6aaad
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_error.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_full_screen.png b/mobile/res/drawable-xxhdpi/ic_action_full_screen.png
new file mode 100644
index 00000000..e8dff1e4
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_full_screen.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_group.png b/mobile/res/drawable-xxhdpi/ic_action_group.png
new file mode 100644
index 00000000..9289b1c8
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_group.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_location_found.png b/mobile/res/drawable-xxhdpi/ic_action_location_found.png
new file mode 100644
index 00000000..e5179540
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_location_found.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_map.png b/mobile/res/drawable-xxhdpi/ic_action_map.png
new file mode 100644
index 00000000..ed72ce91
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_map.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_refresh.png b/mobile/res/drawable-xxhdpi/ic_action_refresh.png
new file mode 100644
index 00000000..145c9df4
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_refresh.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_search.png b/mobile/res/drawable-xxhdpi/ic_action_search.png
new file mode 100644
index 00000000..a1086388
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_settings.png b/mobile/res/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 00000000..6725c082
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_settings.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_share.png b/mobile/res/drawable-xxhdpi/ic_action_share.png
new file mode 100644
index 00000000..22ed428f
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_share.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_view_as_list.png b/mobile/res/drawable-xxhdpi/ic_action_view_as_list.png
new file mode 100644
index 00000000..46004164
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_view_as_list.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_view_as_list_compact.png b/mobile/res/drawable-xxhdpi/ic_action_view_as_list_compact.png
new file mode 100644
index 00000000..d04f2c3e
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_view_as_list_compact.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_warning.png b/mobile/res/drawable-xxhdpi/ic_action_warning.png
new file mode 100644
index 00000000..b0ad5b2d
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_warning.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_action_web_site.png b/mobile/res/drawable-xxhdpi/ic_action_web_site.png
new file mode 100644
index 00000000..e24eed75
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_web_site.png differ
diff --git a/mobile/res/drawable-xxhdpi/ic_drawer.png b/mobile/res/drawable-xxhdpi/ic_drawer.png
new file mode 100644
index 00000000..f7e3b307
Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_drawer.png differ
diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml
index 941cd9bc..8ddb56e3 100644
--- a/mobile/res/menu/main.xml
+++ b/mobile/res/menu/main.xml
@@ -1,34 +1,34 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/menu_search"
           android:title="@string/menu_search"
-          android:icon="@drawable/action_search"
+          android:icon="@drawable/ic_action_search"
           android:orderInCategory="10"
           android:showAsAction="ifRoom|collapseActionView"
           android:actionViewClass="android.widget.SearchView" />
     <item
         android:id="@+id/locate"
-        android:icon="@drawable/device_access_location_found"
+        android:icon="@drawable/ic_action_location_found"
         android:orderInCategory="100"
         android:showAsAction="ifRoom"
         android:title="@string/locate">
     </item>
     <item
         android:id="@+id/layer_chooser"
-        android:icon="@drawable/ic_layer_chooser"
+        android:icon="@drawable/ic_action_add_to_queue"
         android:orderInCategory="105"
         android:showAsAction="ifRoom"
         android:title="@string/layer_chooser">
     </item>
     <item
         android:id="@+id/reload_button"
-        android:icon="@drawable/navigation_refresh"
+        android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="110"
         android:showAsAction="never"
         android:title="@string/reload">
     </item>
     <item
         android:id="@+id/toggle_fullscreen"
-        android:icon="@drawable/av_full_screen"
+        android:icon="@drawable/ic_action_full_screen"
         android:orderInCategory="120"
         android:showAsAction="ifRoom"
         android:title="@string/toggle_fullscreen">
@@ -41,9 +41,9 @@
     </item>
     <item
         android:id="@+id/action_settings"
-        android:icon="@drawable/action_settings"
+        android:icon="@drawable/ic_action_settings"
         android:orderInCategory="200"
         android:showAsAction="never"
         android:title="@string/action_settings">
     </item>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 46c59ef2..3332f442 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -369,6 +369,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
         // Pop last item from backstack and pretend the relevant menu item was clicked
         if (!mBackStack.isEmpty()) {
             backStackPop();
+            mBackButtonPressed = true;
             return;
         }
 
@@ -404,8 +405,10 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
 
         // map pane is top-lvl. clear stack.
         if (pane == Pane.MAP) mBackStack.clear();
-        else mBackStack.push(mCurrentPane);
+        // don't push current pane to backstack if this method was called via back button
+        else if (!mBackButtonPressed) mBackStack.push(mCurrentPane);
 
+        mBackButtonPressed = false;
         mCurrentPane = pane;
         mNavigationHelper.switchTo(pane);
     }
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
index 0b61a00d..7f93e1ae 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
@@ -327,13 +327,13 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
     }
 
     public static class Pane {
-        public static final Pane COMPACT = new Pane("compact", "Compact", R.drawable.collections_view_as_list_compact);
-        public static final Pane DEBUG = new Pane("debug", "Debug", R.drawable.ic_debug);
-        public static final Pane FACTION = new Pane("faction", "Faction", R.drawable.social_cc_bcc);
-        public static final Pane FULL = new Pane("full", "Full", R.drawable.collections_view_as_list);
-        public static final Pane INFO = new Pane("info", "Info", R.drawable.action_about);
-        public static final Pane MAP = new Pane("map", "IITC Mobile", R.drawable.location_map);
-        public static final Pane PUBLIC = new Pane("public", "Public", R.drawable.social_group);
+        public static final Pane COMPACT = new Pane("compact", "Compact", R.drawable.ic_action_view_as_list_compact);
+        public static final Pane DEBUG = new Pane("debug", "Debug", R.drawable.ic_action_error);
+        public static final Pane FACTION = new Pane("faction", "Faction", R.drawable.ic_action_cc_bcc);
+        public static final Pane FULL = new Pane("full", "Full", R.drawable.ic_action_view_as_list);
+        public static final Pane INFO = new Pane("info", "Info", R.drawable.ic_action_about);
+        public static final Pane MAP = new Pane("map", "IITC Mobile", R.drawable.ic_action_map);
+        public static final Pane PUBLIC = new Pane("public", "Public", R.drawable.ic_action_group);
 
         private int icon;
         public String label;
diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
index 3ba21fa2..24523eeb 100644
--- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
+++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
@@ -81,10 +81,10 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
         String geoUri = "geo:" + mLl;
         Intent geoIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(geoUri));
         intents.add(geoIntent);
-        addTab(intents, R.string.tab_map, R.drawable.location_map);
+        addTab(intents, R.string.tab_map, R.drawable.ic_action_map);
 
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getUrl()));
-        addTab(intent, R.string.tab_browser, R.drawable.browser);
+        addTab(intent, R.string.tab_browser, R.drawable.ic_action_web_site);
     }
 
     private void setupShareIntent(String str) {
@@ -93,7 +93,7 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
         intent.setType("text/plain");
         intent.putExtra(Intent.EXTRA_TEXT, str);
         intent.putExtra(Intent.EXTRA_SUBJECT, mTitle);
-        addTab(intent, R.string.tab_share, R.drawable.share);
+        addTab(intent, R.string.tab_share, R.drawable.ic_action_share);
     }
 
     @Override
diff --git a/plugins/broken/ipas-link.user.js b/plugins/broken/ipas-link.user.js
deleted file mode 100644
index 02db5180..00000000
--- a/plugins/broken/ipas-link.user.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// ==UserScript==
-// @id             iitc-plugin-ipas-link@graphracer
-// @name           IITC Plugin: simulate an attack on portal
-// @category       Portal Info
-// @version        0.2.0.@@DATETIMEVERSION@@
-// @namespace      https://github.com/xosofox/IPAS
-// @updateURL      @@UPDATEURL@@
-// @downloadURL    @@DOWNLOADURL@@
-// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Adds a link to the portal details to open the portal in IPAS - Ingress Portal Attack Simulator on http://ipas.graphracer.com
-// @include        https://www.ingress.com/intel*
-// @include        http://www.ingress.com/intel*
-// @match          https://www.ingress.com/intel*
-// @match          http://www.ingress.com/intel*
-// @grant          none
-// ==/UserScript==
-
-@@PLUGINSTART@@
-
-// PLUGIN START ////////////////////////////////////////////////////////
-
-// use own namespace for plugin
-window.plugin.ipasLink = function() {};
-
-window.plugin.ipasLink.setupCallback = function() {
-  addHook('portalDetailsUpdated', window.plugin.ipasLink.addLink);
-}
-
-window.plugin.ipasLink.addLink = function(d) {
-  $('.linkdetails').append('<aside><a href="http://ipas.graphracer.com/index.html#' + window.plugin.ipasLink.getHash(d.portalDetails) + '" target="ipaswindow" title="Use IPAS to simulate an attack on this portal">Simulate attack</a></aside>');
-}
-
-window.plugin.ipasLink.getHash = function (d) {
-    var hashParts = [];
-    $.each(d.resonatorArray.resonators, function (ind, reso) {
-        if (reso) {
-            hashParts.push(reso.level + "," + reso.distanceToPortal + "," + reso.energyTotal);
-        } else {
-            hashParts.push("1,20,0");
-        }
-    });
-    var resos = hashParts.join(";");
-
-    hashParts = [];
-    $.each(d.portalV2.linkedModArray, function (ind, mod) {
-        // s - shields
-        // h - heat sink
-        // i - intentionally left in
-        // t - turret
-        //
-        // f - force amp
-        // m - multi-hack
-        // l - link-amp
-        //
-            var modCodes = {
-                "RES_SHIELD": "s",
-                "HEATSINK": "h",
-                "TURRET": "t",
-                "FORCE_AMP": "f",
-                "MULTIHACK": "m",
-                "LINK_AMPLIFIER": "l"
-            }
-
-            var mc = "0";
-            if (mod) {
-                if (mod.type in modCodes) {
-                    mc = modCodes[mod.type] + mod.rarity.charAt(0).toLowerCase();
-
-                    //special for shields to distinguish old/new mitigation
-                    if (mod.type == "RES_SHIELD") {
-                        mc += mod.stats.MITIGATION;
-                    }
-                }
-            }
-            hashParts.push(mc);
-        });
-        var shields = hashParts.join(",");
-
-        var linkParts = [];
-        var edges = d.portalV2.linkedEdges;
-
-        var portalL = new L.LatLng(d.locationE6.latE6 / 1E6, d.locationE6.lngE6 / 1E6)
-        $.each(edges, function (ind, edge) {
-            //calc distance in m here
-            var distance = 1; //default to 1m, so a low level portal would support it
-
-            //Try to find other portals details
-            var guid = edge.otherPortalGuid
-            if (window.portals[guid] !== undefined) {
-                //get other portals details as o
-                var o = window.portals[guid].options.details;
-                var otherPortalL = new L.LatLng(o.locationE6.latE6 / 1E6, o.locationE6.lngE6 / 1E6);
-                var distance = Math.round(portalL.distanceTo(otherPortalL));
-            }
-
-            if (!(edge.isOrigin)) {
-                distance = distance * -1;
-            }
-            linkParts.push(distance);
-        });
-        var links = linkParts.join(",");
-
-        return resos + "/" + shields + "/" + links; //changed with IPAS 1.1 to / instead of |
-    }
-
-var setup = function () {
-    window.plugin.ipasLink.setupCallback();
-}
-
-// PLUGIN END //////////////////////////////////////////////////////////
-
-@@PLUGINEND@@
diff --git a/plugins/guess-player-levels.user.js b/plugins/guess-player-levels.user.js
index b51de2cd..1fa5f44e 100644
--- a/plugins/guess-player-levels.user.js
+++ b/plugins/guess-player-levels.user.js
@@ -317,7 +317,7 @@ window.plugin.guessPlayerLevels.sort = function(playerHash) {
 
 
 var setup =  function() {
-  // we used to sture level guesses as one localStorage key per player, named 'level-PLAYER_GUID'
+  // we used to store level guesses as one localStorage key per player, named 'level-PLAYER_GUID'
   // they're now stored in a single storage key - 'plugin-guess-player-levels' - so clear these old entries
   $.each(Object.keys(localStorage), function(ind,key) {// legacy code - should be removed in the future
     if(key.lastIndexOf('level-',0)===0) {
diff --git a/plugins/ipas-link.user.js b/plugins/ipas-link.user.js
index 06352f63..cab444d6 100644
--- a/plugins/ipas-link.user.js
+++ b/plugins/ipas-link.user.js
@@ -1,15 +1,114 @@
 // ==UserScript==
 // @id             iitc-plugin-ipas-link@graphracer
 // @name           IITC Plugin: simulate an attack on portal
-// @category  Deleted
-// @version        0.2.0.@@DATETIMEVERSION@@
+// @category       Portal Info
+// @version        0.2.1.@@DATETIMEVERSION@@
 // @namespace      https://github.com/xosofox/IPAS
 // @updateURL      @@UPDATEURL@@
 // @downloadURL    @@DOWNLOADURL@@
-// @description   PLUGIN CURRENTLY UNAVAILABLE
+// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Adds a link to the portal details to open the portal in IPAS - Ingress Portal Attack Simulator on http://ipas.graphracer.com
 // @include        https://www.ingress.com/intel*
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
 // @grant          none
 // ==/UserScript==
+
+@@PLUGINSTART@@
+
+// PLUGIN START ////////////////////////////////////////////////////////
+
+// use own namespace for plugin
+window.plugin.ipasLink = function() {};
+
+window.plugin.ipasLink.setupCallback = function() {
+  addHook('portalDetailsUpdated', window.plugin.ipasLink.addLink);
+}
+
+window.plugin.ipasLink.addLink = function(p) {
+  $('.linkdetails').append('<aside><a href="http://ipas.graphracer.com/index.html#' + window.plugin.ipasLink.getHash(p) + '" target="ipaswindow" title="Use IPAS to simulate an attack on this portal">Simulate attack</a></aside>');
+}
+
+window.plugin.ipasLink.getHash = function (p) {
+  var details = p.portalDetails;
+
+  var hashParts = [];
+  $.each(details.resonatorArray.resonators, function (ind, reso) {
+    if (reso)
+      hashParts.push(reso.level + "," + reso.distanceToPortal + "," + reso.energyTotal);
+    else
+      hashParts.push("1,20,0");
+  });
+  var resos = hashParts.join(";");
+
+  hashParts = [];
+  $.each(details.portalV2.linkedModArray, function (ind, mod) {
+    // s - shields
+    // h - heat sink
+    // i - intentionally left in
+    // t - turret
+    //
+    // f - force amp
+    // m - multi-hack
+    // l - link-amp
+    //
+    var modCodes = {
+      "RES_SHIELD": "s",
+      "HEATSINK": "h",
+      "TURRET": "t",
+      "FORCE_AMP": "f",
+      "MULTIHACK": "m",
+      "LINK_AMPLIFIER": "l"
+    }
+
+    var mc = "0";
+    if (mod) {
+      if (mod.type in modCodes) {
+        mc = modCodes[mod.type] + mod.rarity.charAt(0).toLowerCase();
+
+        //special for shields to distinguish old/new mitigation
+        if (mod.type == "RES_SHIELD")
+          mc += mod.stats.MITIGATION;
+      }
+    }
+    hashParts.push(mc);
+  });
+  var shields = hashParts.join(",");
+
+  var linkParts = [];
+  var portalLL = p.portal.getLatLng();
+  var edges = getPortalLinks(p.guid);
+  edges["in"].forEach(function (guid) {
+    //calc distance in m here
+    var distance = 1; //default to 1m, so a low level portal would support it
+
+    //Try to find other portals details
+    var o = window.portals[guid];
+    if (o)
+      distance = Math.round(portalLL.distanceTo(o.getLatLng()));
+
+    linkParts.push(distance);
+  });
+  edges["out"].forEach(function (guid) {
+    //calc distance in m here
+    var distance = 1; //default to 1m, so a low level portal would support it
+
+    //Try to find other portals details
+    var o = window.portals[guid];
+    if (o)
+      distance = Math.round(portalLL.distanceTo(o.getLatLng()));
+
+    linkParts.push(-distance); // "-" to mark outgoing links
+  });
+  var links = linkParts.join(",");
+
+  return resos + "/" + shields + "/" + links; //changed with IPAS 1.1 to / instead of |
+}
+
+var setup = function () {
+  window.plugin.ipasLink.setupCallback();
+}
+
+// PLUGIN END //////////////////////////////////////////////////////////
+
+@@PLUGINEND@@
diff --git a/plugins/keys.user.js b/plugins/keys.user.js
index 7ba1697b..26921db1 100644
--- a/plugins/keys.user.js
+++ b/plugins/keys.user.js
@@ -155,7 +155,7 @@ window.plugin.keys.loadLocal = function(mapping) {
                           : JSON.parse(objectJSON);
 }
 
-// For backward compitable, will change to use loadLocal after a few version
+// For backward compatibility, will change to use loadLocal after a few version
 window.plugin.keys.loadKeys = function() {
   var keysObjectJSON = localStorage[plugin.keys.KEY.key];
   if(!keysObjectJSON) return;