diff --git a/LocationRinger/AndroidManifest.xml b/LocationRinger/AndroidManifest.xml
index f62e2f3..33cbdaf 100644
--- a/LocationRinger/AndroidManifest.xml
+++ b/LocationRinger/AndroidManifest.xml
@@ -2,29 +2,23 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.TwentyCodes.android.LocationRinger"
     android:installLocation="internalOnly"
-    android:versionCode="35"
-    android:versionName="73dbdc0" >
+    android:versionCode="57"
+    android:versionName="10b9420" >
 
-    <uses-sdk android:minSdkVersion="7" />
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
 
     <uses-feature
         android:name="android.hardware.location"
         android:required="true" />
     <uses-feature
         android:name="android.hardware.location.gps"
-        android:required="false" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+        android:required="true" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
diff --git a/LocationRinger/project.properties b/LocationRinger/project.properties
index 1d483db..93d2daf 100644
--- a/LocationRinger/project.properties
+++ b/LocationRinger/project.properties
@@ -11,5 +11,5 @@ android.library.reference.1=../../exception_handler_library/ExceptionHandlerLib
 android.library.reference.2=../../location_library/LocationLib
 proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.cfg
 # Project target.
-target=Google Inc.:Google APIs:15
+target=Google Inc.:Google APIs:16
 manifestmerger.enabled=true
diff --git a/LocationRinger/res/drawable-hdpi/ic_action_bluetooth.png b/LocationRinger/res/drawable-hdpi/ic_action_bluetooth.png
new file mode 100644
index 0000000..b217cc1
Binary files /dev/null and b/LocationRinger/res/drawable-hdpi/ic_action_bluetooth.png differ
diff --git a/LocationRinger/res/drawable-hdpi/ic_action_silent.png b/LocationRinger/res/drawable-hdpi/ic_action_silent.png
new file mode 100644
index 0000000..b883ba4
Binary files /dev/null and b/LocationRinger/res/drawable-hdpi/ic_action_silent.png differ
diff --git a/LocationRinger/res/drawable-hdpi/ic_action_volume.png b/LocationRinger/res/drawable-hdpi/ic_action_volume.png
new file mode 100644
index 0000000..8b9c8a5
Binary files /dev/null and b/LocationRinger/res/drawable-hdpi/ic_action_volume.png differ
diff --git a/LocationRinger/res/drawable-hdpi/ic_action_wifi.png b/LocationRinger/res/drawable-hdpi/ic_action_wifi.png
new file mode 100644
index 0000000..c78861f
Binary files /dev/null and b/LocationRinger/res/drawable-hdpi/ic_action_wifi.png differ
diff --git a/LocationRinger/res/drawable-ldpi/ic_action_bluetooth.png b/LocationRinger/res/drawable-ldpi/ic_action_bluetooth.png
new file mode 100644
index 0000000..65c16d4
Binary files /dev/null and b/LocationRinger/res/drawable-ldpi/ic_action_bluetooth.png differ
diff --git a/LocationRinger/res/drawable-ldpi/ic_action_silent.png b/LocationRinger/res/drawable-ldpi/ic_action_silent.png
new file mode 100644
index 0000000..d1ca909
Binary files /dev/null and b/LocationRinger/res/drawable-ldpi/ic_action_silent.png differ
diff --git a/LocationRinger/res/drawable-ldpi/ic_action_volume.png b/LocationRinger/res/drawable-ldpi/ic_action_volume.png
new file mode 100644
index 0000000..25a7d1a
Binary files /dev/null and b/LocationRinger/res/drawable-ldpi/ic_action_volume.png differ
diff --git a/LocationRinger/res/drawable-ldpi/ic_action_wifi.png b/LocationRinger/res/drawable-ldpi/ic_action_wifi.png
new file mode 100644
index 0000000..b33f382
Binary files /dev/null and b/LocationRinger/res/drawable-ldpi/ic_action_wifi.png differ
diff --git a/LocationRinger/res/drawable-mdpi/ic_action_bluetooth.png b/LocationRinger/res/drawable-mdpi/ic_action_bluetooth.png
new file mode 100644
index 0000000..b7131b2
Binary files /dev/null and b/LocationRinger/res/drawable-mdpi/ic_action_bluetooth.png differ
diff --git a/LocationRinger/res/drawable-mdpi/ic_action_silent.png b/LocationRinger/res/drawable-mdpi/ic_action_silent.png
new file mode 100644
index 0000000..95fea78
Binary files /dev/null and b/LocationRinger/res/drawable-mdpi/ic_action_silent.png differ
diff --git a/LocationRinger/res/drawable-mdpi/ic_action_volume.png b/LocationRinger/res/drawable-mdpi/ic_action_volume.png
new file mode 100644
index 0000000..b2ceaa7
Binary files /dev/null and b/LocationRinger/res/drawable-mdpi/ic_action_volume.png differ
diff --git a/LocationRinger/res/drawable-mdpi/ic_action_wifi.png b/LocationRinger/res/drawable-mdpi/ic_action_wifi.png
new file mode 100644
index 0000000..33ef520
Binary files /dev/null and b/LocationRinger/res/drawable-mdpi/ic_action_wifi.png differ
diff --git a/LocationRinger/res/drawable-xhdpi/ic_action_bluetooth.png b/LocationRinger/res/drawable-xhdpi/ic_action_bluetooth.png
new file mode 100644
index 0000000..ccf7e75
Binary files /dev/null and b/LocationRinger/res/drawable-xhdpi/ic_action_bluetooth.png differ
diff --git a/LocationRinger/res/drawable-xhdpi/ic_action_silent.png b/LocationRinger/res/drawable-xhdpi/ic_action_silent.png
new file mode 100644
index 0000000..51d51ed
Binary files /dev/null and b/LocationRinger/res/drawable-xhdpi/ic_action_silent.png differ
diff --git a/LocationRinger/res/drawable-xhdpi/ic_action_volume.png b/LocationRinger/res/drawable-xhdpi/ic_action_volume.png
new file mode 100644
index 0000000..3f9cefc
Binary files /dev/null and b/LocationRinger/res/drawable-xhdpi/ic_action_volume.png differ
diff --git a/LocationRinger/res/drawable-xhdpi/ic_action_wifi.png b/LocationRinger/res/drawable-xhdpi/ic_action_wifi.png
new file mode 100644
index 0000000..2708172
Binary files /dev/null and b/LocationRinger/res/drawable-xhdpi/ic_action_wifi.png differ
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java
index fc9202b..810df61 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java
@@ -105,11 +105,11 @@ public class FeatureListFragment extends BaseFragmentListFragment implements OnC
 				mAdded.add(KEY_ADDED_MUSIC_VOLUME);
 				break;
 			case KEY_ADDED_BT:
-				f = new ToggleButtonFragment(android.R.drawable.stat_sys_data_bluetooth, this.getString(R.string.bluetooth), RingerDatabase.KEY_BT, this.mInfo, this.mListener, this, KEY_ADDED_BT);
+				f = new ToggleButtonFragment(R.drawable.ic_action_bluetooth, this.getString(R.string.bluetooth), RingerDatabase.KEY_BT, this.mInfo, this.mListener, this, KEY_ADDED_BT);
 				mAdded.add(KEY_ADDED_BT);
 				break;
 			case KEY_ADDED_WIFI:
-				f = new ToggleButtonFragment(android.R.drawable.stat_sys_data_bluetooth, this.getString(R.string.wifi), RingerDatabase.KEY_WIFI, this.mInfo, this.mListener, this, KEY_ADDED_WIFI);
+				f = new ToggleButtonFragment(R.drawable.ic_action_wifi, this.getString(R.string.wifi), RingerDatabase.KEY_WIFI, this.mInfo, this.mListener, this, KEY_ADDED_WIFI);
 				mAdded.add(KEY_ADDED_WIFI);
 				break;
 				
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java
index 6d1c376..1a42940 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java
@@ -118,7 +118,7 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList
 	 * @author ricky barrette
 	 */
 	private void notifyVolumeChanged(int progress) {
-		setIcon(progress == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
+		setIcon(progress == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
 		if(this.mChangedListener != null){
 			final ContentValues info = new ContentValues();
 			info.put(this.mKeyVolume, progress);
@@ -180,7 +180,7 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList
 		final TextView label = (TextView) view.findViewById(R.id.title);
 		label.setText(mLabel);
 		
-		setIcon(android.R.drawable.ic_lock_silent_mode_off);
+		setIcon(R.drawable.ic_action_volume);
 		
 		this.mRingtone = (EditText) view.findViewById(R.id.ringtone);
 		mVolume = (SeekBar) view.findViewById(R.id.ringtone_volume);
@@ -223,7 +223,7 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList
 			mVolume.setProgress(0);
 		}
 		
-		setIcon(mVolume.getProgress() == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
+		setIcon(mVolume.getProgress() == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
 		
 		mVolume.setOnSeekBarChangeListener(this);
 		return view;
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/VolumeFragment.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/VolumeFragment.java
index 9fecdbe..d1661c1 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/VolumeFragment.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/VolumeFragment.java
@@ -127,7 +127,7 @@ public class VolumeFragment extends BaseFeatureFragment implements OnSeekBarChan
 		else
 			notifyListener(this.mAudioManager.getStreamVolume(mStream));
 		
-		setIcon(volume.getProgress() == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
+		setIcon(volume.getProgress() == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
 		return view;
 	}
 
@@ -135,7 +135,7 @@ public class VolumeFragment extends BaseFeatureFragment implements OnSeekBarChan
 	public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
 		if(fromUser){
 			notifyListener(progress);
-			setIcon(progress == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
+			setIcon(progress == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
 		}
 	}