diff --git a/core/res/values-land/dimens.xml b/core/res/values-land/dimens.xml
index bbe37d8d..7911c3f0 100644
--- a/core/res/values-land/dimens.xml
+++ b/core/res/values-land/dimens.xml
@@ -24,6 +24,6 @@
 	<dimen name="ui_serverstatus_bignumber">19sp</dimen>
 	<dimen name="ui_serverstatus_sign">12dp</dimen>
 	<dimen name="ui_serverstatus_smallnumber">12dp</dimen>
-	<dimen name="ui_serverstatus_width">53dp</dimen>
+	<dimen name="ui_serverstatus_width">56dp</dimen>
 	
 </resources>
diff --git a/core/res/values-sw600dp/dimens.xml b/core/res/values-sw600dp/dimens.xml
index 95eab8d8..fdf0ec32 100644
--- a/core/res/values-sw600dp/dimens.xml
+++ b/core/res/values-sw600dp/dimens.xml
@@ -33,7 +33,7 @@
 	<dimen name="ui_serverstatus_bignumber">25sp</dimen>
 	<dimen name="ui_serverstatus_sign">17dp</dimen>
 	<dimen name="ui_serverstatus_smallnumber">14dp</dimen>
-	<dimen name="ui_serverstatus_width">63dp</dimen>
+	<dimen name="ui_serverstatus_width">67dp</dimen>
 	
 	<!-- Widget configuration -->
 	<integer name="widget_config_orientation">0</integer>
diff --git a/core/res/values/dimens.xml b/core/res/values/dimens.xml
index 64129c14..18faa95a 100644
--- a/core/res/values/dimens.xml
+++ b/core/res/values/dimens.xml
@@ -39,7 +39,7 @@
 	<dimen name="ui_serverstatus_bignumber">21sp</dimen>
 	<dimen name="ui_serverstatus_sign">15dp</dimen>
 	<dimen name="ui_serverstatus_smallnumber">13dp</dimen>
-	<dimen name="ui_serverstatus_width">53dp</dimen>
+	<dimen name="ui_serverstatus_width">56dp</dimen>
 	
 	<!-- Widget configuration -->
 	<integer name="widget_config_orientation">1</integer>
diff --git a/core/res/xml/pref_seedbox_xirvikshared.xml b/core/res/xml/pref_seedbox_xirvikshared.xml
index ec59651b..19e629a7 100644
--- a/core/res/xml/pref_seedbox_xirvikshared.xml
+++ b/core/res/xml/pref_seedbox_xirvikshared.xml
@@ -18,21 +18,21 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
 	<EditTextPreference
-		android:key="seedbox_xirviksemi_name"
+		android:key="seedbox_xirvikshared_name"
 		android:title="@string/pref_name"
 		android:summary="@string/pref_name_optional"
 		android:inputType="textNoSuggestions" />
 	<EditTextPreference
-		android:key="seedbox_xirviksemi_server"
+		android:key="seedbox_xirvikshared_server"
 		android:title="@string/pref_seedbox_server"
 		android:summary="@string/pref_seedbox_xirvikhint2"
 		android:inputType="textUri" />
 	<EditTextPreference
-		android:key="seedbox_xirviksemi_user"
+		android:key="seedbox_xirvikshared_user"
 		android:title="@string/pref_user"
 		android:inputType="textNoSuggestions" />
 	<EditTextPreference
-		android:key="seedbox_xirviksemi_pass"
+		android:key="seedbox_xirvikshared_pass"
 		android:title="@string/pref_pass"
 		android:inputType="textPassword" />
 
diff --git a/core/src/org/transdroid/core/gui/settings/ServerSettingsActivity.java b/core/src/org/transdroid/core/gui/settings/ServerSettingsActivity.java
index 304c90fd..624f0724 100644
--- a/core/src/org/transdroid/core/gui/settings/ServerSettingsActivity.java
+++ b/core/src/org/transdroid/core/gui/settings/ServerSettingsActivity.java
@@ -49,7 +49,7 @@ public class ServerSettingsActivity extends KeyBoundPreferencesActivity {
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		
 		// Load the raw preferences to show in this screen
-		init(R.xml.pref_server, ApplicationSettings_.getInstance_(this).getMaxOfAllServers());
+		init(R.xml.pref_server, ApplicationSettings_.getInstance_(this).getMaxNormalServer());
 		initTextPreference("server_name");
 		initListPreference("server_type");
 		initTextPreference("server_address");
diff --git a/full/AndroidManifest.xml b/full/AndroidManifest.xml
index 4d3626b2..6e03a90e 100644
--- a/full/AndroidManifest.xml
+++ b/full/AndroidManifest.xml
@@ -195,7 +195,7 @@
 		<!-- Seedbox settings -->
 		<activity android:name="org.transdroid.core.seedbox.SeedstuffSettingsActivity_" />
 		<activity android:name="org.transdroid.core.seedbox.XirvikSharedSettingsActivity_" />
-		<activity android:name="org.transdroid.core.seedbox.XirvikSemiDediSettingsActivity_" />
+		<activity android:name="org.transdroid.core.seedbox.XirvikSemiSettingsActivity_" />
 		<activity android:name="org.transdroid.core.seedbox.XirvikDediSettingsActivity_" />
 		
 		<!-- Search -->
diff --git a/lite/AndroidManifest.xml b/lite/AndroidManifest.xml
index 01aeb35a..05b65f10 100644
--- a/lite/AndroidManifest.xml
+++ b/lite/AndroidManifest.xml
@@ -186,7 +186,7 @@
 		<!-- Seedbox settings -->
 		<activity android:name="org.transdroid.core.seedbox.SeedstuffSettingsActivity_" />
 		<activity android:name="org.transdroid.core.seedbox.XirvikSharedSettingsActivity_" />
-		<activity android:name="org.transdroid.core.seedbox.XirvikSemiDediSettingsActivity_" />
+		<activity android:name="org.transdroid.core.seedbox.XirvikSemiSettingsActivity_" />
 		<activity android:name="org.transdroid.core.seedbox.XirvikDediSettingsActivity_" />
 		
 		<!-- Background service -->