diff --git a/res/drawable-xxhdpi/solution_fix.png b/res/drawable-xxhdpi/solution_fix.png
new file mode 100644
index 00000000..ad889c30
Binary files /dev/null and b/res/drawable-xxhdpi/solution_fix.png differ
diff --git a/res/drawable-xxhdpi/solution_float.png b/res/drawable-xxhdpi/solution_float.png
new file mode 100644
index 00000000..f1cf19fb
Binary files /dev/null and b/res/drawable-xxhdpi/solution_float.png differ
diff --git a/res/drawable-xxhdpi/solution_none.png b/res/drawable-xxhdpi/solution_none.png
new file mode 100644
index 00000000..a151b4a3
Binary files /dev/null and b/res/drawable-xxhdpi/solution_none.png differ
diff --git a/res/drawable-xxhdpi/solution_single.png b/res/drawable-xxhdpi/solution_single.png
new file mode 100644
index 00000000..ab8c983d
Binary files /dev/null and b/res/drawable-xxhdpi/solution_single.png differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b6a5210b..ae03deac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,6 +29,7 @@
     <string name="menu_map_mode_geoportail_orthoimages">Geoportail aerial</string>
     <string name="local_service_started">Local service started</string>
     <string name="local_service_stopped">Local service stopped</string>
+    <string name="local_service_notification_content">%s since %s</string>
     <string name="local_service_label">RtkGps</string>
     <string name="sky_plot_north">N</string>
     <string name="sky_plot_west">W</string>
@@ -52,7 +53,7 @@
     <string name="navdraw_item_processing_options">Processing options</string>
     <string name="navdraw_item_solution_options">Solution options</string>
     <string name="navdraw_item_ntripcaster_options">Caster options</string>
-    
+
     <string-array name="rtk_server_receiver">
         <item>Rover</item>
         <item>Base</item>
@@ -130,7 +131,7 @@
         <item>b:</item>
         <item>height:</item>
     </string-array>
-    
+
     <!-- PMODE_XXX positioning mode -->
     <string name="pmode_single">Single</string>
     <string name="pmode_dgps">DGPS/DGNSS</string>
@@ -168,7 +169,7 @@
     <string name="solq_ppp">PPP</string>
     <string name="solq_dr">Dead reckoning</string>
     <string name="solq_internal">Internal</string>
-    
+
     <!-- SOLF_XXX  Solution Format -->
     <string name="solf_llh">Lat/Long/Height</string>
     <string name="solf_xyz">X/Y/Z — ECEF</string>
@@ -261,7 +262,7 @@
     <string name="stapos_rinex_hdr">Rinex header</string>
     <string name="stapos_rtcm_pos">RTCM Antenna position</string>
 
-    
+
     <!-- Procession options -->
     <string name="procopt_category_processing_options_1">Processing options 1</string>
     <string name="procopt_category_solution_options">Solution options</string>
@@ -327,7 +328,7 @@
         <item>35</item>
         <item>40</item>
     </string-array>
-    
+
     <string name="procopt_ambiguity_resolution_title">GPS Integer ambiguity resolution</string>
     <string name="procopt_ambiguity_resolution_dialog_title">GPS Integer ambiguity resolution</string>
     <string-array name="procopt_ambiguity_resolution_entries">
@@ -532,11 +533,11 @@
         <item>30</item>
         <item>60</item>
     </string-array>
-    
+
     <!-- Output header -->
     <string name="solopt_output_header_title">Output header</string>
     <string name="solopt_output_header_summary">Set whether the header is output or not</string>
-    
+
     <!-- Output mocklocation -->
     <string name="solopt_output_mocklocation_title">Output GPS mock locations</string>
     <string name="solopt_output_mocklocation_summary">Set if solution is sent to other applications like the internal GPS</string>
@@ -553,7 +554,7 @@
     <string name="earth_tide_correction_off">OFF</string>
     <string name="earth_tide_correction_solid">Solid</string>
     <string name="earth_tide_correction_solid_otl_pole">Solid, ocean, pole</string>
-    
+
     <string-array name="solopt_lat_lon_format_entries">
         <item>ddd.dddddddd : Degree</item>
         <item>ddd mm ss.sss : Degree minute second</item>
@@ -627,7 +628,7 @@
     <string name="solopt_output_customproj4_default">+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs</string>
     <string name="solopt_output_testmode_title">Enable test mode</string>
     <string name="solopt_output_testmode_summary">If this is enabled and Rover/Base/Correction are off, it runs in a special test mode with positions coming from internal GPS. Obviously no algorithm from RTKLIB can work</string>
-    
+
     <!-- Input streams settings -->
 	<string name="streams_settings_type_title">Type</string>
     <string name="streams_settings_format_title">Format</string>
@@ -644,10 +645,10 @@
     <string name="input_streams_settings_receiver_option_title">Receiver option</string>
     <string name="input_streams_settings_transmit_gpgga_to_base_title">Transmit GPGGA to Base Station</string>
     <string name="input_streams_settings_transmit_gpgga_lat_title">Latitude</string>
-    <string name="input_streams_settings_transmit_gpgga_lon_title">Longitude</string> 
+    <string name="input_streams_settings_transmit_gpgga_lon_title">Longitude</string>
     <string name="input_streams_setting_antenna_title">Antenna</string>
     <string name="input_streams_setting_antenna_summary">Antenna official IGS name (for phase center variation)</string>
-    
+
 	<string-array name="input_streams_settings_transmit_gpgga_entries">
         <item>OFF</item>
         <item>Latitude/Longitude</item>
@@ -658,8 +659,8 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-    
-    
+
+
     <!-- Output stream settings -->
     <string name="output_streams_settings_enable_solution1_title">Enable Solution 1</string>
     <string name="output_streams_settings_enable_solution2_title">Enable Solution 2</string>
@@ -668,7 +669,7 @@
     <string name="output_streams_settings_solution2_tab_title">Solution 2</string>
     <string name="output_streams_settings_gpxtrace_tab_title">GPX Trace</string>
 
-    
+
     <!-- Log stream settings -->
     <string name="log_streams_settings_enable_rover_title">Log rover</string>
     <string name="log_streams_settings_enable_base_title">Log base </string>
@@ -676,7 +677,7 @@
     <string name="log_stream_settings_rover_tab_title">Log Rover</string>
     <string name="log_stream_settings_base_tab_title">Log Base</string>
     <string name="log_stream_settings_correction_tab_title">Log Correction</string>
-    
+
     <!-- NTRIP client stream preferences -->
     <string name="ntrip_client_dialog_title">NTRIP client settings</string>
     <string name="ntrip_client_host_title">Host</string>
@@ -703,7 +704,7 @@
 
     <!-- File stream preferences -->
     <string name="file_dialog_title">File settings</string>
-    
+
     <!-- Bluetooth stream preferences -->
     <string name="bluetooth_dialog_title">Bluetooth receiver settings</string>
     <string name="bluetooth_device_not_selected">device not selected</string>
@@ -711,7 +712,7 @@
     <string name="bluetooth_device_address_title">Bluetooth device</string>
     <string name="bluetooth_system_settings_title">Bluetooth system settings</string>
     <string name="bluetooth_system_settings_summary">Display system Bluetooth settings screen</string>
-    
+
     <string name="bluetooth_connected">Bluetooth connected</string>
     <string name="bluetooth_connection_lost">Bluetooth connection lost</string>
 
@@ -744,10 +745,10 @@
     </string-array>
 
     <!-- USB stream preferences -->
-    
+
 	<string name="usb_connected">USB connected</string>
     <string name="usb_connection_lost">USB connection lost</string>
-    
+
     <string name="usb_dialog_title">USB receiver settings</string>
     <string name="usb_device_baudrate_title">Baudrate</string>
 	<string-array name="usb_device_baudrate_entries">
@@ -794,7 +795,7 @@
 	    <item>1</item>
 	    <item>2</item>
 	</string-array>
-    
+
 	<!-- Startup/shutdown commands preference widget -->
 	<string name="send_commands_at_startup">Send commands at startup</string>
 	<string name="send_commands_at_shutdown">Send commands at shutdown</string>
@@ -802,14 +803,14 @@
 	<string name="commands_at_shutdown">Commands at shutdown</string>
 	<string name="load_startup_shutdown_commands">Load</string>
 	<string name="load_startup_shutdown_dialog_title">Select file</string>
-	
+
 	<!-- Rover/base position -->
 	<string name="station_position_format_llh">Lat/Lon/Height (deg/m)</string>
 	<string name="station_position_format_llh_dms">Lat/Lon/Height (dms/m)</string>
 	<string name="station_position_format_ecef">X/Y/Z — ECEF</string>
 	<string name="station_position_for_fixed_mode">For fixed mode</string>
 	<string name="station_position_for_relative_mode">For relative mode</string>
-	
+
 	<!-- StatusView -->
 	<string name="status_view_snr">SNR Rover/Base</string>
 	<string name="status_view_snr_l1">SNR Rover/Base L1</string>
@@ -817,7 +818,7 @@
 	<string name="status_view_snr_l5">SNR Rover/Base L5</string>
 	<string name="status_view_skyplot_rover_l1">Skyplot Rover L1</string>
 	<string name="status_view_skyplot_rover_l2">Skyplot Rover L2</string>
-	<string name="status_view_skyplot_rover_l5">Skyplot Rover L5</string>	
+	<string name="status_view_skyplot_rover_l5">Skyplot Rover L5</string>
 	<string name="status_view_skyplot_base_l1">Skyplot Base L1</string>
 	<string name="status_view_skyplot_base_l2">Skyplot Base L2</string>
 	<string name="status_view_skyplot_base_l5">Skyplot Base L5</string>
@@ -830,12 +831,12 @@
 	<string name="tools_download_egm2008_m25_geoid">Install EGM 2008 2.5\' Geoid (135MB)</string>
 	<string name="tools_download_egm2008_m10_geoid">Install EGM 2008 1.0\' Geoid (825MB)</string>
 	<string name="tools_download_egm96_m150_geoid">Install EGM 96 15\' Geoid (2MB)</string>
-	
+
 	<string name="changelog_full_title">Change Log</string>
     <string name="changelog_title">What\'s New</string>
     <string name="changelog_ok_button">OK</string>
     <string name="changelog_show_full">more…</string>
-    
+
     <string name="ntripcaster_options_enabled_summary">Enable experimental NTRIP Caster</string>
     <string name="ntripcaster_options_enabled_title">NTRIP Caster</string>
     <string name="ntripcaster_options_brutal_ending_summary">Ending NTRIP Caster will also shutown RTKGPS+, it is safer for being sure all connections are closed.</string>
diff --git a/src/gpsplus/rtkgps/RtkNaviService.java b/src/gpsplus/rtkgps/RtkNaviService.java
index 864d73ad..9940368b 100644
--- a/src/gpsplus/rtkgps/RtkNaviService.java
+++ b/src/gpsplus/rtkgps/RtkNaviService.java
@@ -23,6 +23,7 @@
 import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
 import android.widget.Toast;
 import butterknife.BindString;
@@ -62,6 +63,7 @@
 import gpsplus.rtklib.Solution;
 import gpsplus.rtklib.constants.EphemerisOption;
 import gpsplus.rtklib.constants.GeoidModel;
+import gpsplus.rtklib.constants.SolutionStatus;
 import gpsplus.rtklib.constants.StreamType;
 
 import java.io.BufferedWriter;
@@ -69,6 +71,8 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Locale;
 
 public class RtkNaviService extends IntentService implements LocationListener {
@@ -131,7 +135,12 @@ public RtkNaviService() {
     private static final String MM_MAP_HEADER = "COMPD_CS[\"WGS 84\",GEOGCS[\"\",DATUM[\"WGS 84\",SPHEROID[\"WGS 84\",6378137,298.257223563],TOWGS84[0,0,0,0,0,0,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degrees\",0.0174532925199433],AXIS[\"Long\",East],AXIS[\"Lat\",North]],VERT_CS[\"\",VERT_DATUM[\"Ellipsoid\",2002],UNIT[\"Meters\",1],AXIS[\"Height\",Up]]]\r\n";
     private static final String GPS_PROVIDER = LocationManager.GPS_PROVIDER;
     private boolean mHavePoint = false;
-    private int NOTIFICATION = R.string.local_service_started;
+    private static final int NOTIFICATION = R.string.local_service_started;
+    private static NotificationCompat.Builder notificationBuilder;
+    private static NotificationManagerCompat notificationManager;
+    private static SolutionStatus previousSolutionStatus;
+    private static Context context;
+
     private RtkCommon rtkCommon;
 
     // Binder given to clients
@@ -160,10 +169,10 @@ public RtkNaviService() {
     @Override
     public void onCreate() {
         super.onCreate();
+        context = this.getBaseContext();
 
         final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         mCpuLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
-
     }
 
     @Override
@@ -389,8 +398,11 @@ public void processStart() {
 
         mCpuLock.acquire();
 
-        Notification notification = createForegroundNotification();
-        startForeground(NOTIFICATION, notification);
+        notificationManager = NotificationManagerCompat.from(this);
+        notificationBuilder = createForegroundNotificationBuilder();
+        previousSolutionStatus = SolutionStatus.NONE;
+        setNotificationSolutionStatus(previousSolutionStatus);
+        startForeground(NOTIFICATION, notificationBuilder.build());
 
         SharedPreferences prefs = this.getBaseContext().getSharedPreferences(SolutionOutputSettingsFragment.SHARED_PREFS_NAME, 0);
         mBoolMockLocationsPref = prefs.getBoolean(SolutionOutputSettingsFragment.KEY_OUTPUT_MOCK_LOCATION, false);
@@ -437,7 +449,6 @@ public void processStart() {
         mBoolIsRunning = true;
     }
 
-
     private void processStop() {
         mBoolIsRunning = false;
         mbStarted = false;
@@ -628,7 +639,7 @@ public void onDestroy() {
     }
 
     @SuppressWarnings("deprecation")
-    private Notification createForegroundNotification() {
+    private NotificationCompat.Builder createForegroundNotificationBuilder() {
         CharSequence text = getText(R.string.local_service_started);
 
         // The PendingIntent to launch our activity if the user selects this
@@ -645,7 +656,7 @@ private Notification createForegroundNotification() {
         builder.setNumber(100);
         builder.setAutoCancel(false);
 
-        return builder.build();
+        return builder;
     }
 
     private class BluetoothCallbacks implements BluetoothToRtklib.Callbacks {
@@ -831,6 +842,34 @@ private void stopUsb() {
         }
     }
 
+    private static void setNotificationSolutionStatus(SolutionStatus solutionStatus) {
+        int resId = solutionStatus.getNameResId();
+        String solutionStatusText = context.getString(resId);
+        String contentText = String.format(
+            context.getString(R.string.local_service_notification_content),
+            solutionStatusText,
+            new SimpleDateFormat("HH:mm:ss").format(new Date())
+        );
+        notificationBuilder.setContentText(contentText);
+        notificationBuilder.setSmallIcon(solutionStatus.getIconResId());
+    }
+
+    private static void updateNotification() {
+        notificationManager.notify(NOTIFICATION, notificationBuilder.build());
+    }
+
+    public static void setNotificationSolutionStatusWithUpdate(SolutionStatus solutionStatus) {
+        if (
+            previousSolutionStatus != solutionStatus &&
+            notificationBuilder != null &&
+            notificationManager != null
+        ) {
+            setNotificationSolutionStatus(solutionStatus);
+            updateNotification();
+            previousSolutionStatus = solutionStatus;
+        }
+    }
+
     /* (non-Javadoc)
      * @see android.app.IntentService#onHandleIntent(android.content.Intent)
      */
@@ -842,10 +881,12 @@ protected void onHandleIntent(Intent arg0) {
 
             {
                 try {
+                    RtkControlResult result = getRtkStatus(null);
+                    Solution solution = result.getSolution();
+                    SolutionStatus solutionStatus = solution.getSolutionStatus();
+                    setNotificationSolutionStatusWithUpdate(solutionStatus);
                     if (mBoolMockLocationsPref || mBoolGenerateGPXTrace)
                     {
-                        RtkControlResult result = getRtkStatus(null);
-                        Solution solution = result.getSolution();
                         Position3d positionECEF = solution.getPosition();
 
                         if (RtkCommon.norm(positionECEF.getValues()) > 0.0)
diff --git a/src/gpsplus/rtkgps/view/SolutionView.java b/src/gpsplus/rtkgps/view/SolutionView.java
index 51965d11..39e05238 100644
--- a/src/gpsplus/rtkgps/view/SolutionView.java
+++ b/src/gpsplus/rtkgps/view/SolutionView.java
@@ -275,6 +275,7 @@ public void setStats(RtkControlResult status) {
         mSolutionIndicatorView.setStatus(solStatus);
         updateCoordinates(status);
         updateAgeText(sol);
+        RtkNaviService.setNotificationSolutionStatusWithUpdate(solStatus);
     }
 
     public void setFormat(Format format) {
diff --git a/src/gpsplus/rtklib/constants/SolutionStatus.java b/src/gpsplus/rtklib/constants/SolutionStatus.java
index e3e19e1a..341d4d17 100644
--- a/src/gpsplus/rtklib/constants/SolutionStatus.java
+++ b/src/gpsplus/rtklib/constants/SolutionStatus.java
@@ -10,23 +10,25 @@
  */
 public enum SolutionStatus implements IHasRtklibId {
 
-    NONE(0, R.string.solq_none),
-    FIX(1, R.string.solq_fix),
-    FLOAT(2, R.string.solq_float),
-    SBAS(3, R.string.solq_sbas),
-    DGPS(4, R.string.solq_dgps),
-    SINGLE(5, R.string.solq_single),
-    PPP(6, R.string.solq_ppp),
-    DR(7, R.string.solq_dr),
-    INTERNAL(8,R.string.solq_internal)
+    NONE(0, R.string.solq_none, R.drawable.solution_none),
+    FIX(1, R.string.solq_fix, R.drawable.solution_fix),
+    FLOAT(2, R.string.solq_float, R.drawable.solution_float),
+    SBAS(3, R.string.solq_sbas, R.drawable.solution_single),
+    DGPS(4, R.string.solq_dgps, R.drawable.solution_single),
+    SINGLE(5, R.string.solq_single, R.drawable.solution_single),
+    PPP(6, R.string.solq_ppp, R.drawable.solution_fix),
+    DR(7, R.string.solq_dr, R.drawable.solution_none),
+    INTERNAL(8, R.string.solq_internal, R.drawable.solution_single)
     ;
 
     private final int mRtklibId;
     private final int mNameResId;
+    private final int mIconResId;
 
-    private SolutionStatus(int solqId, int nameResId) {
+    private SolutionStatus(int solqId, int nameResId, int iconResId) {
         mRtklibId = solqId;
         mNameResId = nameResId;
+        mIconResId = iconResId;
     }
 
     public static SolutionStatus valueOf(int solqId) {
@@ -47,4 +49,8 @@ public int getRtklibId() {
     public int getNameResId() {
         return mNameResId;
     }
+
+    public int getIconResId() {
+        return mIconResId;
+    }
 };