diff --git a/LocationLib/bin/locationlib.jar b/LocationLib/bin/locationlib.jar
index cade389..821146e 100644
Binary files a/LocationLib/bin/locationlib.jar and b/LocationLib/bin/locationlib.jar differ
diff --git a/LocationLib/bin/res/drawable-hdpi/map_action_bar.png b/LocationLib/bin/res/drawable-hdpi/map_action_bar.png
new file mode 100644
index 0000000..a2917c3
Binary files /dev/null and b/LocationLib/bin/res/drawable-hdpi/map_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-hdpi/map_mode_action_bar.png b/LocationLib/bin/res/drawable-hdpi/map_mode_action_bar.png
new file mode 100644
index 0000000..d89852e
Binary files /dev/null and b/LocationLib/bin/res/drawable-hdpi/map_mode_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-hdpi/mark_my_location_action_bar.png b/LocationLib/bin/res/drawable-hdpi/mark_my_location_action_bar.png
new file mode 100644
index 0000000..df09838
Binary files /dev/null and b/LocationLib/bin/res/drawable-hdpi/mark_my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-hdpi/my_location_action_bar.png b/LocationLib/bin/res/drawable-hdpi/my_location_action_bar.png
new file mode 100644
index 0000000..cb44adf
Binary files /dev/null and b/LocationLib/bin/res/drawable-hdpi/my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-hdpi/nav_action_bar.png b/LocationLib/bin/res/drawable-hdpi/nav_action_bar.png
new file mode 100644
index 0000000..b8213ec
Binary files /dev/null and b/LocationLib/bin/res/drawable-hdpi/nav_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-ldpi/map_action_bar.png b/LocationLib/bin/res/drawable-ldpi/map_action_bar.png
new file mode 100644
index 0000000..a50e0e1
Binary files /dev/null and b/LocationLib/bin/res/drawable-ldpi/map_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-ldpi/map_mode_action_bar.png b/LocationLib/bin/res/drawable-ldpi/map_mode_action_bar.png
new file mode 100644
index 0000000..faca1db
Binary files /dev/null and b/LocationLib/bin/res/drawable-ldpi/map_mode_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-ldpi/mark_my_location_action_bar.png b/LocationLib/bin/res/drawable-ldpi/mark_my_location_action_bar.png
new file mode 100644
index 0000000..a4a6019
Binary files /dev/null and b/LocationLib/bin/res/drawable-ldpi/mark_my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-ldpi/my_location_action_bar.png b/LocationLib/bin/res/drawable-ldpi/my_location_action_bar.png
new file mode 100644
index 0000000..9089f81
Binary files /dev/null and b/LocationLib/bin/res/drawable-ldpi/my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-ldpi/nav_action_bar.png b/LocationLib/bin/res/drawable-ldpi/nav_action_bar.png
new file mode 100644
index 0000000..5830dc9
Binary files /dev/null and b/LocationLib/bin/res/drawable-ldpi/nav_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-mdpi/map_action_bar.png b/LocationLib/bin/res/drawable-mdpi/map_action_bar.png
new file mode 100644
index 0000000..cbfb81f
Binary files /dev/null and b/LocationLib/bin/res/drawable-mdpi/map_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-mdpi/map_mode_action_bar.png b/LocationLib/bin/res/drawable-mdpi/map_mode_action_bar.png
new file mode 100644
index 0000000..599ca23
Binary files /dev/null and b/LocationLib/bin/res/drawable-mdpi/map_mode_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-mdpi/mark_my_location_action_bar.png b/LocationLib/bin/res/drawable-mdpi/mark_my_location_action_bar.png
new file mode 100644
index 0000000..eb0a11a
Binary files /dev/null and b/LocationLib/bin/res/drawable-mdpi/mark_my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-mdpi/my_location_action_bar.png b/LocationLib/bin/res/drawable-mdpi/my_location_action_bar.png
new file mode 100644
index 0000000..6968159
Binary files /dev/null and b/LocationLib/bin/res/drawable-mdpi/my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-mdpi/nav_action_bar.png b/LocationLib/bin/res/drawable-mdpi/nav_action_bar.png
new file mode 100644
index 0000000..5dadd62
Binary files /dev/null and b/LocationLib/bin/res/drawable-mdpi/nav_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-xhdpi/map_action_bar.png b/LocationLib/bin/res/drawable-xhdpi/map_action_bar.png
new file mode 100644
index 0000000..75f314a
Binary files /dev/null and b/LocationLib/bin/res/drawable-xhdpi/map_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-xhdpi/map_mode_action_bar.png b/LocationLib/bin/res/drawable-xhdpi/map_mode_action_bar.png
new file mode 100644
index 0000000..167a0f0
Binary files /dev/null and b/LocationLib/bin/res/drawable-xhdpi/map_mode_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-xhdpi/mark_my_location_action_bar.png b/LocationLib/bin/res/drawable-xhdpi/mark_my_location_action_bar.png
new file mode 100644
index 0000000..de75080
Binary files /dev/null and b/LocationLib/bin/res/drawable-xhdpi/mark_my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-xhdpi/my_location_action_bar.png b/LocationLib/bin/res/drawable-xhdpi/my_location_action_bar.png
new file mode 100644
index 0000000..745e7f8
Binary files /dev/null and b/LocationLib/bin/res/drawable-xhdpi/my_location_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable-xhdpi/nav_action_bar.png b/LocationLib/bin/res/drawable-xhdpi/nav_action_bar.png
new file mode 100644
index 0000000..4f89c1d
Binary files /dev/null and b/LocationLib/bin/res/drawable-xhdpi/nav_action_bar.png differ
diff --git a/LocationLib/bin/res/drawable/compass.png b/LocationLib/bin/res/drawable/compass.png
new file mode 100644
index 0000000..87848e5
Binary files /dev/null and b/LocationLib/bin/res/drawable/compass.png differ
diff --git a/LocationLib/bin/res/drawable/compass_lrg.png b/LocationLib/bin/res/drawable/compass_lrg.png
new file mode 100644
index 0000000..7fce2d5
Binary files /dev/null and b/LocationLib/bin/res/drawable/compass_lrg.png differ
diff --git a/LocationLib/bin/res/drawable/compass_med.png b/LocationLib/bin/res/drawable/compass_med.png
new file mode 100644
index 0000000..d847df4
Binary files /dev/null and b/LocationLib/bin/res/drawable/compass_med.png differ
diff --git a/LocationLib/bin/res/drawable/compass_sm.png b/LocationLib/bin/res/drawable/compass_sm.png
new file mode 100644
index 0000000..54ce936
Binary files /dev/null and b/LocationLib/bin/res/drawable/compass_sm.png differ
diff --git a/LocationLib/bin/res/drawable/logoidea3.png b/LocationLib/bin/res/drawable/logoidea3.png
new file mode 100644
index 0000000..fdc73c3
Binary files /dev/null and b/LocationLib/bin/res/drawable/logoidea3.png differ
diff --git a/LocationLib/bin/res/drawable/needle.png b/LocationLib/bin/res/drawable/needle.png
new file mode 100644
index 0000000..93fad78
Binary files /dev/null and b/LocationLib/bin/res/drawable/needle.png differ
diff --git a/LocationLib/bin/res/drawable/needle_lrg.png b/LocationLib/bin/res/drawable/needle_lrg.png
new file mode 100644
index 0000000..ba5f535
Binary files /dev/null and b/LocationLib/bin/res/drawable/needle_lrg.png differ
diff --git a/LocationLib/bin/res/drawable/needle_med.png b/LocationLib/bin/res/drawable/needle_med.png
new file mode 100644
index 0000000..bcd8a6d
Binary files /dev/null and b/LocationLib/bin/res/drawable/needle_med.png differ
diff --git a/LocationLib/bin/res/drawable/needle_sm.png b/LocationLib/bin/res/drawable/needle_sm.png
new file mode 100644
index 0000000..258bc24
Binary files /dev/null and b/LocationLib/bin/res/drawable/needle_sm.png differ
diff --git a/LocationLib/bin/res/drawable/skyhook_logo_alpha.png b/LocationLib/bin/res/drawable/skyhook_logo_alpha.png
new file mode 100644
index 0000000..d5ce291
Binary files /dev/null and b/LocationLib/bin/res/drawable/skyhook_logo_alpha.png differ
diff --git a/LocationLib/bin/res/drawable/skyhook_logo_alpha_small.png b/LocationLib/bin/res/drawable/skyhook_logo_alpha_small.png
new file mode 100644
index 0000000..8058c19
Binary files /dev/null and b/LocationLib/bin/res/drawable/skyhook_logo_alpha_small.png differ
diff --git a/LocationLib/bin/res/drawable/tc_logo_complete.png b/LocationLib/bin/res/drawable/tc_logo_complete.png
new file mode 100644
index 0000000..073970c
Binary files /dev/null and b/LocationLib/bin/res/drawable/tc_logo_complete.png differ
diff --git a/LocationLib/bin/res/drawable/user.png b/LocationLib/bin/res/drawable/user.png
new file mode 100644
index 0000000..579f876
Binary files /dev/null and b/LocationLib/bin/res/drawable/user.png differ
diff --git a/LocationLib/bin/res/drawable/user_arrow_animation_1.png b/LocationLib/bin/res/drawable/user_arrow_animation_1.png
new file mode 100644
index 0000000..9c6778e
Binary files /dev/null and b/LocationLib/bin/res/drawable/user_arrow_animation_1.png differ
diff --git a/LocationLib/bin/res/drawable/user_arrow_animation_2.png b/LocationLib/bin/res/drawable/user_arrow_animation_2.png
new file mode 100644
index 0000000..630fd72
Binary files /dev/null and b/LocationLib/bin/res/drawable/user_arrow_animation_2.png differ
diff --git a/LocationLib/bin/res/drawable/user_arrow_animation_3.png b/LocationLib/bin/res/drawable/user_arrow_animation_3.png
new file mode 100644
index 0000000..c1448f7
Binary files /dev/null and b/LocationLib/bin/res/drawable/user_arrow_animation_3.png differ
diff --git a/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java b/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java
index f1c6b1e..c56738c 100644
--- a/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java
+++ b/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java
@@ -43,7 +43,7 @@ public abstract class UserOverlayBase extends Overlay implements GeoPointLocatio
 		
 		private boolean isAborted;
 
-		public synchronized void abort(){
+		public void abort(){
 			isAborted = true;
 		}
 
@@ -65,13 +65,13 @@ public abstract class UserOverlayBase extends Overlay implements GeoPointLocatio
 					
 					switch(index){
 					case 1:
-						setDrawable(R.drawable.user_arrow_animation_2);
+						mUserArrow = R.drawable.user_arrow_animation_2;
 						break;
 					case 2:
-						setDrawable(R.drawable.user_arrow_animation_3);
+						mUserArrow = R.drawable.user_arrow_animation_3;
 						break;
 					default:
-						setDrawable(R.drawable.user_arrow_animation_1);
+						mUserArrow = R.drawable.user_arrow_animation_1;
 						try {
 							sleep(300l);
 						} catch (InterruptedException e) {
@@ -97,15 +97,6 @@ public abstract class UserOverlayBase extends Overlay implements GeoPointLocatio
 			}
 			
 		}
-		
-		/**
-		 * Sets the id of the user drawable
-		 * @param id
-		 * @author ricky barrette
-		 */
-		private synchronized void setDrawable(int id){
-			mUserArrow = id;
-		}
 	}
 	private final String TAG = "UserOverlayBase";
 	private boolean isEnabled;
@@ -181,9 +172,9 @@ public abstract class UserOverlayBase extends Overlay implements GeoPointLocatio
 		onMyLocationDisabled();
 		isEnabled = false;
 		mCompass.disable();
-		mAnimationThread.abort();
 		if(mGPSprogress != null)
 			mGPSprogress.cancel();
+		mAnimationThread.abort();
 	}
 	
 	/**