diff --git a/app/src/main/java/org/isoron/uhabits/views/SmallWidgetView.java b/app/src/main/java/org/isoron/uhabits/views/SmallWidgetView.java
index 33c0105d4..b4edb6a65 100644
--- a/app/src/main/java/org/isoron/uhabits/views/SmallWidgetView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/SmallWidgetView.java
@@ -21,15 +21,36 @@ package org.isoron.uhabits.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 
 import org.isoron.helpers.ColorHelper;
+import org.isoron.uhabits.R;
 
 public class SmallWidgetView extends View
 {
     private Paint pCircle;
+    private Paint pText;
+
+    private int primaryColor;
+    private int grey;
+    private int size;
+
+    private String fa_check;
+    private String fa_times;
+    private String fa_full_star;
+    private String fa_half_star;
+    private String fa_empty_star;
+
+    private int check_status;
+    private int star_status;
+
+    private Rect textBounds;
 
     public SmallWidgetView(Context context)
     {
@@ -45,22 +66,87 @@ public class SmallWidgetView extends View
 
     private void init(Context context)
     {
+        Typeface fontawesome =
+                Typeface.createFromAsset(context.getAssets(), "fontawesome-webfont.ttf");
+
         pCircle = new Paint();
-        pCircle.setColor(ColorHelper.palette[7]);
+        pCircle.setAntiAlias(true);
+
+        pText = new Paint();
+        pText.setAntiAlias(true);
+        pText.setTypeface(fontawesome);
+        pText.setTextAlign(Paint.Align.CENTER);
+
+        fa_check = context.getString(R.string.fa_check);
+        fa_times = context.getString(R.string.fa_times);
+        fa_empty_star = context.getString(R.string.fa_star_o);
+        fa_half_star = context.getString(R.string.fa_star_half_o);
+        fa_full_star = context.getString(R.string.fa_star);
+
+        primaryColor = ColorHelper.palette[10];
+        grey = Color.rgb(150, 150, 150);
+
+        textBounds = new Rect();
+
+        check_status = 2;
+        star_status = 2;
     }
 
     @Override
     protected void onDraw(Canvas canvas)
     {
         super.onDraw(canvas);
-        canvas.drawOval(0, 0, getMeasuredWidth(), getMeasuredHeight(), pCircle);
+        int s = size - (int) (size * 0.025);
+        pCircle.setShadowLayer(size * 0.025f, size * 0.01f, size * 0.01f, 0x60000000);
+
+        drawBigCircle(canvas, s);
+        drawSmallCircle(canvas, s);
+    }
+
+    private void drawSmallCircle(Canvas canvas, int s)
+    {
+        String text;
+        int color = (star_status == 2 ? primaryColor : grey);
+
+        if(star_status == 0)
+            text = fa_empty_star;
+        else if(star_status == 1)
+            text = fa_half_star;
+        else
+            text = fa_full_star;
+
+        int r2 = (int) (s * 0.20);
+        pCircle.setColor(Color.WHITE);
+        canvas.drawCircle(s - r2, s - r2, r2, pCircle);
+
+        pText.setTextSize(s * 0.3f);
+        pText.setColor(color);
+        pText.getTextBounds(text, 0, text.length(), textBounds);
+        canvas.drawText(text, s - r2, s - r2 - textBounds.exactCenterY() - s / 90, pText);
+    }
+
+    private void drawBigCircle(Canvas canvas, int s)
+    {
+        String text = (check_status == 0 ? fa_times : fa_check);
+        int color = (check_status == 2 ? primaryColor : grey);
+
+        int r1 = (int) (s * 0.45);
+        pCircle.setColor(color);
+        canvas.drawCircle(r1, r1, r1, pCircle);
+
+        pText.setTextSize(s * 0.7f);
+        pText.setColor(Color.WHITE);
+        pText.getTextBounds(text, 0, text.length(), textBounds);
+        canvas.drawText(text, r1, r1 - textBounds.exactCenterY(), pText);
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
     {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        setMeasuredDimension(widthMeasureSpec, heightMeasureSpec);
+        size = Math.min(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(size, size);
+        Log.d("SmallWidgetView", "" + size);
     }
 
     @Override
diff --git a/app/src/main/res/layout/small_widget.xml b/app/src/main/res/layout/small_widget.xml
index 626b909f1..474d4c918 100644
--- a/app/src/main/res/layout/small_widget.xml
+++ b/app/src/main/res/layout/small_widget.xml
@@ -15,11 +15,15 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="@color/white"
         android:shadowColor="#000000"
         android:shadowDx="1"
         android:shadowDy="1"
         android:shadowRadius="3"
         android:padding="6dp"
-        android:text="Widget"/>
+        android:textSize="12sp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:text="Meditate"/>
 
 </LinearLayout>
\ No newline at end of file