diff --git a/app/src/main/java/org/linphone/settings/CallSettingsFragment.java b/app/src/main/java/org/linphone/settings/CallSettingsFragment.java
index fb6172151..a973c727d 100644
--- a/app/src/main/java/org/linphone/settings/CallSettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/CallSettingsFragment.java
@@ -142,7 +142,8 @@ public class CallSettingsFragment extends Fragment {
                     @Override
                     public void onBoolValueChanged(boolean newValue) {
                         mPrefs.enableAutoAnswer(newValue);
-                        mAutoAnswerTime.setEnabled(mPrefs.isAutoAnswerEnabled());
+                        mAutoAnswerTime.setVisibility(
+                                mPrefs.isAutoAnswerEnabled() ? View.VISIBLE : View.GONE);
                     }
                 });
 
@@ -206,7 +207,7 @@ public class CallSettingsFragment extends Fragment {
         mMediaEncryption.setValue(mPrefs.getMediaEncryption().toInt());
 
         mAutoAnswerTime.setValue(mPrefs.getAutoAnswerTime());
-        mAutoAnswerTime.setEnabled(mPrefs.isAutoAnswerEnabled());
+        mAutoAnswerTime.setVisibility(mPrefs.isAutoAnswerEnabled() ? View.VISIBLE : View.GONE);
 
         mIncomingCallTimeout.setValue(mPrefs.getIncTimeout());
 
diff --git a/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java b/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java
index 11ac05459..16489460c 100644
--- a/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java
@@ -137,7 +137,8 @@ public class NetworkSettingsFragment extends Fragment {
                     @Override
                     public void onBoolValueChanged(boolean newValue) {
                         mPrefs.useRandomPort(newValue);
-                        mSipPort.setEnabled(!mPrefs.isUsingRandomPort());
+                        mSipPort.setVisibility(
+                                mPrefs.isUsingRandomPort() ? View.GONE : View.VISIBLE);
                     }
                 });
 
@@ -236,7 +237,7 @@ public class NetworkSettingsFragment extends Fragment {
         mTurn.setEnabled(mPrefs.getStunServer() != null && !mPrefs.getStunServer().isEmpty());
 
         mSipPort.setValue(mPrefs.getSipPort());
-        mSipPort.setEnabled(!mPrefs.isUsingRandomPort());
+        mSipPort.setVisibility(mPrefs.isUsingRandomPort() ? View.GONE : View.VISIBLE);
 
         mStunServer.setValue(mPrefs.getStunServer());
 
diff --git a/app/src/main/java/org/linphone/settings/VideoSettingsFragment.java b/app/src/main/java/org/linphone/settings/VideoSettingsFragment.java
index a37e2ca1a..3cba62a4c 100644
--- a/app/src/main/java/org/linphone/settings/VideoSettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/VideoSettingsFragment.java
@@ -147,8 +147,9 @@ public class VideoSettingsFragment extends Fragment {
                     @Override
                     public void onListValueChanged(int position, String newLabel, String newValue) {
                         mPrefs.setVideoPreset(newValue);
-                        mFps.setEnabled(newValue.equals("custom"));
-                        mBandwidth.setEnabled(newValue.equals("custom"));
+                        mFps.setVisibility(newValue.equals("custom") ? View.VISIBLE : View.GONE);
+                        mBandwidth.setVisibility(
+                                newValue.equals("custom") ? View.VISIBLE : View.GONE);
                     }
                 });
 
@@ -196,14 +197,15 @@ public class VideoSettingsFragment extends Fragment {
         mOverlay.setChecked(mPrefs.isOverlayEnabled());
 
         mBandwidth.setValue(mPrefs.getBandwidthLimit());
-        mBandwidth.setEnabled(mPrefs.getVideoPreset().equals("custom"));
+        mBandwidth.setVisibility(
+                mPrefs.getVideoPreset().equals("custom") ? View.VISIBLE : View.GONE);
 
         mPreset.setValue(mPrefs.getVideoPreset());
 
         mSize.setValue(mPrefs.getPreferredVideoSize());
 
         mFps.setValue(mPrefs.getPreferredVideoFps());
-        mFps.setEnabled(mPrefs.getVideoPreset().equals("custom"));
+        mFps.setVisibility(mPrefs.getVideoPreset().equals("custom") ? View.VISIBLE : View.GONE);
 
         populateVideoCodecs();
 
diff --git a/app/src/main/res/layout/settings_video.xml b/app/src/main/res/layout/settings_video.xml
index 19d0ca296..166266d47 100644
--- a/app/src/main/res/layout/settings_video.xml
+++ b/app/src/main/res/layout/settings_video.xml
@@ -39,6 +39,12 @@
             linphone:subtitle="@string/pref_overlay_summary"
             linphone:title="@string/pref_overlay" />
 
+        <org.linphone.settings.widget.ListSetting
+            android:id="@+id/pref_preferred_video_size"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            linphone:title="@string/pref_preferred_video_size" />
+
         <org.linphone.settings.widget.ListSetting
             android:id="@+id/pref_video_preset"
             android:layout_width="match_parent"
@@ -47,12 +53,6 @@
             linphone:list_items_values="@array/video_preset_entries"
             linphone:title="@string/pref_video_preset" />
 
-        <org.linphone.settings.widget.ListSetting
-            android:id="@+id/pref_preferred_video_size"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            linphone:title="@string/pref_preferred_video_size" />
-
         <org.linphone.settings.widget.ListSetting
             android:id="@+id/pref_preferred_fps"
             android:layout_width="match_parent"