diff --git a/res/drawable/arrow.png b/res/drawable/arrow.png
new file mode 100644
index 0000000..f77f293
Binary files /dev/null and b/res/drawable/arrow.png differ
diff --git a/res/drawable/button_normal.9.png b/res/drawable/button_normal.9.png
new file mode 100644
index 0000000..b0684ad
Binary files /dev/null and b/res/drawable/button_normal.9.png differ
diff --git a/res/drawable/button_pressed.9.png b/res/drawable/button_pressed.9.png
new file mode 100644
index 0000000..dad39f2
Binary files /dev/null and b/res/drawable/button_pressed.9.png differ
diff --git a/res/drawable/compass_background.png b/res/drawable/compass_background.png
new file mode 100644
index 0000000..09a1b7e
Binary files /dev/null and b/res/drawable/compass_background.png differ
diff --git a/res/drawable/compass_needle.png b/res/drawable/compass_needle.png
new file mode 100644
index 0000000..827f30c
Binary files /dev/null and b/res/drawable/compass_needle.png differ
diff --git a/res/drawable/copy.png b/res/drawable/copy.png
new file mode 100644
index 0000000..a4ef631
Binary files /dev/null and b/res/drawable/copy.png differ
diff --git a/res/drawable/droid.png b/res/drawable/droid.png
new file mode 100644
index 0000000..9daec33
Binary files /dev/null and b/res/drawable/droid.png differ
diff --git a/res/drawable/gps.png b/res/drawable/gps.png
new file mode 100644
index 0000000..110dc96
Binary files /dev/null and b/res/drawable/gps.png differ
diff --git a/res/drawable/gps_fix.xml b/res/drawable/gps_fix.xml
new file mode 100644
index 0000000..6e51e94
--- /dev/null
+++ b/res/drawable/gps_fix.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/gps_fix1"/>
+</level-list>
\ No newline at end of file
diff --git a/res/drawable/gps_fix1.png b/res/drawable/gps_fix1.png
new file mode 100644
index 0000000..bc9160d
Binary files /dev/null and b/res/drawable/gps_fix1.png differ
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
new file mode 100644
index 0000000..d8bfc68
Binary files /dev/null and b/res/drawable/icon.png differ
diff --git a/res/drawable/icon_call.png b/res/drawable/icon_call.png
new file mode 100644
index 0000000..05f3b16
Binary files /dev/null and b/res/drawable/icon_call.png differ
diff --git a/res/drawable/icon_car.png b/res/drawable/icon_car.png
new file mode 100644
index 0000000..0e18a88
Binary files /dev/null and b/res/drawable/icon_car.png differ
diff --git a/res/drawable/icon_details.png b/res/drawable/icon_details.png
new file mode 100644
index 0000000..5fb20fe
Binary files /dev/null and b/res/drawable/icon_details.png differ
diff --git a/res/drawable/network_fix.xml b/res/drawable/network_fix.xml
new file mode 100644
index 0000000..1ea2d59
--- /dev/null
+++ b/res/drawable/network_fix.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/network_fix1"/>
+    <item android:maxLevel="1" android:drawable="@drawable/network_fix2"/>
+    <item android:maxLevel="2" android:drawable="@drawable/network_fix3"/>
+    <item android:maxLevel="3" android:drawable="@drawable/network_fix2"/>
+</level-list>
\ No newline at end of file
diff --git a/res/drawable/network_fix1.png b/res/drawable/network_fix1.png
new file mode 100644
index 0000000..d3d9339
Binary files /dev/null and b/res/drawable/network_fix1.png differ
diff --git a/res/drawable/network_fix2.png b/res/drawable/network_fix2.png
new file mode 100644
index 0000000..e32c223
Binary files /dev/null and b/res/drawable/network_fix2.png differ
diff --git a/res/drawable/network_fix3.png b/res/drawable/network_fix3.png
new file mode 100644
index 0000000..cf2db7c
Binary files /dev/null and b/res/drawable/network_fix3.png differ
diff --git a/res/drawable/pin_off.png b/res/drawable/pin_off.png
new file mode 100644
index 0000000..e3bb878
Binary files /dev/null and b/res/drawable/pin_off.png differ
diff --git a/res/drawable/pin_on.png b/res/drawable/pin_on.png
new file mode 100644
index 0000000..0dd4cca
Binary files /dev/null and b/res/drawable/pin_on.png differ
diff --git a/res/drawable/refresh.png b/res/drawable/refresh.png
new file mode 100644
index 0000000..77d70dd
Binary files /dev/null and b/res/drawable/refresh.png differ
diff --git a/res/drawable/status_off.png b/res/drawable/status_off.png
new file mode 100644
index 0000000..538256f
Binary files /dev/null and b/res/drawable/status_off.png differ
diff --git a/res/drawable/status_on.png b/res/drawable/status_on.png
new file mode 100644
index 0000000..e5a7ad3
Binary files /dev/null and b/res/drawable/status_on.png differ
diff --git a/src/org/r3pek/pharmacies/utils/GeoUtils.java b/src/org/r3pek/pharmacies/utils/GeoUtils.java
index 61a4fcc..6440e4e 100644
--- a/src/org/r3pek/pharmacies/utils/GeoUtils.java
+++ b/src/org/r3pek/pharmacies/utils/GeoUtils.java
@@ -104,8 +104,9 @@ public class GeoUtils {
 				}
 				
 				String result = "";
-				for (int i = 0; i <= addresses.get(0).getMaxAddressLineIndex(); i++)
-					result += addresses.get(0).getAddressLine(i) + ", ";
+				if (addresses != null && addresses.size() > 0)
+        			for (int i = 0; i <= addresses.get(0).getMaxAddressLineIndex(); i++)
+        				result += addresses.get(0).getAddressLine(i) + ", ";
 
 				if (result.equals(""))
 					b.putString("location", context.getString(R.string.not_available));