diff --git a/AndroidManifest.xml.jinja2 b/AndroidManifest.xml.jinja2
index c349b8b..edf9425 100644
--- a/AndroidManifest.xml.jinja2
+++ b/AndroidManifest.xml.jinja2
@@ -210,7 +210,7 @@
         </activity-alias>
 
         <activity android:name="com.android.browser.BookmarkSearch"
-                  android:label="@string/bookmarks_search"
+                  android:label="@string/application_name"
                   android:stateNotNeeded="true"
                   android:theme="@android:style/Theme.NoDisplay"
                   android:excludeFromRecents="true">
@@ -260,7 +260,7 @@
 
         <!-- For creating new folder in bookmarks page -->
         <activity android:name="com.android.browser.AddBookmarkFolder"
-                  android:label="@string/save_bookmark_folder"
+                  android:label="@string/new_folder"
                   android:theme="@style/DialogWhenLarge"
                   android:configChanges="orientation|keyboardHidden|screenSize">
                   <intent-filter>
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index d678713..1d42b7d 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -179,7 +179,7 @@
         android:orientation="horizontal" >
 
         <Button
-            android:id="@+id/download_cancle"
+            android:id="@+id/download_cancel"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index 0f91a0c..7f1150a 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -94,7 +94,7 @@
         downloadEstimateSize = (TextView) findViewById(R.id.download_estimate_size_content);
         downloadEstimateTime = (TextView) findViewById(R.id.download_estimate_time_content);
         downloadStart = (Button) findViewById(R.id.download_start);
-        downloadCancel = (Button) findViewById(R.id.download_cancle);
+        downloadCancel = (Button) findViewById(R.id.download_cancel);
         downloadPathET.setOnClickListener(downloadPathListener);
         downloadStart.setOnClickListener(downloadStartListener);
         downloadCancel.setOnClickListener(downloadCancelListener);