diff --git a/CHANGELOG.md b/CHANGELOG.md
index edf15622d..fa66c41a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ Version 2.99.x and version 3.x will be available with a [pro license](http://www
 **Next release**
 
 * Clear will also clear usage data and settings
+* Changed application specific fake values icon to a star ([issue](/../../issues/1831))
 * Updated Arabic translation
 * Updated Italian translation
 * Updated Japanese translation
diff --git a/res/layout/help.xml b/res/layout/help.xml
index d8d8acc9b..b308c83da 100644
--- a/res/layout/help.xml
+++ b/res/layout/help.xml
@@ -211,7 +211,7 @@
                 android:textIsSelectable="false" />
         </LinearLayout>
 
-        <!-- application setting -->
+        <!-- application specific settings -->
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -228,7 +228,7 @@
                     android:layout_width="32dip"
                     android:layout_height="32dip"
                     android:contentDescription="@string/help_settings"
-                    android:src="@android:drawable/ic_menu_edit" />
+                    android:src="@android:drawable/btn_star_big_off" />
             </LinearLayout>
 
             <TextView
diff --git a/res/layout/mainentry.xml b/res/layout/mainentry.xml
index 2defe9c77..c0fbc8c2c 100644
--- a/res/layout/mainentry.xml
+++ b/res/layout/mainentry.xml
@@ -97,7 +97,7 @@
                 android:layout_gravity="center_vertical"
                 android:contentDescription="@string/help_application"
                 android:paddingLeft="3dip"
-                android:src="@android:drawable/ic_menu_edit"
+                android:src="@android:drawable/btn_star_big_off"
                 android:visibility="gone" />
 
             <ImageView