diff --git a/java/res/layout/dictionary_line.xml b/java/res/layout/dictionary_line.xml
index 428a3a139..26924a52d 100644
--- a/java/res/layout/dictionary_line.xml
+++ b/java/res/layout/dictionary_line.xml
@@ -78,6 +78,8 @@
   <com.android.inputmethod.dictionarypack.ButtonSwitcher
       android:id="@+android:id/wordlist_button_switcher"
       android:layout_weight="0"
+      android:layout_marginStart="13dip"
+      android:layout_marginLeft="13dip"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content">
     <Button
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java b/java/src/com/android/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java
index 307749121..88b5032e3 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java
+++ b/java/src/com/android/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java
@@ -123,6 +123,7 @@ public class DictionaryDownloadProgressBar extends ProgressBar {
                 final UpdateHelper updateHelper = new UpdateHelper();
                 final Query query = new Query().setFilterById(mId);
                 int lastProgress = 0;
+                setIndeterminate(true);
                 while (!isInterrupted()) {
                     final Cursor cursor = mDownloadManager.query(query);
                     if (null == cursor) {
@@ -156,6 +157,7 @@ public class DictionaryDownloadProgressBar extends ProgressBar {
             private int mProgress;
             @Override
             public void run() {
+                setIndeterminate(false);
                 setProgress(mProgress);
             }
             public void setProgressFromAnotherThread(final int progress) {