diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index 7ea5d3c57fb..1376aec40c7 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -1398,17 +1398,11 @@ static void do_info_rendermenu(void *arg, int event)
 	case 1:
 		BIF_do_render(1);
 		break;
-	case 2:
-		if(select_area(SPACE_VIEW3D)) {
-			BIF_do_ogl_render(curarea->spacedata.first, 0 );
-		}
-			break;
-		case 3:
-		if(select_area(SPACE_VIEW3D)) {
-			BIF_do_ogl_render(curarea->spacedata.first, 1 );
-		}
-			break;
-		case 4:
+
+		/* note: dont use select_area() for setting active areas for opengl render */
+		/* its hackish and instable... code here was removed */
+	
+	case 4:
 		BIF_toggle_render_display();
 		break;
 	case 5:
@@ -1467,11 +1461,6 @@ static uiBlock *info_rendermenu(void *arg_unused)
 
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "OpenGL Preview Current Frame",0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "OpenGL Preview Animation",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-
-	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Render Buffer|F11",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Rendered Animation",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
 
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 20fec718658..91530da7041 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -3100,27 +3100,20 @@ void view3d_buttons(void)
 
 		/* LOCK */
 		uiDefIconButS(block, ICONTOG, B_SCENELOCK, ICON_UNLOCKED, xco+=XIC,0,XIC,YIC, &(G.vd->scenelock), 0, 0, 0, 0, "Locks layers and used Camera to Scene");
-		xco+= 14;
+		xco+= XIC+10;
 
 	}
-	else xco+= (10+1)*(XIC/2)+10+4;
-
-	/* VIEWMOVE */
-	/*
-	uiDefIconButI(block, TOG, B_VIEWTRANS, ICON_VIEWMOVE, xco+=XIC,0,XIC,YIC, &viewmovetemp, 0, 0, 0, 0, "Translates view (SHIFT+MiddleMouse)");
-	uiDefIconButI(block, TOG, B_VIEWZOOM, ICON_VIEWZOOM,	xco+=XIC,0,XIC,YIC, &viewmovetemp, 0, 0, 0, 0, "Zooms view (CTRL+MiddleMouse)");
-	*/
+	else xco+= (10+1)*(XIC/2)+10;
 	
 	if(G.obedit && (OBACT->type == OB_MESH || OBACT->type == OB_CURVE || OBACT->type == OB_SURF || OBACT->type == OB_LATTICE)) {
 		extern int prop_mode;
-		xco+= 14;
-		//uiDefIconButI(block, ICONTOG|BIT|14, B_PROPTOOL, ICON_GRID, xco+=XIC,0,XIC,YIC, &G.f, 0, 0, 0, 0, "Toggles Proportional Vertex Editing (OKEY)");
 		if(G.f & G_PROPORTIONAL) {
 			uiDefIconTextButI(block, ICONTEXTROW,B_REDR, ICON_SHARPCURVE, propfalloff_pup(), xco,0,XIC+10,YIC, &(prop_mode), 0, 1.0, 0, 0, "Proportional Edit Falloff (Hotkey: Shift O) ");
-			// uiDefIconButI(block, ROW, 0, ICON_SHARPCURVE, xco+=XIC,0,XIC,YIC, &prop_mode, 4.0, 0.0, 0, 0, "Sharp Proportional falloff (Hotkey: Shift O)");
-			// uiDefIconButI(block, ROW, 0, ICON_SMOOTHCURVE,	xco+=XIC,0,XIC,YIC, &prop_mode, 4.0, 1.0, 0, 0, "Smooth Proportional falloff (Hotkey: Shift O)");
+			xco+= XIC+20;
 		}
 	}
+
+	uiDefIconBut(block, BUT, B_VIEWRENDER, ICON_SCENE_DEHLT, xco,0,XIC,YIC, NULL, 0, 1.0, 0, 0, "Render this window (hold CTRL for anim)");
 	
 
 	/* Always do this last */
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c
index 533530bf28b..9746a80982b 100644
--- a/source/blender/src/resources.c
+++ b/source/blender/src/resources.c
@@ -126,18 +126,19 @@ static void icon_draw_blended(Icon *icon, unsigned char blendcol[3])
 
 static void icon_draw_blended(Icon *icon, char *blendcol, int shade)
 {
-	float r, g, b;
+	/* commented out, for now only alpha (ton) */
+//	float r, g, b;
 	
-	r= (-shade + (float)blendcol[0])/180.0;
-	g= (-shade + (float)blendcol[1])/180.0;
-	b= (-shade + (float)blendcol[2])/180.0;
+//	r= (-shade + (float)blendcol[0])/180.0;
+//	g= (-shade + (float)blendcol[1])/180.0;
+//	b= (-shade + (float)blendcol[2])/180.0;
 	
 //	glPixelTransferf(GL_RED_SCALE, r>0.0?r:0.0);
 //	glPixelTransferf(GL_GREEN_SCALE, g>0.0?g:0.0);
 //	glPixelTransferf(GL_BLUE_SCALE, b>0.0?b:0.0);
 
 	if(shade < 0) {
-		r= (128+shade)/128.0;
+		float r= (128+shade)/128.0;
 		glPixelTransferf(GL_ALPHA_SCALE, r);
 	}