diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
index 6710778d5..e8612ed5c 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
@@ -61,7 +61,6 @@
 import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.vpn.TorifiedApp;
 import org.torproject.android.service.vpn.VpnConstants;
 import org.torproject.android.service.vpn.VpnPrefs;
@@ -124,7 +123,7 @@ public class MiniMainActivity extends AppCompatActivity
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        mPrefs = Prefs.getSharedPrefs(getApplicationContext());
 
         /* Create the widgets before registering for broadcasts to guarantee
          * that the widgets exist when the status updates try to update them */
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
index a8488e3d3..a731ef298 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
@@ -13,7 +13,7 @@
 import android.widget.Switch;
 import org.torproject.android.mini.R;
 import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.vpn.TorifiedApp;
 
 import static org.torproject.android.mini.MiniMainActivity.getApp;
@@ -40,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         final String pkgId = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
 
-        mPrefs =  TorServiceUtils.getSharedPrefs(getApplicationContext());
+        mPrefs =  Prefs.getSharedPrefs(getApplicationContext());
 
         ApplicationInfo aInfo = null;
         try {
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
index 27425bcee..489aba4c1 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
@@ -28,7 +28,7 @@
 import android.widget.TextView;
 import org.torproject.android.mini.R;
 import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.vpn.TorifiedApp;
 
 import java.util.ArrayList;
@@ -63,7 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onResume() {
         super.onResume();
-        mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        mPrefs = Prefs.getSharedPrefs(getApplicationContext());
         reloadApps();
     }
 
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 82a0cef91..947f3a76a 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -57,7 +57,6 @@
 import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.vpn.VpnConstants;
 import org.torproject.android.service.vpn.VpnPrefs;
 import org.torproject.android.settings.Languages;
@@ -167,7 +166,7 @@ private void migratePreferences() {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        mPrefs = Prefs.getSharedPrefs(getApplicationContext());
 
         migratePreferences(); // Migrate old preferences
 
diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index d5ea6f8e9..111dda5fc 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -29,7 +29,7 @@
 import android.widget.TextView;
 import org.torproject.android.R;
 import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.vpn.TorifiedApp;
 
 import java.util.ArrayList;
@@ -65,7 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onResume() {
         super.onResume();
-        mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        mPrefs = Prefs.getSharedPrefs(getApplicationContext());
         reloadApps();
     }
 
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 96dedfd82..f8137632e 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -610,7 +610,7 @@ public void startTransportSync(TransportListener transportListener) {
 
     private boolean torUpgradeAndConfig() throws IOException, TimeoutException {
 
-        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
         String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null);
 
         logNotice("checking binary version: " + version);
@@ -638,7 +638,7 @@ private boolean torUpgradeAndConfig() throws IOException, TimeoutException {
 
     private File updateTorrcCustomFile () throws IOException, TimeoutException
     {
-        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
 
         StringBuffer extraLines = new StringBuffer();
 
@@ -838,7 +838,7 @@ private void startTor() {
 	        // make sure there are no stray daemons running
 	        killAllDaemons();
 
-            SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+            SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
             String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null);
             logNotice("checking binary version: " + version);
 
@@ -1152,7 +1152,7 @@ private int getControlPort ()
                 bufferedReader.close();
 
                 //store last valid control port
-                SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+                SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
                 prefs.edit().putInt("controlport", result).commit();
                 
             }
@@ -1471,7 +1471,7 @@ public void onReceive(Context context, Intent intent) {
         	if (mCurrentStatus == STATUS_OFF)
         		return;
         	
-            SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+            SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
 
             boolean doNetworKSleep = prefs.getBoolean(OrbotConstants.PREF_DISABLE_NETWORK, true);
             
@@ -1530,7 +1530,7 @@ private StringBuffer processSettingsImpl (StringBuffer extraLines) throws IOExce
     {
         logNotice(getString(R.string.updating_settings_in_tor_service));
         
-        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
         
         boolean useBridges = Prefs.bridgesEnabled();
 
@@ -1897,7 +1897,7 @@ private void handleIntent( Intent intent ) {
     
     private void setExitNode (String newExits)
     {
-    	SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+    	SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
         
     	if (TextUtils.isEmpty(newExits))
     	{
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
index 7b5f132b5..9b6ab825a 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -3,6 +3,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import org.torproject.android.service.OrbotConstants;
 
 import java.util.Locale;
 
@@ -24,7 +25,7 @@ public class Prefs {
 
     public static void setContext(Context context) {
         if (prefs == null)
-            prefs = TorServiceUtils.getSharedPrefs(context);
+            prefs = getSharedPrefs(context);
     }
 
     private static void putBoolean(String key, boolean value) {
@@ -109,4 +110,8 @@ public static void setExitNodes (String exits)
     {
     	putString(PREF_EXIT_NODES,exits);
     }
+
+    public static SharedPreferences getSharedPrefs (Context context) {
+        return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS);
+    }
 }
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
index e9e885908..018d7e427 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
@@ -13,10 +13,6 @@
 
 public class TorServiceUtils implements TorServiceConstants {
 
-	public static SharedPreferences getSharedPrefs (Context context) {
-		return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS);
-	}
-
     public static boolean isPortOpen(final String ip, final int port, final int timeout) {
         try {
             Socket socket = new Socket();