Index: picedit.c
==================================================================
--- picedit.c
+++ picedit.c
@@ -831,11 +831,11 @@
                 xx=x; yy=y;
               } else if(xx!=-1) {
                 p=pict[sel]->data+(j=pict[sel]->size);
                 if(xx<x) i=x,x=xx,xx=i;
                 if(yy<y) i=y,y=yy,yy=i;
-                while(y<yy) memset(p+y*j+x,cc,xx+1-x),y++;
+                while(y<=yy) memset(p+y*j+x,cc,xx+1-x),y++;
                 xx=yy=-1;
               }
               break;
             case 6: // Circle
               if(i==1) {
@@ -1573,11 +1573,12 @@
   int i,n;
   sqlite3_create_function(userdb,"VALID_NAME",1,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_valid_name,0,0);
   sqlite3_create_module(userdb,"GRAPH",&vt_graph,0);
   init_palette();
   optionquery[1]=Q_imageSize;
-  *gsizes=picture_size=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"16",0,10);
+  picture_size=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"16",0,10);
+  if(!*gsizes) *gsizes=picture_size;
   set_cursor(XC_arrow);
   set_caption();
   i=sqlite3_prepare_v3(userdb,"SELECT `ID`,SUBSTR(`NAME`,1,LENGTH(`NAME`)-4),`TYPE` FROM `PICEDIT` WHERE `TYPE` ORDER BY `NAME` LIMIT ?1 OFFSET ?2;",-1,SQLITE_PREPARE_PERSISTENT,&st,0);
   if(i) fatal("SQL error (%d): %s\n",i,sqlite3_errmsg(userdb));
   ids=calloc(screen->h/8,sizeof(sqlite3_int64));