diff --git a/README.md b/README.md
index f2f6685..6683875 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Daedalus
 ==============
 
-__Through [CuteDNS!](https://www.cutedns.cn) to see the world outside.__
+__See the world outside through [CuteDNS!](https://www.cutedns.cn).__
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -35,4 +35,8 @@ __各位 dalao 见笑了！__
 
 Get Daedalus
 -------------
-__[Releases](https://github.com/iTXTech/Daedalus/releases)__
\ No newline at end of file
+__[Releases](https://github.com/iTXTech/Daedalus/releases)__
+
+Acknowledgements
+-------------
+* __[ClearEditText](https://github.com/MrFuFuFu/ClearEditText)__ by *[MrFuFuFu](https://github.com/MrFuFuFu)*
\ No newline at end of file
diff --git a/app/src/main/java/org/itxtech/daedalus/view/ClearAutoCompleteTextView.java b/app/src/main/java/org/itxtech/daedalus/view/ClearAutoCompleteTextView.java
new file mode 100644
index 0000000..fe73d76
--- /dev/null
+++ b/app/src/main/java/org/itxtech/daedalus/view/ClearAutoCompleteTextView.java
@@ -0,0 +1,119 @@
+package org.itxtech.daedalus.view;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.drawable.DrawableCompat;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.AutoCompleteTextView;
+import org.itxtech.daedalus.R;
+
+/**
+ * Daedalus Project
+ *
+ * @author iTXTech
+ * @link https://itxtech.org
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ */
+public class ClearAutoCompleteTextView extends AutoCompleteTextView implements View.OnTouchListener, View.OnFocusChangeListener, TextWatcher {
+
+    private Drawable mClearTextIcon;
+    private OnFocusChangeListener mOnFocusChangeListener;
+    private OnTouchListener mOnTouchListener;
+
+    public ClearAutoCompleteTextView(final Context context) {
+        super(context);
+        init(context);
+    }
+
+    public ClearAutoCompleteTextView(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public ClearAutoCompleteTextView(final Context context, final AttributeSet attrs, final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    private void init(final Context context) {
+        final Drawable drawable = ContextCompat.getDrawable(context, R.mipmap.ic_clear_grey600_18dp);
+        final Drawable wrappedDrawable = DrawableCompat.wrap(drawable); //Wrap the drawable so that it can be tinted pre Lollipop
+        DrawableCompat.setTint(wrappedDrawable, getCurrentHintTextColor());
+        mClearTextIcon = wrappedDrawable;
+        mClearTextIcon.setBounds(0, 0, mClearTextIcon.getIntrinsicHeight(), mClearTextIcon.getIntrinsicHeight());
+        setClearIconVisible(false);
+        super.setOnTouchListener(this);
+        super.setOnFocusChangeListener(this);
+        addTextChangedListener(this);
+    }
+
+    @Override
+    public void setOnFocusChangeListener(OnFocusChangeListener l) {
+        mOnFocusChangeListener = l;
+    }
+
+    @Override
+    public void setOnTouchListener(OnTouchListener l) {
+        mOnTouchListener = l;
+    }
+
+    @Override
+    public void onFocusChange(View v, boolean hasFocus) {
+        if (hasFocus) {
+            setClearIconVisible(getText().length() > 0);
+        } else {
+            setClearIconVisible(false);
+        }
+        if (mOnFocusChangeListener != null) {
+            mOnFocusChangeListener.onFocusChange(v, hasFocus);
+        }
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent motionEvent) {
+        final int x = (int) motionEvent.getX();
+        if (mClearTextIcon.isVisible() && x > getWidth() - getPaddingRight() - mClearTextIcon.getIntrinsicWidth()) {
+            if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+                setError(null);
+                setText("");
+            }
+            return true;
+        }
+        return mOnTouchListener != null && mOnTouchListener.onTouch(view, motionEvent);
+    }
+
+    @Override
+    public final void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+        if (isFocused()) {
+            setClearIconVisible(text.length() > 0);
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+
+    }
+
+    private void setClearIconVisible(final boolean visible) {
+        mClearTextIcon.setVisible(visible, false);
+        final Drawable[] compoundDrawables = getCompoundDrawables();
+        setCompoundDrawables(
+                compoundDrawables[0],
+                compoundDrawables[1],
+                visible ? mClearTextIcon : null,
+                compoundDrawables[3]);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_server_test.xml b/app/src/main/res/layout/activity_server_test.xml
index 271bc9f..1597061 100644
--- a/app/src/main/res/layout/activity_server_test.xml
+++ b/app/src/main/res/layout/activity_server_test.xml
@@ -32,7 +32,7 @@
                 android:layout_alignParentStart="true" android:layout_marginTop="10dp"
                 android:id="@+id/textView_test_info"
                 android:textSize="18sp"/>
-        <AutoCompleteTextView
+        <org.itxtech.daedalus.view.ClearAutoCompleteTextView
                 android:completionThreshold="1"
                 android:singleLine="true"
                 android:hint="@string/test_test_domain"