diff --git a/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java b/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java
index 343476686..23ac065d4 100644
--- a/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java
+++ b/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java
@@ -2,23 +2,24 @@ package org.briarproject.android.util;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 public class CommonLayoutParams {
 
-	public static final LinearLayout.LayoutParams MATCH_MATCH =
-			new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
+	public static final ViewGroup.LayoutParams MATCH_MATCH =
+			new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT);
 
-	public static final LinearLayout.LayoutParams MATCH_WRAP =
-			new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+	public static final ViewGroup.LayoutParams MATCH_WRAP =
+			new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+
+	public static final ViewGroup.LayoutParams WRAP_WRAP =
+			new ViewGroup.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
 
 	public static final LinearLayout.LayoutParams MATCH_WRAP_1 =
 			new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 1);
 
-	public static final LinearLayout.LayoutParams WRAP_WRAP =
-			new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
-
 	public static final LinearLayout.LayoutParams WRAP_WRAP_1 =
 			new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1);
 
diff --git a/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java b/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
index 7a3bb9ee7..da923d84b 100644
--- a/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
+++ b/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
@@ -3,7 +3,7 @@ package org.briarproject.android.util;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import android.content.Context;
 import android.view.View;
-import android.widget.LinearLayout.LayoutParams;
+import android.view.ViewGroup.LayoutParams;
 
 public class FixedVerticalSpace extends View {
 
diff --git a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java b/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
index 6911e371e..65be8b379 100644
--- a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
+++ b/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
@@ -6,7 +6,7 @@ import org.briarproject.R;
 
 import android.content.Context;
 import android.view.View;
-import android.widget.LinearLayout.LayoutParams;
+import android.view.ViewGroup.LayoutParams;
 
 public class HorizontalBorder extends View {