diff --git a/doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java b/doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java
index 042b4fb56136655a235c691e19b9a19ff8d77dad..e7a273ecdbf3c45f628cef911be96ef0cd34a809 100644
--- a/doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java
+++ b/doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java
@@ -492,6 +492,13 @@ public class DoodleActivity extends Activity {
         findViewById(R.id.btn_fill_rect).setOnClickListener(mOnClickListener);
         findViewById(R.id.btn_clear).setOnClickListener(mOnClickListener);
         findViewById(R.id.btn_undo).setOnClickListener(mOnClickListener);
+        findViewById(R.id.btn_undo).setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                findViewById(R.id.btn_clear).performClick();
+                return true;
+            }
+        });
         findViewById(R.id.doodle_selectable_edit).setOnClickListener(mOnClickListener);
         findViewById(R.id.doodle_selectable_remove).setOnClickListener(mOnClickListener);
         findViewById(R.id.doodle_selectable_top).setOnClickListener(mOnClickListener);
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_arrow.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca1178549e386a3fcccb2da592a6b72928c55d0a
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_arrow.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_clear.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..55ab778cfc86fff431e74b27ff6a7e5d399c18e0
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_clear.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_copy.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..815f813775202d14bc22ec92b9d019f561d78c28
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_copy.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_eraser.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_eraser.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa18c3297b02a18913a3c61b8aeee4eecf79ad8
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_eraser.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_fill_circle.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_fill_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b6c386ac6bc5ef9fc29b6394d5a25d07005f8e1
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_fill_circle.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_fill_rect.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_fill_rect.png
new file mode 100644
index 0000000000000000000000000000000000000000..4129cf0185621c21320ff0af2fa31079e198f3ca
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_fill_rect.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_handwrite.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_handwrite.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c3bcbafe7cd7edab7b7d08b6a667d69ec6705ac
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_handwrite.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_hollow_circle.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_hollow_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..b463bcc4c51b80c804f5495ba1dfb1517903fde6
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_hollow_circle.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_hollow_rect.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_hollow_rect.png
new file mode 100644
index 0000000000000000000000000000000000000000..00aaf77c0b66af5abfbb9adb9e7a495e199e628e
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_hollow_rect.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_line.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_line.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b0ea2f95d13a0da7ffee5963040d33306659796
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_line.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_pen.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_pen.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce66030cea1209cd11aefc43f948d85867412eb4
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_pen.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_text.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3f9ae2b6e6f5e4273f77195792556fbe11a7449
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_text.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_texture.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_texture.png
new file mode 100644
index 0000000000000000000000000000000000000000..acb2fa694533ec91dddafd555da82cc32f5307fb
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_texture.png differ
diff --git a/doodle/src/main/res/drawable-xxhdpi/doodle_ic_undo.png b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a833922d165850540065487aba87708630d42c3
Binary files /dev/null and b/doodle/src/main/res/drawable-xxhdpi/doodle_ic_undo.png differ
diff --git a/doodle/src/main/res/drawable/doodle_shape_circle_normal.xml b/doodle/src/main/res/drawable/doodle_shape_circle_normal.xml
index 5012b0a05b6ef4f95204e5bc7dd5fc1397542f3e..c717d5a70e4aa374efb75f4650e202c12dd1a4ab 100644
--- a/doodle/src/main/res/drawable/doodle_shape_circle_normal.xml
+++ b/doodle/src/main/res/drawable/doodle_shape_circle_normal.xml
@@ -2,7 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
     android:shape="oval"
     android:useLevel="false">
-        <solid android:color="#ffffff" /> <!-- 定义填充的颜色值 -->  
+        <stroke
+            android:width="0.5dp"
+            android:color="@color/doodle_btn_border" />
+        <solid android:color="#ffffff" /> <!-- 定义填充的颜色值 -->
         <!--<gradient android:startColor="#dfeeeeee"-->
              <!--android:endColor="#dfcccccc" -->
                      <!--android:angle="270"-->
diff --git a/doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml b/doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml
index d2e8d6f737a03bf0deb104aa56eb0774cc1a1307..47e9b2099c4a9d82e4a320f741a76c3625f1456e 100644
--- a/doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml
+++ b/doodle/src/main/res/drawable/doodle_shape_circle_pressed.xml
@@ -2,5 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval"
     android:useLevel="false">
+        <stroke
+            android:width="0.5dp"
+            android:color="@color/doodle_btn_border" />
         <solid android:color="@color/doodle_btn_pressed_color" /> <!-- 定义填充的颜色值 -->
 </shape>
diff --git a/doodle/src/main/res/drawable/doodle_shape_rect_stroke_normal.xml b/doodle/src/main/res/drawable/doodle_shape_rect_stroke_normal.xml
index 69927a9dc5dd038cb651b307ec783a48ff147a8a..d9d1424b914316b70e3114bcd5bf5aaa60d07527 100644
--- a/doodle/src/main/res/drawable/doodle_shape_rect_stroke_normal.xml
+++ b/doodle/src/main/res/drawable/doodle_shape_rect_stroke_normal.xml
@@ -6,7 +6,7 @@
  <!-- 定义填充的颜色值 -->
     <stroke
         android:width="0.5dp"
-        android:color="#aaaaaa" />
+        android:color="@color/doodle_btn_border" />
 
     <corners android:radius="3dp" />
 
diff --git a/doodle/src/main/res/drawable/doodle_shape_rect_stroke_pressed.xml b/doodle/src/main/res/drawable/doodle_shape_rect_stroke_pressed.xml
index 912bd4fea258f915c91bad81a01146f01ed0cd9a..7249bd4b96964a663ee30f1acfbf3e17ab7e1191 100644
--- a/doodle/src/main/res/drawable/doodle_shape_rect_stroke_pressed.xml
+++ b/doodle/src/main/res/drawable/doodle_shape_rect_stroke_pressed.xml
@@ -4,7 +4,7 @@
         <solid android:color="#bbbbbb" /> <!-- 定义填充的颜色值 -->  
         <stroke
             android:width="0.5dp"
-            android:color="#aaaaaa" />
+            android:color="@color/doodle_btn_border" />
 
         <corners android:radius="3dp" />
 
diff --git a/doodle/src/main/res/layout/doodle_layout.xml b/doodle/src/main/res/layout/doodle_layout.xml
index 0254d80066f36229a1eea6979f914d9eac3d6feb..c85da600f2d3f10584b21d95481afb732e58441b 100644
--- a/doodle/src/main/res/layout/doodle_layout.xml
+++ b/doodle/src/main/res/layout/doodle_layout.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#232323"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent"
+             android:background="#232323"
+             android:fitsSystemWindows="true"
+             android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="fill_parent"
@@ -13,13 +13,13 @@
 
         <include
             android:id="@+id/doodle_title_bar"
-            layout="@layout/doodle_title_bar" />
+            layout="@layout/doodle_title_bar"/>
 
         <FrameLayout
             android:id="@+id/doodle_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/doodle_title_bar" />
+            android:layout_below="@id/doodle_title_bar"/>
 
         <RelativeLayout
             android:id="@+id/doodle_panel"
@@ -30,197 +30,167 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginTop="5dp"
                 android:orientation="vertical">
-                <HorizontalScrollView
-                    android:layout_marginTop="10dp"
+
+
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scrollbars="none">
+                    android:layout_height="@dimen/doodle_btn_pen_size"
+                    android:orientation="horizontal">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="30dp"
-                        android:orientation="horizontal">
-
-                        <Button
-                            android:id="@+id/btn_pen_hand"
-                            android:layout_width="50dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_round"
-                            android:scaleType="centerCrop"
-                            android:text="手绘"
-                            android:textColor="#000000"
-                            android:textSize="13dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_pen_copy"
-                            android:layout_width="50dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_round"
-                            android:scaleType="centerCrop"
-                            android:text="仿制"
-                            android:textColor="#000000"
-                            android:textSize="13dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_pen_eraser"
-                            android:layout_width="50dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_round"
-
-                            android:scaleType="centerCrop"
-                            android:text="橡皮擦"
-                            android:textColor="#000000"
-                            android:textSize="13dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_pen_text"
-                            android:layout_width="50dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_round"
-                            android:scaleType="centerCrop"
-                            android:text="文字"
-                            android:textColor="#000000"
-                            android:textSize="13dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_pen_bitmap"
-                            android:layout_width="50dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_round"
-                            android:scaleType="centerCrop"
-                            android:text="贴图"
-                            android:textColor="#000000"
-                            android:textSize="13dp"
-                            android:visibility="visible" />
-
-                        <FrameLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:minWidth="10dp" />
-
-                        <Button
-                            android:id="@+id/btn_clear"
-                            android:layout_width="40dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_round"
-                            android:text="清屏"
-                            android:textColor="#000000"
-                            android:textSize="13dp" />
-
-                        <Button
-                            android:id="@+id/btn_undo"
-                            android:layout_width="40dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_round"
-                            android:text="撤销"
-                            android:textColor="#000000"
-                            android:textSize="13dp" />
-                    </LinearLayout>
-
-                </HorizontalScrollView>
-                <HorizontalScrollView
-                    android:layout_marginTop="10dp"
+                    <ImageView
+                        android:id="@+id/btn_pen_hand"
+                        android:layout_width="@dimen/doodle_btn_pen_size"
+                        android:layout_height="@dimen/doodle_btn_pen_size"
+                        android:layout_marginRight="5dp"
+                        android:background="@drawable/doodle_btn_effect_round"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_pen"
+                        android:visibility="visible"/>
+
+                    <ImageView
+                        android:id="@+id/btn_pen_copy"
+                        android:layout_width="@dimen/doodle_btn_pen_size"
+                        android:layout_height="@dimen/doodle_btn_pen_size"
+                        android:layout_marginRight="5dp"
+                        android:background="@drawable/doodle_btn_effect_round"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_copy"
+                        android:visibility="visible"/>
+
+                    <ImageView
+                        android:id="@+id/btn_pen_eraser"
+                        android:layout_width="@dimen/doodle_btn_pen_size"
+                        android:layout_height="@dimen/doodle_btn_pen_size"
+                        android:layout_marginRight="5dp"
+                        android:background="@drawable/doodle_btn_effect_round"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_eraser"
+                        android:visibility="visible"/>
+
+                    <ImageView
+                        android:id="@+id/btn_pen_text"
+                        android:layout_width="@dimen/doodle_btn_pen_size"
+                        android:layout_height="@dimen/doodle_btn_pen_size"
+                        android:layout_marginRight="5dp"
+                        android:background="@drawable/doodle_btn_effect_round"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_text"
+                        android:visibility="visible"/>
+
+                    <ImageView
+                        android:id="@+id/btn_pen_bitmap"
+                        android:layout_width="@dimen/doodle_btn_pen_size"
+                        android:layout_height="@dimen/doodle_btn_pen_size"
+                        android:layout_marginRight="5dp"
+                        android:background="@drawable/doodle_btn_effect_round"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_texture"
+                        android:visibility="visible"/>
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:minWidth="10dp"/>
+
+                    <ImageView
+                        android:id="@+id/btn_clear"
+                        android:layout_width="@dimen/doodle_btn_pen_size"
+                        android:layout_height="@dimen/doodle_btn_pen_size"
+                        android:layout_marginRight="5dp"
+                        android:background="@drawable/doodle_btn_effect_round"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_clear"
+                        android:visibility="gone"
+                        />
+
+                    <ImageView
+                        android:id="@+id/btn_undo"
+                        android:layout_width="@dimen/doodle_btn_pen_size"
+                        android:layout_height="@dimen/doodle_btn_pen_size"
+                        android:background="@drawable/doodle_btn_effect_round"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_undo"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/bar_shape_mode"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:scrollbars="none">
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <ImageView
+                        android:layout_marginRight="5dp"
+                        android:id="@+id/btn_hand_write"
+                        android:layout_width="@dimen/doodle_btn_shape_size"
+                        android:layout_height="@dimen/doodle_btn_shape_size"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_handwrite"/>
+
+                    <ImageView
+                        android:layout_marginRight="5dp"
+                        android:id="@+id/btn_arrow"
+                        android:layout_width="@dimen/doodle_btn_shape_size"
+                        android:layout_height="@dimen/doodle_btn_shape_size"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_arrow"/>
+
+                    <ImageView
+                        android:layout_marginRight="5dp"
+                        android:id="@+id/btn_line"
+                        android:layout_width="@dimen/doodle_btn_shape_size"
+                        android:layout_height="@dimen/doodle_btn_shape_size"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_line"/>
+
+                    <ImageView
+                        android:layout_marginRight="5dp"
+                        android:id="@+id/btn_holl_circle"
+                        android:layout_width="@dimen/doodle_btn_shape_size"
+                        android:layout_height="@dimen/doodle_btn_shape_size"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_hollow_circle"/>
+
+                    <ImageView
+                        android:layout_marginRight="5dp"
+                        android:id="@+id/btn_fill_circle"
+                        android:layout_width="@dimen/doodle_btn_shape_size"
+                        android:layout_height="@dimen/doodle_btn_shape_size"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_fill_circle"/>
+
+                    <ImageView
+                        android:layout_marginRight="5dp"
+                        android:id="@+id/btn_holl_rect"
+                        android:layout_width="@dimen/doodle_btn_shape_size"
+                        android:layout_height="@dimen/doodle_btn_shape_size"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_hollow_rect"/>
+
+                    <ImageView
+                        android:layout_marginRight="5dp"
+                        android:id="@+id/btn_fill_rect"
+                        android:layout_width="@dimen/doodle_btn_shape_size"
+                        android:layout_height="@dimen/doodle_btn_shape_size"
+                        android:background="@drawable/doodle_btn_effect_rect_line"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/doodle_ic_fill_rect"/>
+                </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/bar_shape_mode"
-                        android:layout_width="fill_parent"
-                        android:layout_height="30dp"
-                        android:layout_centerHorizontal="true"
-                        android:orientation="horizontal"
-                        android:visibility="visible">
-
-                        <Button
-                            android:id="@+id/btn_hand_write"
-                            android:layout_width="45dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_rect_line"
-                            android:text="手绘"
-                            android:textColor="#000000"
-                            android:textSize="10dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_arrow"
-                            android:layout_width="45dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_rect_line"
-
-                            android:text="箭头"
-                            android:textColor="#000000"
-                            android:textSize="10dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_line"
-                            android:layout_width="45dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_rect_line"
-
-                            android:text="直线"
-                            android:textColor="#000000"
-                            android:textSize="10dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_holl_circle"
-                            android:layout_width="45dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_rect_line"
-
-                            android:scaleType="centerCrop"
-                            android:text="空心圆"
-                            android:textColor="#000000"
-                            android:textSize="10dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_fill_circle"
-                            android:layout_width="45dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_rect_line"
-
-                            android:scaleType="centerCrop"
-                            android:text="实心圆"
-                            android:textColor="#000000"
-                            android:textSize="10dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_holl_rect"
-                            android:layout_width="45dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_rect_line"
-                            android:scaleType="centerCrop"
-                            android:text="空心矩形"
-                            android:textColor="#000000"
-                            android:textSize="10dp"
-                            android:visibility="visible" />
-
-                        <Button
-                            android:id="@+id/btn_fill_rect"
-                            android:layout_width="45dp"
-                            android:layout_height="match_parent"
-                            android:background="@drawable/doodle_btn_effect_rect_line"
-
-                            android:scaleType="centerCrop"
-                            android:text="实心矩形"
-                            android:textColor="#000000"
-                            android:textSize="10dp"
-                            android:visibility="visible" />
-                    </LinearLayout>
-                </HorizontalScrollView>
                 <LinearLayout
                     android:id="@+id/doodle_color_container"
                     android:layout_width="wrap_content"
@@ -239,7 +209,7 @@
                         <ImageView
                             android:id="@+id/btn_set_color"
                             android:layout_width="fill_parent"
-                            android:layout_height="fill_parent" />
+                            android:layout_height="fill_parent"/>
                     </FrameLayout>
 
                     <SeekBar
@@ -253,7 +223,7 @@
                         android:paddingRight="10dp"
                         android:progressDrawable="@drawable/doodle_seekbar_bg"
                         android:thumb="@drawable/doodle_thumb_seekbarr"
-                        android:thumbOffset="0dp" />
+                        android:thumbOffset="0dp"/>
 
                     <TextView
                         android:id="@+id/paint_size_text"
@@ -264,14 +234,14 @@
                         android:minWidth="40dp"
                         android:text=""
                         android:textColor="#ffffff"
-                        android:textSize="14dp" />
+                        android:textSize="14dp"/>
                 </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/doodle_selectable_edit_container"
                 android:layout_width="fill_parent"
-                android:layout_height="@dimen/title_bar_height"
+                android:layout_height="@dimen/doodle_title_bar_height"
                 android:layout_alignParentBottom="true"
                 android:background="#88000000"
                 android:gravity="center"
@@ -287,7 +257,7 @@
                     android:gravity="center"
                     android:text="@string/doodle_edit"
                     android:textColor="#ffffff"
-                    android:textSize="16dp" />
+                    android:textSize="16dp"/>
 
                 <TextView
                     android:id="@+id/doodle_selectable_bottom"
@@ -298,7 +268,7 @@
                     android:gravity="center"
                     android:text="@string/doodle_bottom"
                     android:textColor="#ffffff"
-                    android:textSize="16dp" />
+                    android:textSize="16dp"/>
 
                 <TextView
                     android:id="@+id/doodle_selectable_top"
@@ -309,7 +279,7 @@
                     android:gravity="center"
                     android:text="@string/doodle_top"
                     android:textColor="#ffffff"
-                    android:textSize="16dp" />
+                    android:textSize="16dp"/>
 
                 <TextView
                     android:id="@+id/doodle_selectable_remove"
@@ -320,7 +290,7 @@
                     android:gravity="center"
                     android:text="@string/doodle_remove"
                     android:textColor="#ffffff"
-                    android:textSize="16dp" />
+                    android:textSize="16dp"/>
             </LinearLayout>
         </RelativeLayout>
 
diff --git a/doodle/src/main/res/layout/doodle_title_bar.xml b/doodle/src/main/res/layout/doodle_title_bar.xml
index 447f659e30f1fa2c5dfc2ce27f3f3900d5dc770c..ce954712e546934a5c03f621c9463a4434b7bc92 100644
--- a/doodle/src/main/res/layout/doodle_title_bar.xml
+++ b/doodle/src/main/res/layout/doodle_title_bar.xml
@@ -8,13 +8,13 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/title_bar_height"
+        android:layout_height="@dimen/doodle_title_bar_height"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_back"
-            android:layout_width="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
             android:layout_height="match_parent"
             android:scaleType="centerInside"
             android:src="@drawable/doodle_btn_back"
@@ -47,8 +47,8 @@
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_rotate"
-            android:layout_width="@dimen/title_bar_height"
-            android:layout_height="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
+            android:layout_height="@dimen/doodle_title_bar_height"
             android:padding="5dp"
             android:scaleType="fitXY"
             android:src="@drawable/doodle_rotate"
@@ -58,8 +58,8 @@
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_hide_panel"
-            android:layout_width="@dimen/title_bar_height"
-            android:layout_height="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
+            android:layout_height="@dimen/doodle_title_bar_height"
             android:padding="13dp"
             android:scaleType="fitCenter"
             android:src="@drawable/doodle_btn_effect_panel"
@@ -69,7 +69,7 @@
 
         <cn.forward.androids.views.MaskImageView
             android:id="@+id/doodle_btn_finish"
-            android:layout_width="@dimen/title_bar_height"
+            android:layout_width="@dimen/doodle_title_bar_height"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             android:src="@drawable/doodle_btn_finish"
diff --git a/doodle/src/main/res/values/color.xml b/doodle/src/main/res/values/color.xml
index 0dd14bc96e7e25d0a897410d05dae26dce30a364..bf7c64834d54d1f37159ea92355831a6013bca45 100644
--- a/doodle/src/main/res/values/color.xml
+++ b/doodle/src/main/res/values/color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="doodle_btn_pressed_color">#dfffd943</color>
-
+    <color name="doodle_btn_pressed_color">#ffffd943</color>
     <color name="doodle_btn_text">#000000</color>
+    <color name="doodle_btn_border">#88cccccc</color>
 </resources>
\ No newline at end of file
diff --git a/doodle/src/main/res/values/dimen.xml b/doodle/src/main/res/values/dimen.xml
index 78aab82f2f219200c411d6d9e89fe689774def1a..afc5dfbe02e3a446823de87ef209036a06029dbc 100644
--- a/doodle/src/main/res/values/dimen.xml
+++ b/doodle/src/main/res/values/dimen.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="title_bar_height">50dp</dimen>
+    <dimen name="doodle_title_bar_height">50dp</dimen>
+    <dimen name="doodle_btn_pen_size">32dp</dimen>
+    <dimen name="doodle_btn_shape_size">30dp</dimen>
 </resources>
\ No newline at end of file