diff --git a/src/main/res/layout/scrollable_widget_dark.xml b/src/main/res/layout/scrollable_widget_dark.xml
index 2d83b8cf6..de13f0235 100644
--- a/src/main/res/layout/scrollable_widget_dark.xml
+++ b/src/main/res/layout/scrollable_widget_dark.xml
@@ -14,43 +14,19 @@
     <LinearLayout
         android:id="@+id/widget_header"
         android:layout_width="match_parent"
-        android:layout_height="39dip"
-        android:layout_gravity="top"
-        android:gravity="top"
-        android:orientation="horizontal"
-        android:padding="3dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:background="@color/widget_header_dark">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_dark"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical"
-            android:ellipsize="end" />
-    
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_add_light"
-            android:scaleType="fitCenter"/>
-      
+
+        <include layout="@layout/widget_toolbar"/>
+
+        <ImageView
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@android:color/white"/>
+
     </LinearLayout>
-    
-    <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@android:color/white"/>
 
     <ListView
         android:id="@+id/list_view"
diff --git a/src/main/res/layout/scrollable_widget_light.xml b/src/main/res/layout/scrollable_widget_light.xml
index 6711dc295..4f318ad63 100644
--- a/src/main/res/layout/scrollable_widget_light.xml
+++ b/src/main/res/layout/scrollable_widget_light.xml
@@ -14,36 +14,12 @@
     <LinearLayout
         android:id="@+id/widget_header"
         android:layout_width="match_parent"
-        android:layout_height="39dip"
-        android:layout_gravity="top"
-        android:gravity="top"
-        android:orientation="horizontal"
-        android:padding="3dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:background="@color/primary">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical"
-            android:ellipsize="end" />
-    
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_add_light"
-            android:scaleType="fitCenter"/>
-      
+
+        <include layout="@layout/widget_toolbar"/>
+
     </LinearLayout>
     
     <ListView
diff --git a/src/main/res/layout/widget_initialized.xml b/src/main/res/layout/widget_initialized.xml
index 3ad33a5eb..133112688 100644
--- a/src/main/res/layout/widget_initialized.xml
+++ b/src/main/res/layout/widget_initialized.xml
@@ -16,34 +16,11 @@
     <LinearLayout
         android:id="@+id/widget_header"
         android:layout_width="fill_parent"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:background="@color/primary">
 
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="0dp"
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical"
-            android:paddingLeft="2dip"
-            android:paddingRight="0dp"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical"
-            android:ellipsize="end"/>
-
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_add_light"
-            android:scaleType="fitCenter"/>
+        <include layout="@layout/widget_toolbar"/>
 
     </LinearLayout>
 
diff --git a/src/main/res/layout/widget_initialized_dark.xml b/src/main/res/layout/widget_initialized_dark.xml
index 95162e470..df9624f10 100644
--- a/src/main/res/layout/widget_initialized_dark.xml
+++ b/src/main/res/layout/widget_initialized_dark.xml
@@ -16,42 +16,20 @@
     <LinearLayout
         android:id="@+id/widget_header"
         android:layout_width="fill_parent"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:background="@color/widget_header_dark">
 
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent"
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical"
-            android:paddingLeft="2dip"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical"
-            android:ellipsize="end"/>
+        <include layout="@layout/widget_toolbar"/>
 
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_add_light"
-            android:scaleType="fitCenter"/>
+        <ImageView
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@android:color/white"/>
 
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@android:color/white"/>
-
     <LinearLayout
         android:id="@+id/taskbody"
         android:layout_width="fill_parent"
diff --git a/src/main/res/layout/widget_loading.xml b/src/main/res/layout/widget_loading.xml
index 38257c7e2..bc1825515 100644
--- a/src/main/res/layout/widget_loading.xml
+++ b/src/main/res/layout/widget_loading.xml
@@ -13,36 +13,12 @@
 
     <LinearLayout
         android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:background="@color/primary">
 
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="0dp"
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical"
-            android:paddingLeft="2dip"
-            android:paddingRight="0dp"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical"
-            android:text="@string/app_name"
-            android:ellipsize="end" />
-
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_add_light"
-            android:scaleType="fitCenter" />
+        <include layout="@layout/widget_toolbar"/>
 
     </LinearLayout>
 
diff --git a/src/main/res/layout/widget_toolbar.xml b/src/main/res/layout/widget_toolbar.xml
new file mode 100644
index 000000000..80f958caf
--- /dev/null
+++ b/src/main/res/layout/widget_toolbar.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/widget_title"
+        android:layout_width="0dp"
+        android:layout_height="39dp"
+        android:layout_gravity="left|center_vertical"
+        android:paddingLeft="5dp"
+        android:paddingRight="0dp"
+        android:textColor="@android:color/white"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:maxLines="2"
+        android:layout_weight="1"
+        android:gravity="left|center_vertical"
+        android:ellipsize="end"/>
+
+    <ImageButton
+        android:id="@+id/widget_button"
+        android:layout_width="33dp"
+        android:layout_height="39dp"
+        android:layout_gravity="right|center_vertical"
+        android:background="@android:color/transparent"
+        android:src="@drawable/ic_action_add_light"
+        android:scaleType="fitCenter"/>
+
+</LinearLayout>
\ No newline at end of file