diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png
index 857fb7a..8ac0c4e 100644
--- a/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png
+++ b/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png
index 438e392..8ded17a 100644
--- a/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png
+++ b/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png
deleted file mode 100644
index fab8ee4..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png
index 547e505..330bb9f 100644
--- a/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png
+++ b/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png
index 96eacae..f3206bf 100644
--- a/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png
+++ b/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png
deleted file mode 100644
index 67a86f5..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png
index da077e6..13fc36f 100644
--- a/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png
+++ b/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png
index b18c859..822151e 100644
--- a/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png
+++ b/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png
deleted file mode 100644
index aa5ebe4..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png
index 696f53a..b2d6cf7 100644
--- a/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png
+++ b/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png
index 069df33..d217663 100644
--- a/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png
+++ b/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png
deleted file mode 100644
index d7d797b..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-xhdpi/btn_arrow_left_default.png
new file mode 100644
index 0000000..7197506
--- /dev/null
+++ b/fmapp2/res/drawable-xhdpi/btn_arrow_left_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-xhdpi/btn_arrow_left_press.png
new file mode 100644
index 0000000..607547b
--- /dev/null
+++ b/fmapp2/res/drawable-xhdpi/btn_arrow_left_press.png
Binary files differ
diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-xhdpi/btn_arrow_right_default.png
new file mode 100644
index 0000000..3d14eb3
--- /dev/null
+++ b/fmapp2/res/drawable-xhdpi/btn_arrow_right_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-xhdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-xhdpi/btn_arrow_right_press.png
new file mode 100644
index 0000000..1b476da
--- /dev/null
+++ b/fmapp2/res/drawable-xhdpi/btn_arrow_right_press.png
Binary files differ
diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_default.png
new file mode 100644
index 0000000..a5048bc
--- /dev/null
+++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_press.png
new file mode 100644
index 0000000..17992ea
--- /dev/null
+++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_left_press.png
Binary files differ
diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_default.png
new file mode 100644
index 0000000..44162e8
--- /dev/null
+++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_default.png
Binary files differ
diff --git a/fmapp2/res/drawable-xxhdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_press.png
new file mode 100644
index 0000000..a664e5d
--- /dev/null
+++ b/fmapp2/res/drawable-xxhdpi/btn_arrow_right_press.png
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_left.xml b/fmapp2/res/drawable/btn_arrow_left.xml
index e64966c..ea850c4 100644
--- a/fmapp2/res/drawable/btn_arrow_left.xml
+++ b/fmapp2/res/drawable/btn_arrow_left.xml
@@ -31,9 +31,6 @@
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_arrow_left_press" />
 
-    <item android:state_window_focused="true" android:state_focused="true"
-        android:drawable="@drawable/btn_arrow_left_selected" />
-
     <item
         android:drawable="@drawable/btn_arrow_left_default" />
 
diff --git a/fmapp2/res/drawable/btn_arrow_left_default.png b/fmapp2/res/drawable/btn_arrow_left_default.png
deleted file mode 100644
index 2a35952..0000000
--- a/fmapp2/res/drawable/btn_arrow_left_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_left_press.png b/fmapp2/res/drawable/btn_arrow_left_press.png
deleted file mode 100644
index 8b72f0a..0000000
--- a/fmapp2/res/drawable/btn_arrow_left_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_left_selected.png b/fmapp2/res/drawable/btn_arrow_left_selected.png
deleted file mode 100644
index 6cd3c9f..0000000
--- a/fmapp2/res/drawable/btn_arrow_left_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_right.xml b/fmapp2/res/drawable/btn_arrow_right.xml
index e4ab6f9..11c8a3c 100644
--- a/fmapp2/res/drawable/btn_arrow_right.xml
+++ b/fmapp2/res/drawable/btn_arrow_right.xml
@@ -32,9 +32,6 @@
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_arrow_right_press" />
 
-    <item android:state_window_focused="true" android:state_focused="true"
-        android:drawable="@drawable/btn_arrow_right_selected" />
-
     <item
         android:drawable="@drawable/btn_arrow_right_default" />
 
diff --git a/fmapp2/res/drawable/btn_arrow_right_default.png b/fmapp2/res/drawable/btn_arrow_right_default.png
deleted file mode 100644
index ae6fd53..0000000
--- a/fmapp2/res/drawable/btn_arrow_right_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_right_press.png b/fmapp2/res/drawable/btn_arrow_right_press.png
deleted file mode 100644
index a4ae45b..0000000
--- a/fmapp2/res/drawable/btn_arrow_right_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_right_selected.png b/fmapp2/res/drawable/btn_arrow_right_selected.png
deleted file mode 100644
index 93bcc77..0000000
--- a/fmapp2/res/drawable/btn_arrow_right_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/layout/station_info.xml b/fmapp2/res/layout/station_info.xml
index 404c6c8..4d75816 100644
--- a/fmapp2/res/layout/station_info.xml
+++ b/fmapp2/res/layout/station_info.xml
@@ -90,8 +90,8 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:paddingLeft="15dp"
+                 android:layout_centerVertical="true"
                  android:layout_alignParentLeft="true"
-                 android:visibility="gone"
                  android:layout_alignWithParentIfMissing="true"
                  android:src="@drawable/btn_arrow_left"/>
 
@@ -101,8 +101,8 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:paddingRight="15dp"
+                 android:layout_centerVertical="true"
                  android:layout_alignParentRight="true"
-                 android:visibility="gone"
                  android:layout_alignWithParentIfMissing="true"
                  android:src="@drawable/btn_arrow_right"/>
 
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index ac0ba6c..5c0601b 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -388,13 +388,11 @@
       mForwardButton = (ImageView)findViewById(R.id.btn_forward);
       if (mForwardButton != null) {
           mForwardButton.setOnClickListener(mForwardClickListener);
-          mForwardButton.setOnLongClickListener(mForwardLongClickListener);
       }
 
       mBackButton = (ImageView)findViewById(R.id.btn_back);
       if (mBackButton != null) {
           mBackButton.setOnClickListener(mBackClickListener);
-          mBackButton.setOnLongClickListener(mBackLongClickListener);
       }
 
       /* 6 Preset Buttons */
@@ -1392,35 +1390,15 @@
    private View.OnClickListener mForwardClickListener =
       new View.OnClickListener() {
         public void onClick(View v) {
-          int frequency = FmSharedPreferences.getNextTuneFrequency();
-          Log.d(LOGTAG, "Tune Up: to " + frequency);
-          tuneRadio(frequency);
+          SeekNextStation();
       }
    };
 
    private View.OnClickListener mBackClickListener =
       new View.OnClickListener() {
         public void onClick(View v) {
-          int frequency = FmSharedPreferences.getPrevTuneFrequency();
-          Log.d(LOGTAG, "Tune Down: to " + frequency);
-          tuneRadio(frequency);
-      }
-   };
-
-   private View.OnLongClickListener mForwardLongClickListener =
-      new View.OnLongClickListener() {
-        public boolean onLongClick(View view) {
-          SeekNextStation();
-          return true;
-        }
-   };
-
-   private View.OnLongClickListener mBackLongClickListener =
-      new View.OnLongClickListener() {
-        public boolean onLongClick(View view) {
           SeekPreviousStation();
-          return true;
-        }
+      }
    };
 
    private View.OnClickListener mPresetsPageClickListener =
@@ -1919,11 +1897,11 @@
              }
          }
       }
-      if (false && mForwardButton != null) {
+      if (mForwardButton != null) {
           mForwardButton.setVisibility(((bEnable == true) ? View.VISIBLE
                                         : View.INVISIBLE));
       }
-      if (false && mBackButton != null) {
+      if (mBackButton != null) {
          mBackButton.setVisibility(((bEnable == true) ? View.VISIBLE
                                         : View.INVISIBLE));
       }