diff --git a/app/src/main/res/drawable-hdpi/compass_icon.png b/app/src/main/res/drawable-hdpi/compass_icon.png
new file mode 100644
index 000000000..985d88e6f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/compass_icon.png differ
diff --git a/app/src/main/res/drawable-ldpi/compass_icon.png b/app/src/main/res/drawable-ldpi/compass_icon.png
new file mode 100644
index 000000000..1f3c4662e
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/compass_icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/compass_icon.png b/app/src/main/res/drawable-mdpi/compass_icon.png
new file mode 100644
index 000000000..b8a0d05e1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/compass_icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/compass_icon.png b/app/src/main/res/drawable-xhdpi/compass_icon.png
new file mode 100644
index 000000000..44cbd3d02
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/compass_icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/compass_icon.png b/app/src/main/res/drawable-xxhdpi/compass_icon.png
new file mode 100644
index 000000000..bd2de3294
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/compass_icon.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/compass_icon.png b/app/src/main/res/drawable-xxxhdpi/compass_icon.png
new file mode 100644
index 000000000..fbe46d8d9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/compass_icon.png differ
diff --git a/app/src/main/res/drawable/compass_svg.png b/app/src/main/res/drawable/compass_svg.png
deleted file mode 100644
index b1512ae68..000000000
Binary files a/app/src/main/res/drawable/compass_svg.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_compass.xml b/app/src/main/res/layout/activity_compass.xml
index 006406c54..f14bdf39d 100644
--- a/app/src/main/res/layout/activity_compass.xml
+++ b/app/src/main/res/layout/activity_compass.xml
@@ -8,44 +8,42 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <android.support.v7.widget.CardView
                 android:id="@+id/compass_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/card_margin"
-                android:layout_marginLeft="@dimen/card_margin"
-                android:layout_marginTop="@dimen/card_margin"
-                android:layout_marginEnd="@dimen/card_margin"
-                android:layout_marginRight="@dimen/card_margin">
+                android:layout_margin="@dimen/card_margin">
 
-                <RelativeLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:orientation="vertical"
                     android:paddingBottom="@dimen/card_margin">
 
                     <ImageView
                         android:id="@+id/compass"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:src="@drawable/compass_svg" />
+                        android:layout_width="match_parent"
+                        android:layout_height="300dp"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/compass_margin"
+                        android:src="@drawable/compass_icon" />
 
                     <TextView
                         android:id="@+id/degree_indicator"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_below="@+id/compass"
-                        android:layout_centerHorizontal="true"
+                        android:layout_gravity="center_horizontal"
                         android:layout_marginTop="@dimen/card_margin"
                         android:text="@string/compass_test_value"
                         android:textAlignment="center"
                         android:textSize="@dimen/compass_text_size_large" />
 
-                </RelativeLayout>
+                </LinearLayout>
 
             </android.support.v7.widget.CardView>
 
@@ -53,12 +51,7 @@
                 android:id="@+id/card_compass_raw_values"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/compass_card"
-                android:layout_marginStart="@dimen/card_margin"
-                android:layout_marginLeft="@dimen/card_margin"
-                android:layout_marginTop="@dimen/card_margin"
-                android:layout_marginEnd="@dimen/card_margin"
-                android:layout_marginRight="@dimen/card_margin">
+                android:layout_margin="@dimen/card_margin">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -76,9 +69,8 @@
                             android:layout_width="@dimen/dimen_zero_dp"
                             android:layout_height="@dimen/compass_tv_height"
                             android:layout_weight="1"
-                            android:gravity="center_vertical"
+                            android:gravity="center"
                             android:text="@string/bx"
-                            android:textAlignment="center"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sensor_body_font" />
 
@@ -86,9 +78,8 @@
                             android:layout_width="@dimen/dimen_zero_dp"
                             android:layout_height="@dimen/compass_tv_height"
                             android:layout_weight="1"
-                            android:gravity="center_vertical"
+                            android:gravity="center"
                             android:text="@string/by"
-                            android:textAlignment="center"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sensor_body_font" />
 
@@ -96,9 +87,8 @@
                             android:layout_width="@dimen/dimen_zero_dp"
                             android:layout_height="@dimen/compass_tv_height"
                             android:layout_weight="1"
-                            android:gravity="center_vertical"
+                            android:gravity="center"
                             android:text="@string/bz"
-                            android:textAlignment="center"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sensor_body_font" />
 
@@ -114,14 +104,10 @@
                             android:id="@+id/tv_sensor_hmc5883l_bx"
                             android:layout_width="@dimen/dimen_zero_dp"
                             android:layout_height="@dimen/compass_tv_height"
-                            android:layout_marginStart="@dimen/compass_tv_value_margin"
-                            android:layout_marginLeft="@dimen/compass_tv_value_margin"
-                            android:layout_marginEnd="@dimen/compass_tv_value_margin"
-                            android:layout_marginRight="@dimen/compass_tv_value_margin"
+                            android:layout_margin="@dimen/compass_tv_value_margin"
                             android:layout_weight="1"
                             android:background="@drawable/tv_border"
-                            android:gravity="center_vertical"
-                            android:textAlignment="center"
+                            android:gravity="center"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sensor_body_font" />
 
@@ -129,14 +115,10 @@
                             android:id="@+id/tv_sensor_hmc5883l_by"
                             android:layout_width="@dimen/dimen_zero_dp"
                             android:layout_height="@dimen/compass_tv_height"
-                            android:layout_marginStart="@dimen/compass_tv_value_margin"
-                            android:layout_marginLeft="@dimen/compass_tv_value_margin"
-                            android:layout_marginEnd="@dimen/compass_tv_value_margin"
-                            android:layout_marginRight="@dimen/compass_tv_value_margin"
+                            android:layout_margin="@dimen/compass_tv_value_margin"
                             android:layout_weight="1"
                             android:background="@drawable/tv_border"
-                            android:gravity="center_vertical"
-                            android:textAlignment="center"
+                            android:gravity="center"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sensor_body_font" />
 
@@ -144,14 +126,10 @@
                             android:id="@+id/tv_sensor_hmc5883l_bz"
                             android:layout_width="@dimen/dimen_zero_dp"
                             android:layout_height="@dimen/compass_tv_height"
-                            android:layout_marginStart="@dimen/compass_tv_value_margin"
-                            android:layout_marginLeft="@dimen/compass_tv_value_margin"
-                            android:layout_marginEnd="@dimen/compass_tv_value_margin"
-                            android:layout_marginRight="@dimen/compass_tv_value_margin"
+                            android:layout_margin="@dimen/compass_tv_value_margin"
                             android:layout_weight="1"
                             android:background="@drawable/tv_border"
-                            android:gravity="center_vertical"
-                            android:textAlignment="center"
+                            android:gravity="center"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sensor_body_font" />
 
@@ -165,35 +143,25 @@
                 android:id="@+id/card_select_axes"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/card_compass_raw_values"
-                android:layout_marginStart="@dimen/card_margin"
-                android:layout_marginLeft="@dimen/card_margin"
-                android:layout_marginTop="@dimen/card_margin"
-                android:layout_marginEnd="@dimen/card_margin"
-                android:layout_marginRight="@dimen/card_margin"
-                android:layout_marginBottom="@dimen/header_padding_top">
-
-                <RelativeLayout
+                android:layout_margin="@dimen/card_margin">
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/card_margin"
-                    android:layout_marginLeft="@dimen/card_margin"
-                    android:layout_marginTop="@dimen/card_margin"
-                    android:layout_marginBottom="@dimen/card_margin">
+                    android:layout_margin="@dimen/margin_10dp"
+                    android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/tv_select_axes"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/compass_padding"
-                        android:layout_marginLeft="@dimen/compass_padding"
+                        android:layout_marginBottom="@dimen/margin_10dp"
                         android:text="@string/text_parallel_axes"
                         android:textSize="@dimen/compass_select_axes_text_size" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/tv_select_axes"
                         android:orientation="horizontal">
 
                         <RadioButton
@@ -218,11 +186,11 @@
                             android:text="@string/z_axis" />
                     </LinearLayout>
 
-                </RelativeLayout>
+                </LinearLayout>
 
             </android.support.v7.widget.CardView>
 
-        </RelativeLayout>
+        </LinearLayout>
 
     </ScrollView>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a872d92b9..f9944f8c4 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -271,7 +271,7 @@
 
     <dimen name="compass_padding">4dp</dimen>
     <dimen name="compass_tv_height">30dp</dimen>
-    <dimen name="compass_tv_value_margin">20dp</dimen>
+    <dimen name="compass_tv_value_margin">8dp</dimen>
     <dimen name="compass_select_axes_text_size">18sp</dimen>
     <dimen name="compass_text_size_large">25sp</dimen>
     <dimen name="compass_space_top">120dp</dimen>
@@ -397,10 +397,15 @@
     <dimen name="sound_guage_font_size">8sp</dimen>
     <dimen name="sound_sensor_label_title_size">16sp</dimen>
     <dimen name="sound_width_0">0dp</dimen>
+
+    <dimen name="compass_margin">15dp</dimen>
+    <dimen name="margin_10dp">10dp</dimen>
+
     <dimen name="sensor_control_dock_image_button_width">60dp</dimen>
     <dimen name="margin_50dp">50dp</dimen>
     <dimen name="margin_5dp">5dp</dimen>
     <dimen name="text_size_8sp">8sp</dimen>
     <dimen name="sensor_image_height">90dp</dimen>
     <dimen name="text_size_9sp">9sp</dimen>
+
 </resources>