diff --git a/src/bin/ephoto_cropper.c b/src/bin/ephoto_cropper.c
index 3845195..c5a2cbe 100644
--- a/src/bin/ephoto_cropper.c
+++ b/src/bin/ephoto_cropper.c
@@ -9,6 +9,8 @@ struct _Ephoto_Cropper
    Evas_Object *layout;
    int startx;
    int starty;
+   int startcx;
+   int startcy;
    int offsetx;
    int offsety;
 };
@@ -30,41 +32,29 @@ _cropper_both_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *e
 
    if (!strcmp(source, "handle1"))
      {
-        mx -= ec->offsetx;
-        mx -= cx;
-        my -= ec->offsety;
-        my -= cy;
         cw -= nx;
         ch -= ny;
      }
-   if (!strcmp(source, "handle3"))
+   else if (!strcmp(source, "handle3"))
      {
-        mx = nx;
-        my -= ec->offsety;
-        my -= cy;
         cw += nx;
         ch -= ny;
      }
    else if (!strcmp(source, "handle5"))
      {
-        mx = nx;
-        my = ny;
         cw += nx;
         ch += ny;
      }
    else if (!strcmp(source, "handle7"))
      {
-        mx -= ec->offsetx;
-        mx -= cx;
-        my = ny;
         cw -= nx;
         ch += ny;
      }
    
    msg = alloca(sizeof(Edje_Message_Int_Set) + (4*sizeof(int)));
    msg->count = 4;
-   msg->val[0] = mx;
-   msg->val[1] = my;
+   msg->val[0] = nx;
+   msg->val[1] = ny;
    msg->val[2] = cw;
    msg->val[3] = ch;
    edje_object_message_send(elm_layout_edje_get(ec->layout), EDJE_MESSAGE_INT_SET, 1, msg);
@@ -91,6 +81,8 @@ _cropper_resize_both(void *data, Evas_Object *obj EINA_UNUSED, const char *emiss
    ec->offsety = my - cy;
    ec->startx = mx;
    ec->starty = my;
+   ec->startcx = cx;
+   ec->startcy = cy;
 
    edje_object_signal_callback_add(ec->cropper, "mouse,move", source, _cropper_both_mouse_move, ec);
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", source, _cropper_both_mouse_up, ec);
@@ -111,20 +103,13 @@ _cropper_horiz_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *
    ec->startx = mx;
 
    if (!strcmp(source, "handle8"))
-     {
-        mx -= ec->offsetx;
-        mx -= cx;
-        cw -= nx;
-     }
+     cw -= nx;
    else if (!strcmp(source, "handle4"))
-     {
-        mx = nx;
-        cw += nx;
-     }
+     cw += nx;
 
    msg = alloca(sizeof(Edje_Message_Int_Set) + (4*sizeof(int)));
    msg->count = 4;
-   msg->val[0] = mx;
+   msg->val[0] = nx;
    msg->val[1] = 0;
    msg->val[2] = cw;
    msg->val[3] = ch;
@@ -153,7 +138,8 @@ _cropper_resize_horiz(void *data, Evas_Object *obj EINA_UNUSED, const char *emis
    ec->offsety = my - cy;
    ec->startx = mx;
    ec->starty = my;
-
+   ec->startcx = cx;
+   ec->startcy = cy;
 
    edje_object_signal_callback_add(ec->cropper, "mouse,move", source, _cropper_horiz_mouse_move, ec);
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", source, _cropper_horiz_mouse_up, ec);
@@ -174,21 +160,14 @@ _cropper_vert_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *e
    ec->starty = my;
 
    if (!strcmp(source, "handle2"))
-     {
-        my -= ec->offsety;
-        my -= cy;
-        ch -= ny;
-     }
+     ch -= ny;
    else if (!strcmp(source, "handle6"))
-     {
-        my = ny;
-        ch += ny;
-     }
-
+     ch += ny;
+   
    msg = alloca(sizeof(Edje_Message_Int_Set) + (4*sizeof(int)));
    msg->count = 4;
    msg->val[0] = 0;
-   msg->val[1] = my;
+   msg->val[1] = ny;
    msg->val[2] = cw;
    msg->val[3] = ch;
    edje_object_message_send(elm_layout_edje_get(ec->layout), EDJE_MESSAGE_INT_SET, 1, msg);
@@ -215,6 +194,8 @@ _cropper_resize_vert(void *data, Evas_Object *obj EINA_UNUSED, const char *emiss
    ec->offsety = my - cy;
    ec->startx = mx;
    ec->starty = my;
+   ec->startcx = cx;
+   ec->startcy = cy;
 
    edje_object_signal_callback_add(ec->cropper, "mouse,move", source, _cropper_vert_mouse_move, ec);
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", source, _cropper_vert_mouse_up, ec);
@@ -264,6 +245,8 @@ _cropper_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EIN
    ec->starty = my;
    ec->offsetx = mx - cx;
    ec->offsety = my - cy;
+   ec->startcx = cx;
+   ec->startcy = cy;
 
    edje_object_signal_callback_add(ec->cropper, "mouse,move", "dragger", _cropper_mouse_move, ec);
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", "dragger", _cropper_mouse_up, ec);
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index ecd3703..dd4d6e0 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -752,10 +752,7 @@ static void _apply_crop(void *data, Evas_Object *obj EINA_UNUSED, void *event_in
             efreet_mime_type_get(tmp_path), nw, nh, _ephoto_get_file_size(tmp_path));
    elm_object_text_set(sb->infolabel, info);
 
-   if (nw < sw && nh < sh)
-           _zoom_set(sb, 1.0);
-   else
-           _zoom_fit(sb);
+   _zoom_fit(sb);
 
    evas_object_del(win);
 }
@@ -1144,17 +1141,7 @@ ephoto_single_browser_entry_set(Evas_Object *obj, Ephoto_Entry *entry)
    _ephoto_single_browser_recalc(sb);
 
    if (sb->viewer)
-     {
-        Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
-        Evas_Coord sw, sh, iw, ih; 
-        
-        evas_object_geometry_get(sb->table, 0, 0, &sw, &sh);
-        evas_object_image_size_get(elm_image_object_get(v->image), &iw, &ih);
-        if (iw < sw && ih < sh)
-           _zoom_set(sb, 1.0);
-        else
-           _zoom_fit(sb);
-     }
+     _zoom_fit(sb);
 }
 
 void