diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java
index 3b8f603..fa7149c 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java
@@ -185,17 +185,29 @@ public class SudokuKeyboardLayout extends LinearLayout implements IHighlightChan
     @Override
     public void onHighlightChanged() {
         for(SudokuButton i_btn : buttons) {
-            i_btn.setBackgroundResource(R.drawable.mnenomic_numpad_button);
+            int backgroundResId = R.drawable.mnenomic_numpad_button;
 
-            // Highlight Yellow if we are done with that number
-            if(gameController.getValueCount(i_btn.getValue()) == gameController.getSize()) {
-                i_btn.setBackgroundResource(R.drawable.numpad_highlighted_three);
+            boolean numCompleted = (gameController.getValueCount(i_btn.getValue()) == gameController.getSize());
+            boolean numSelected = (gameController.getSelectedValue() == i_btn.getValue());
+
+            if(numCompleted) {
+                // Fill color           : darkyellow
+                // Border (if selected) : yellow
+                if(numSelected) {
+                    backgroundResId = R.drawable.numpad_selected_complete;
+                } else {
+                    backgroundResId = R.drawable.numpad_unselected_complete;
+                }
+            } else {
+                // Fill color           : lightblue
+                // Border (if selected) : colorPrimaryDark
+                if(numSelected) {
+                    backgroundResId = R.drawable.numpad_highlighted;
+                } // The else scenario is taken care of by the default initialized value
             }
 
-            if(gameController.getSelectedValue() == i_btn.getValue()) {
-                // highlight button to indicate that the value is selected
-                i_btn.setBackgroundResource(R.drawable.numpad_highlighted);
-            }
+            i_btn.setBackgroundResource(backgroundResId);
+
         }
     }
 
diff --git a/app/src/main/res/drawable-v21/numpad_selected_complete.xml b/app/src/main/res/drawable-v21/numpad_selected_complete.xml
new file mode 100644
index 0000000..62dd7f4
--- /dev/null
+++ b/app/src/main/res/drawable-v21/numpad_selected_complete.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:endColor="?attr/completedButtonColor"
+        android:startColor="?attr/completedButtonColor" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="?attr/completedButtonBorder" />
+</shape>
diff --git a/app/src/main/res/drawable-v21/numpad_unselected_complete.xml b/app/src/main/res/drawable-v21/numpad_unselected_complete.xml
new file mode 100644
index 0000000..c0716a8
--- /dev/null
+++ b/app/src/main/res/drawable-v21/numpad_unselected_complete.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:endColor="?attr/completedButtonColor" android:startColor="?attr/completedButtonColor" />
+    <corners android:radius="6dp" />
+</shape>
diff --git a/app/src/main/res/drawable/numfull.png b/app/src/main/res/drawable/numfull.png
index 9394b95..384c4ad 100644
Binary files a/app/src/main/res/drawable/numfull.png and b/app/src/main/res/drawable/numfull.png differ
diff --git a/app/src/main/res/drawable/numpad_selected_complete.xml b/app/src/main/res/drawable/numpad_selected_complete.xml
new file mode 100644
index 0000000..8a317a5
--- /dev/null
+++ b/app/src/main/res/drawable/numpad_selected_complete.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:endColor="@color/darkyellow"
+        android:startColor="@color/darkyellow" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="@color/yellow" />
+</shape>
diff --git a/app/src/main/res/drawable/numpad_unselected_complete.xml b/app/src/main/res/drawable/numpad_unselected_complete.xml
new file mode 100644
index 0000000..5bcd57c
--- /dev/null
+++ b/app/src/main/res/drawable/numpad_unselected_complete.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:endColor="@color/darkyellow" android:startColor="@color/darkyellow" />
+    <corners android:radius="6dp" />
+</shape>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 193db3b..4c929a2 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -21,6 +21,8 @@
         <item name="activeButtonColor">@color/lightblue</item>
         <item name="inactiveButtonColor">@color/middlegrey</item>
         <item name="highlightedButtonBorder">@color/yellow</item>
+        <item name="completedButtonColor">@color/darkyellow</item>
+        <item name="completedButtonBorder">@color/yellow</item>
         <item name="android:itemBackground">@color/cardview_dark_background</item>
         <item name="backgroundTutorialSlide">@color/colorPrimaryDark</item>
         <item name="backgroundTutorialStars">@color/colorPrimaryDark</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 21f406a..190da01 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -15,6 +15,8 @@
         <attr name="activeButtonColor" format="color"/>
         <attr name="menuTextColor" format="color"/>
         <attr name="highlightedButtonBorder" format="color"/>
+        <attr name="completedButtonColor" format="color"/>
+        <attr name="completedButtonBorder" format="color"/>
         <attr name="backgroundTutorialSlide" format="color"/>
         <attr name="backgroundTutorialStars" format="color"/>
         <attr name="blueHighlight" format="color"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e265552..6e0341d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,6 +19,8 @@
         <item name="activeButtonColor">@color/lightblue</item>
         <item name="inactiveButtonColor">@color/middlegrey</item>
         <item name="highlightedButtonBorder">@color/yellow</item>
+        <item name="completedButtonColor">@color/darkyellow</item>
+        <item name="completedButtonBorder">@color/yellow</item>
         <item name="actionBarTheme">@style/ToolbarStyle</item>
         <item name="backgroundTutorialSlide">@color/colorAccent</item>
         <item name="backgroundTutorialStars">@color/white</item>