diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index d4091379b8..f71cf6ed67 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-31  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* res/layout/options.xml,
+	res/drawable/edittext_pandora_default_shape.xml,
+	res/drawable/edittext_pandora_colors_states.xml,
+	res/drawable/edittext_pandora_select_shape.xml,
+	res/values/styles.xml: changed the style of options layout.
+
 2012-10-30  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* res/layout/options.xml, res/values-ja/strings.xml,
diff --git a/extras/pandroid_event_viewer/res/drawable/edittext_pandora_colors_states.xml b/extras/pandroid_event_viewer/res/drawable/edittext_pandora_colors_states.xml
new file mode 100644
index 0000000000..a3dfa4d935
--- /dev/null
+++ b/extras/pandroid_event_viewer/res/drawable/edittext_pandora_colors_states.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- SELECT ALL FORMS -->
+    <item android:state_enabled="true" android:state_focused="true"
+        android:drawable="@drawable/edittext_pandora_select_shape" />
+<!--     <item android:state_enabled="true"
+        android:drawable="@drawable/edittext_pandora_select_shape" /> -->
+    <item android:state_focused="true"
+        android:drawable="@drawable/edittext_pandora_select_shape" />
+    
+    <!-- DEFAULT -->
+    <item
+        android:drawable="@drawable/edittext_pandora_default_shape" />
+</selector>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/drawable/edittext_pandora_default_shape.xml b/extras/pandroid_event_viewer/res/drawable/edittext_pandora_default_shape.xml
new file mode 100644
index 0000000000..de8bae1bbe
--- /dev/null
+++ b/extras/pandroid_event_viewer/res/drawable/edittext_pandora_default_shape.xml
@@ -0,0 +1,10 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <corners android:radius="2dp"   />
+    <solid android:color="#F9F9F9" />
+    <padding android:right="20dp" />
+    <padding android:left="20dp" />
+    <padding android:top="20dp" />
+    <padding android:bottom="20dp" />
+
+</shape>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/drawable/edittext_pandora_select_shape.xml b/extras/pandroid_event_viewer/res/drawable/edittext_pandora_select_shape.xml
new file mode 100644
index 0000000000..6c9d7720e2
--- /dev/null
+++ b/extras/pandroid_event_viewer/res/drawable/edittext_pandora_select_shape.xml
@@ -0,0 +1,12 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <corners android:radius="2dp"   />
+    <stroke android:width="4px"  android:color="#79AD28"/>
+    
+    <solid android:color="#F9F9F9" />
+    <padding android:right="20dp" />
+    <padding android:left="20dp" />
+    <padding android:top="20dp" />
+    <padding android:bottom="20dp" />
+
+</shape>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/layout/options.xml b/extras/pandroid_event_viewer/res/layout/options.xml
index 56dc6dea8f..9a96db9c4c 100644
--- a/extras/pandroid_event_viewer/res/layout/options.xml
+++ b/extras/pandroid_event_viewer/res/layout/options.xml
@@ -58,7 +58,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textWebEditText"
-                    android:singleLine="true" />
+                    android:singleLine="true"
+                    style="@style/options_edittext"/>
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -73,7 +74,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="text"
-                    android:singleLine="true" />
+                    android:singleLine="true"
+                    style="@style/options_edittext" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -88,7 +90,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textPassword"
-                    android:singleLine="true" />
+                    android:singleLine="true"
+                    style="@style/options_edittext" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -103,7 +106,9 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textPassword"
-                    android:singleLine="true" />
+                    android:singleLine="true"
+                    style="@style/options_edittext"
+                    />
                 
                 <TextView
                     android:layout_width="wrap_content"
@@ -138,7 +143,8 @@
 						android:ems="3"
 						android:inputType="number"
 						android:singleLine="true"
-						android:gravity="right" />
+						android:gravity="right"
+						style="@style/options_edittext" />
 					<TextView
 			          android:layout_width="wrap_content"
 			          android:layout_height="wrap_content"
@@ -148,6 +154,28 @@
 			          android:layout_gravity="center_vertical"
 			     	  />
 				</LinearLayout>
+				<LinearLayout
+				    android:layout_width="fill_parent"
+		            android:layout_height="wrap_content"
+		            android:orientation="horizontal"
+				>
+					<TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="left|center_vertical"
+                            android:paddingLeft="2dp"
+                            android:text="@string/enable_background_service"
+                            style="@style/options_label"
+                            android:layout_weight="1"
+                         />
+
+                        <CheckBox
+                            android:id="@+id/background_service_on"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_weight="0" />
+				</LinearLayout>
                 <TableLayout
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -168,23 +196,6 @@
                         />
                     </TableRow>
 
-                    <TableRow android:layout_marginTop="10dp" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="left|center_vertical"
-                            android:paddingLeft="2dp"
-                            android:text="@string/enable_background_service"
-                            style="@style/options_label"
-                         />
-
-                        <CheckBox
-                            android:id="@+id/background_service_on"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center" />
-                    </TableRow>
                 </TableLayout>
             </LinearLayout>
             
@@ -194,7 +205,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="20dp"
-            android:orientation="vertical" >
+            android:orientation="vertical">
+            
 
             <TextView
                 style="@style/options_header"
@@ -202,57 +214,76 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:text="@string/notification" />
-
-            <TableLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_margin="5dp"
-                android:stretchColumns="0,1"
-                android:padding="10dp">
-
-                <TableRow>
-
-                    <TextView
+            
+              <LinearLayout
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:layout_marginBottom="20dp"
+	            android:orientation="vertical"
+	            android:padding="10dp">
+            
+            <LinearLayout
+				    android:layout_width="fill_parent"
+		            android:layout_height="wrap_content"
+		            android:orientation="horizontal"
+				>
+                <TextView
                         android:layout_gravity="center_vertical"
                         android:text="@string/vibration"
-                        style="@style/options_label" />
+                        style="@style/options_label"
+                        android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
 
                     <CheckBox
                         android:id="@+id/vibration_on"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center" />
-                </TableRow>
-
-                <TableRow>
-
+                        android:layout_gravity="center"
+                        android:layout_weight="0" />
+            </LinearLayout>
+            <LinearLayout
+				    android:layout_width="fill_parent"
+		            android:layout_height="wrap_content"
+		            android:orientation="horizontal"
+				>
                     <TextView
+                         android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:text="@string/led_flash"
-                        style="@style/options_label" />
+                        style="@style/options_label"
+                        android:layout_weight="1" />
 
                     <CheckBox
                         android:id="@+id/led_flash_on"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        android:layout_marginRight="63dp" />
-                </TableRow>
-
-                <TableRow>
-
+                        android:layout_weight="0" />
+            </LinearLayout>
+            <LinearLayout
+				    android:layout_width="fill_parent"
+		            android:layout_height="wrap_content"
+		            android:orientation="horizontal"
+				>
                     <TextView
                         android:id="@+id/textView1"
+                          android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:text="@string/sound"
-                        style="@style/options_label" />
+                        style="@style/options_label"
+                        android:layout_weight="1" />
 
                     <Button
                         android:id="@+id/sound_button"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" />
-                </TableRow>
-            </TableLayout>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0" />
+            </LinearLayout>
+
+            
         </LinearLayout>
 
         <LinearLayout
@@ -270,5 +301,6 @@
             android:layout_marginRight="5dp"
             android:text="@string/update_button_str" />
     </LinearLayout>
+    </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/values/styles.xml b/extras/pandroid_event_viewer/res/values/styles.xml
index df07da8935..a9e0f2171e 100644
--- a/extras/pandroid_event_viewer/res/values/styles.xml
+++ b/extras/pandroid_event_viewer/res/values/styles.xml
@@ -36,5 +36,15 @@
         <item name="android:textSize">18dp</item>
         <item name="android:textStyle">bold</item>
     </style>
+    
+    <style name="options_edittext">
+        <item name="android:textColor">#2C2C2C</item>
+        <item name="android:textSize">14dp</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:background">@drawable/edittext_pandora_colors_states</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+    </style>
+
 
 </resources>
\ No newline at end of file