diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4725d29..a92fc84 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -72,7 +72,7 @@
     <string name="accessibility_delete_button" msgid="3628162007991023603">"Fjern"</string>
     <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Avinstaller oppdateringen"</string>
     <string name="menu_add" msgid="3065046628354640854">"Legg til"</string>
-    <string name="menu_manage_apps" msgid="2308685199463588895">"Administrer programmer"</string>
+    <string name="menu_manage_apps" msgid="2308685199463588895">"Administrer apper"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Bakgrunnsbilde"</string>
     <string name="menu_search" msgid="4826514464423239041">"Søk"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Varslinger"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e7c18bd..dcbc6d9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -39,7 +39,7 @@
     <!-- Name for all applications running as this uid. -->
     <string name="uid_name">Android Core Apps</string>
     <!-- Default folder name -->
-    <string name="folder_name">Folder</string>
+    <string name="folder_name"></string>
     <!-- Title of dialog that appears after user selects Wallpaper from menu -->
     <string name="chooser_wallpaper">Select wallpaper from</string>
     <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 701b33b..eeb5534 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1984,7 +1984,8 @@
 
         mLauncher.getDragLayer().getLocationInDragLayer(child, mTempXY);
         final int dragLayerX = (int) mTempXY[0] + (child.getWidth() - bmpWidth) / 2;
-        final int dragLayerY = (int) mTempXY[1] + (child.getHeight() - bmpHeight) / 2;
+        int dragLayerY = (int) mTempXY[1] + (child.getHeight() - bmpHeight) / 2;
+        dragLayerY -= (child.getHeight() - b.getHeight()) / 2;
 
         Rect dragRect = null;
         if (child instanceof BubbleTextView) {
@@ -2071,8 +2072,8 @@
             boolean considerTimeout) {
         View dropOverView = target.getChildAt(targetCell[0], targetCell[1]);
 
-        boolean hasntMoved = mDragInfo != null
-                && (mDragInfo.cellX == targetCell[0] && mDragInfo.cellY == targetCell[1]);
+        boolean hasntMoved = mDragInfo != null && (mDragInfo.cellX == targetCell[0] &&
+                mDragInfo.cellY == targetCell[1]) && mDragInfo.screen == indexOfChild(target);
 
         if (dropOverView == null || hasntMoved || (considerTimeout && !mCreateUserFolderOnDrop)) {
             return false;