diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e0b1e821..6f166beb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -127,16 +127,16 @@
         <activity android:name=".ui.activities.SearchActivity" />
 
         <receiver
-            android:name=".appwidgets.AppWidgetSmall"
+            android:name=".appwidgets.AppWidgetClassic"
             android:exported="false"
-            android:label="@string/app_widget_small_name">
+            android:label="@string/app_widget_classic_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_small_info" />
+                android:resource="@xml/app_widget_classic_info" />
         </receiver>
 
         <activity
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
similarity index 90%
rename from app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java
rename to app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
index b7436113..b431cb0c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
@@ -27,14 +27,14 @@ import com.kabouzeid.gramophone.util.Util;
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
-public class AppWidgetSmall extends BaseAppWidget {
-    public static final String NAME = "app_widget_small";
+public class AppWidgetClassic extends BaseAppWidget {
+    public static final String NAME = "app_widget_classic";
 
-    private static AppWidgetSmall mInstance;
+    private static AppWidgetClassic mInstance;
 
-    public static synchronized AppWidgetSmall getInstance() {
+    public static synchronized AppWidgetClassic getInstance() {
         if (mInstance == null) {
-            mInstance = new AppWidgetSmall();
+            mInstance = new AppWidgetClassic();
         }
         return mInstance;
     }
@@ -58,7 +58,7 @@ public class AppWidgetSmall extends BaseAppWidget {
      * default click and hide actions if service not running.
      */
     private void defaultAppWidget(final Context context, final int[] appWidgetIds) {
-        final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_small);
+        final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_classic);
 
         appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE);
         appWidgetView.setViewVisibility(R.id.image, View.INVISIBLE);
@@ -106,7 +106,7 @@ public class AppWidgetSmall extends BaseAppWidget {
      * Update all active widget instances by pushing changes
      */
     public void performUpdate(final MusicService service, final int[] appWidgetIds) {
-        final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(), R.layout.app_widget_small);
+        final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(), R.layout.app_widget_classic);
 
         final boolean isPlaying = service.isPlaying();
         final Song song = service.getCurrentSong();
@@ -124,12 +124,16 @@ public class AppWidgetSmall extends BaseAppWidget {
         int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp;
         appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, createBitmap(Util.getTintedDrawable(service, playPauseRes, MaterialValueHelper.getPrimaryTextColor(service, true)), 1f));
 
+        // set prev/next button drawables
+        appWidgetView.setImageViewBitmap(R.id.button_next, createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, true)), 1f));
+        appWidgetView.setImageViewBitmap(R.id.button_prev, createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, true)), 1f));
+
         // Link actions buttons to intents
         linkButtons(service, appWidgetView);
 
         // load the album cover async and push the update on completion
         final Context appContext = service.getApplicationContext();
-        final int widgetImageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_small_image_size);
+        final int widgetImageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_classic_image_size);
         service.runOnUiThread(new Runnable() {
             @Override
             public void run() {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index 5bdcc145..16afe26e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -37,7 +37,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appwidgets.AppWidgetSmall;
+import com.kabouzeid.gramophone.appwidgets.AppWidgetClassic;
 import com.kabouzeid.gramophone.glide.BlurTransformation;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.helper.PlayingNotificationHelper;
@@ -112,7 +112,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
 
     private final IBinder musicBind = new MusicBinder();
 
-    private AppWidgetSmall appWidgetSmall = AppWidgetSmall.getInstance();
+    private AppWidgetClassic appWidgetClassic = AppWidgetClassic.getInstance();
 
     private Playback playback;
     private ArrayList<Song> playingQueue = new ArrayList<>();
@@ -936,7 +936,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
 
     private void sendChangeInternal(final String what) {
         sendBroadcast(new Intent(what));
-        appWidgetSmall.notifyChange(this, what);
+        appWidgetClassic.notifyChange(this, what);
     }
 
     private void handleChangeInternal(@NonNull final String what) {
@@ -1158,9 +1158,9 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         public void onReceive(final Context context, final Intent intent) {
             final String command = intent.getStringExtra(EXTRA_APP_WIDGET_NAME);
 
-            if (AppWidgetSmall.NAME.equals(command)) {
+            if (AppWidgetClassic.NAME.equals(command)) {
                 final int[] small = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
-                appWidgetSmall.performUpdate(MusicService.this, small);
+                appWidgetClassic.performUpdate(MusicService.this, small);
             }
         }
     };
diff --git a/app/src/main/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_classic.xml
similarity index 94%
rename from app/src/main/res/layout/app_widget_small.xml
rename to app/src/main/res/layout/app_widget_classic.xml
index 6b5bdaca..dc127271 100644
--- a/app/src/main/res/layout/app_widget_small.xml
+++ b/app/src/main/res/layout/app_widget_classic.xml
@@ -2,15 +2,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/app_widget_small_image_size"
+    android:layout_height="@dimen/app_widget_classic_height"
     android:background="#AAFFFFFF"
     android:orientation="horizontal"
     tools:ignore="ContentDescription">
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="@dimen/app_widget_small_image_size"
-        android:layout_height="@dimen/app_widget_small_image_size"
+        android:layout_width="@dimen/app_widget_classic_image_size"
+        android:layout_height="@dimen/app_widget_classic_image_size"
         android:background="@drawable/default_album_art"
         android:scaleType="centerCrop" />
 
@@ -19,12 +19,12 @@
         android:layout_height="match_parent">
 
         <LinearLayout
-            android:layout_margin="8dp"
             android:id="@+id/media_actions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_gravity="bottom"
+            android:layout_margin="8dp"
             android:orientation="horizontal">
 
             <ImageButton
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bc5f7e22..a81e7b44 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -59,8 +59,9 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     <dimen name="mini_player_height">56dp</dimen>
 
     <!--App Widgets-->
-    <dimen name="app_widget_small_image_size">96dp</dimen>
-    <dimen name="app_widget_small_min_width">250dp</dimen>
-    <dimen name="app_widget_small_min_height">40dp</dimen>
+    <dimen name="app_widget_classic_height">96dp</dimen>
+    <dimen name="app_widget_classic_image_size">96dp</dimen>
+    <dimen name="app_widget_classic_min_width">250dp</dimen>
+    <dimen name="app_widget_classic_min_height">40dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 20048c40..08c2e3d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -245,5 +245,5 @@
     <string name="could_not_scan_files">Could not scan %d files.</string>
     <string name="listing_files">Listing files</string>
     <string name="new_start_directory">%s is the new start directory.</string>
-    <string name="app_widget_small_name">small</string>
+    <string name="app_widget_classic_name">Phonograph - Classic</string>
 </resources>
diff --git a/app/src/main/res/xml/app_widget_small_info.xml b/app/src/main/res/xml/app_widget_classic_info.xml
similarity index 58%
rename from app/src/main/res/xml/app_widget_small_info.xml
rename to app/src/main/res/xml/app_widget_classic_info.xml
index 98dacbab..78de70a2 100644
--- a/app/src/main/res/xml/app_widget_small_info.xml
+++ b/app/src/main/res/xml/app_widget_classic_info.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:initialLayout="@layout/app_widget_small"
-    android:minHeight="@dimen/app_widget_small_min_height"
-    android:minWidth="@dimen/app_widget_small_min_width"
+    android:initialLayout="@layout/app_widget_classic"
+    android:minHeight="@dimen/app_widget_classic_min_height"
+    android:minWidth="@dimen/app_widget_classic_min_width"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
     android:widgetCategory="keyguard|home_screen"
     tools:ignore="UnusedAttribute" />
 
-    <!--android:previewImage="@drawable/app_widget_small"-->
\ No newline at end of file
+    <!--android:previewImage="@drawable/app_widget_classic"-->
\ No newline at end of file