diff --git a/app/src/main/res/layout-land/fragment_remote.xml b/app/src/main/res/layout-land/fragment_remote.xml
index ba03c9a..44a0e4e 100644
--- a/app/src/main/res/layout-land/fragment_remote.xml
+++ b/app/src/main/res/layout-land/fragment_remote.xml
@@ -107,14 +107,6 @@
                 style="@style/Widget.Button.Borderless"
                 android:src="?attr/iconRewind"
                 android:contentDescription="@string/rewind"/>
-            <ImageButton
-                android:id="@+id/stop"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                style="@style/Widget.Button.Borderless"
-                android:src="?attr/iconStop"
-                android:contentDescription="@string/stop"/>
             <ImageButton
                 android:id="@+id/play"
                 android:layout_width="0dp"
@@ -123,6 +115,14 @@
                 style="@style/Widget.Button.Borderless"
                 android:src="?attr/iconPlay"
                 android:contentDescription="@string/play"/>
+            <ImageButton
+                android:id="@+id/stop"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                style="@style/Widget.Button.Borderless"
+                android:src="?attr/iconStop"
+                android:contentDescription="@string/stop"/>
             <ImageButton
                 android:id="@+id/fast_forward"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_now_playing.xml b/app/src/main/res/layout/fragment_now_playing.xml
index 8dbfd4b..e2bbacc 100644
--- a/app/src/main/res/layout/fragment_now_playing.xml
+++ b/app/src/main/res/layout/fragment_now_playing.xml
@@ -136,14 +136,6 @@
                     style="@style/Widget.Button.Borderless"
                     android:src="?attr/iconRewind"
                     android:contentDescription="@string/rewind"/>
-                <ImageButton
-                    android:id="@+id/stop"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/Widget.Button.Borderless"
-                    android:src="?attr/iconStop"
-                    android:contentDescription="@string/stop"/>
                 <ImageButton
                     android:id="@+id/play"
                     android:layout_width="0dp"
@@ -152,6 +144,14 @@
                     style="@style/Widget.Button.Borderless"
                     android:src="?attr/iconPlay"
                     android:contentDescription="@string/play"/>
+                <ImageButton
+                    android:id="@+id/stop"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="match_parent"
+                    style="@style/Widget.Button.Borderless"
+                    android:src="?attr/iconStop"
+                    android:contentDescription="@string/stop"/>
                 <ImageButton
                     android:id="@+id/fast_forward"
                     android:layout_width="0dp"
@@ -328,4 +328,4 @@
 
     <!--<include layout="@layout/bottom_media_bar"/>-->
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_remote.xml b/app/src/main/res/layout/fragment_remote.xml
index 59f575a..d54991e 100644
--- a/app/src/main/res/layout/fragment_remote.xml
+++ b/app/src/main/res/layout/fragment_remote.xml
@@ -59,14 +59,6 @@
                 style="@style/Widget.Button.Borderless"
                 android:src="?attr/iconRewind"
                 android:contentDescription="@string/rewind"/>
-            <ImageButton
-                android:id="@+id/stop"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                style="@style/Widget.Button.Borderless"
-                android:src="?attr/iconStop"
-                android:contentDescription="@string/stop"/>
             <ImageButton
                 android:id="@+id/play"
                 android:layout_width="0dp"
@@ -75,6 +67,14 @@
                 style="@style/Widget.Button.Borderless"
                 android:src="?attr/iconPlay"
                 android:contentDescription="@string/play"/>
+            <ImageButton
+                android:id="@+id/stop"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                style="@style/Widget.Button.Borderless"
+                android:src="?attr/iconStop"
+                android:contentDescription="@string/stop"/>
             <ImageButton
                 android:id="@+id/fast_forward"
                 android:layout_width="0dp"