diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp
index 9692d08882..eb060aa6b8 100644
--- a/scene/gui/tabs.cpp
+++ b/scene/gui/tabs.cpp
@@ -32,25 +32,23 @@
 
 Size2 Tabs::get_minimum_size() const {
 
-
 	Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
 	Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
 	Ref<Font> font = get_font("font");
 
-	Size2 ms(0, MAX( tab_bg->get_minimum_size().height,tab_fg->get_minimum_size().height)+font->get_height() );
-
-//	h+=MIN( get_constant("label_valign_fg"), get_constant("label_valign_bg") );
+	Size2 ms(0, MAX(tab_bg->get_minimum_size().height, tab_fg->get_minimum_size().height)+font->get_height());
 
 	for(int i=0;i<tabs.size();i++) {
 
 		Ref<Texture> tex = tabs[i].icon;
 		if (tex.is_valid()) {
-			ms.height = MAX( ms.height, tex->get_size().height );
+			ms.height = MAX(ms.height, tex->get_size().height);
 			if (tabs[i].text!="")
 				ms.width+=get_constant("hseparation");
-
 		}
+
 		ms.width+=font->get_string_size(tabs[i].text).width;
+
 		if (current==i)
 			ms.width+=tab_fg->get_minimum_size().width;
 		else
@@ -58,28 +56,26 @@ Size2 Tabs::get_minimum_size() const {
 
 		if (tabs[i].right_button.is_valid()) {
 			Ref<Texture> rb=tabs[i].right_button;
-			Size2 bms = rb->get_size();//+get_stylebox("button")->get_minimum_size();
+			Size2 bms = rb->get_size();
 			bms.width+=get_constant("hseparation");
-
 			ms.width+=bms.width;
 			ms.height=MAX(bms.height+tab_bg->get_minimum_size().height,ms.height);
 		}
 
 		if (cb_displaypolicy==CLOSE_BUTTON_SHOW_ALWAYS || (cb_displaypolicy==CLOSE_BUTTON_SHOW_ACTIVE_ONLY && i==current)) {
 			Ref<Texture> cb=get_icon("close");
-			Size2 bms = cb->get_size();//+get_stylebox("button")->get_minimum_size();
+			Size2 bms = cb->get_size();
 			bms.width+=get_constant("hseparation");
 			ms.width+=bms.width;
 			ms.height=MAX(bms.height+tab_bg->get_minimum_size().height,ms.height);
 		}
 	}
 
-	ms.width=0; //should make this optional
+	ms.width=0; //TODO: should make this optional
 	return ms;
 }
 
 
-
 void Tabs::_input_event(const InputEvent& p_event) {
 
 	if (p_event.type==InputEvent::MOUSE_MOTION) {
@@ -101,15 +97,14 @@ void Tabs::_input_event(const InputEvent& p_event) {
 			}
 		}
 
-
-
+		// test hovering to display right or close button
 		int hover_buttons=-1;
 		hover=-1;
 		for(int i=0;i<tabs.size();i++) {
 
-			// test hovering tab to display close button if policy says so
+			if (i<offset)
+				continue;
 
-			// test hovering right button and close button
 			if (tabs[i].rb_rect.has_point(pos)) {
 				rb_hover=i;
 				cb_hover=-1;
@@ -123,11 +118,9 @@ void Tabs::_input_event(const InputEvent& p_event) {
 				break;
 			}
 
-
-
 		}
 
-		if (hover_buttons == -1) {	// no hover
+		if (hover_buttons == -1) { // no hover
 			rb_hover= hover_buttons;
 			cb_hover= hover_buttons;
 		}
@@ -137,8 +130,6 @@ void Tabs::_input_event(const InputEvent& p_event) {
 	}
 
 
-
-
 	if (rb_pressing && p_event.type==InputEvent::MOUSE_BUTTON &&
 	    !p_event.mouse_button.pressed &&
 	    p_event.mouse_button.button_index==BUTTON_LEFT) {
@@ -152,9 +143,10 @@ void Tabs::_input_event(const InputEvent& p_event) {
 		update();
 	}
 
+
 	if (cb_pressing && p_event.type==InputEvent::MOUSE_BUTTON &&
-		!p_event.mouse_button.pressed &&
-		p_event.mouse_button.button_index==BUTTON_LEFT) {
+	    !p_event.mouse_button.pressed &&
+	    p_event.mouse_button.button_index==BUTTON_LEFT) {
 
 		if (cb_hover!=-1) {
 			//pressed
@@ -195,12 +187,12 @@ void Tabs::_input_event(const InputEvent& p_event) {
 			}
 		}
 
-
 		int found=-1;
 		for(int i=0;i<tabs.size();i++) {
 
 			if (i<offset)
 				continue;
+
 			if (tabs[i].rb_rect.has_point(pos)) {
 				rb_pressing=true;
 				update();
@@ -213,10 +205,7 @@ void Tabs::_input_event(const InputEvent& p_event) {
 				return;
 			}
 
-			int ofs=tabs[i].ofs_cache;
-			int size = tabs[i].ofs_cache;
 			if (pos.x >=tabs[i].ofs_cache && pos.x<tabs[i].ofs_cache+tabs[i].size_cache) {
-
 				found=i;
 				break;
 			}
@@ -232,8 +221,8 @@ void Tabs::_input_event(const InputEvent& p_event) {
 
 }
 
-void Tabs::_notification(int p_what) {
 
+void Tabs::_notification(int p_what) {
 
 	switch(p_what) {
 
@@ -259,39 +248,20 @@ void Tabs::_notification(int p_what) {
 			Ref<Texture> close=get_icon("close");
 
 			int h = get_size().height;
-
-			int label_valign_fg = get_constant("label_valign_fg");
-			int label_valign_bg = get_constant("label_valign_bg");
-
-
-			int w=0;
-
+			int w = 0;
 			int mw = 0;
 
-			{
-
-
-			//	h+=MIN( get_constant("label_valign_fg"), get_constant("label_valign_bg") );
-
-				for(int i=0;i<tabs.size();i++) {
-
-					int sz = get_tab_width(i);
-
-					tabs[i].ofs_cache=mw;
-					mw+=sz;
-
-
-				}
+			for(int i=0;i<tabs.size();i++) {
 
+				tabs[i].ofs_cache = mw;
+				mw += get_tab_width(i);
 			}
 
 
-
 			if (tab_align==ALIGN_CENTER) {
 				w=(get_size().width-mw)/2;
 			} else if (tab_align==ALIGN_RIGHT) {
 				w=get_size().width-mw;
-
 			}
 
 			if (w<0) {
@@ -311,45 +281,13 @@ void Tabs::_notification(int p_what) {
 
 				if (i<offset)
 					continue;
+
 				tabs[i].ofs_cache=w;
 
-				String s = tabs[i].text;
-				int lsize=0;
-				int slen=font->get_string_size(s).width;
-				lsize+=slen;
+				int lsize = get_tab_width(i);
 
-
-
-				Ref<Texture> icon;
-				if (tabs[i].icon.is_valid()) {
-					icon = tabs[i].icon;
-					if (icon.is_valid()) {
-						lsize+=icon->get_width();
-						if (s!="")
-							lsize+=get_constant("hseparation");
-
-					}
-				}
-
-				if (tabs[i].right_button.is_valid()) {
-					Ref<StyleBox> style = get_stylebox("button");
-					Ref<Texture> rb=tabs[i].right_button;
-
-					lsize+=get_constant("hseparation");
-					//lsize+=style->get_margin(MARGIN_LEFT);
-					lsize+=rb->get_width();
-					//lsize+=style->get_margin(MARGIN_RIGHT);
-
-				}
-
-
-				if (cb_displaypolicy==CLOSE_BUTTON_SHOW_ALWAYS || (cb_displaypolicy==CLOSE_BUTTON_SHOW_ACTIVE_ONLY && i==current)) {
-
-					lsize+=get_constant("hseparation");
-					//lsize+=style->get_margin(MARGIN_LEFT);
-					lsize+=close->get_width();
-					//lsize+=style->get_margin(MARGIN_RIGHT);
-				}
+				String text = tabs[i].text;
+				int slen = font->get_string_size(text).width;
 
 				if (w+lsize > limit) {
 					max_drawn_tab=i-1;
@@ -360,42 +298,39 @@ void Tabs::_notification(int p_what) {
 				}
 
 
-
 				Ref<StyleBox> sb;
-				int va;
 				Color col;
 
 				if (i==current) {
-
 					sb=tab_fg;
-					va=label_valign_fg;
 					col=color_fg;
 				} else {
 					sb=tab_bg;
-					va=label_valign_bg;
 					col=color_bg;
 				}
 
 
-				Size2i sb_ms = sb->get_minimum_size();
-				Rect2 sb_rect = Rect2( w, 0, lsize+sb_ms.width, h);
-				sb->draw(ci, sb_rect );
+				Rect2 sb_rect = Rect2(w, 0, lsize, h);
+				sb->draw(ci, sb_rect);
 
 				w+=sb->get_margin(MARGIN_LEFT);
 
+				Size2i sb_ms = sb->get_minimum_size();
+				Ref<Texture> icon = tabs[i].icon;
 				if (icon.is_valid()) {
 
 					icon->draw(ci, Point2i( w, sb->get_margin(MARGIN_TOP)+((sb_rect.size.y-sb_ms.y)-icon->get_height())/2 ) );
-					if (s!="")
+					if (text!="")
 						w+=icon->get_width()+get_constant("hseparation");
 
 				}
 
-				font->draw(ci, Point2i( w, sb->get_margin(MARGIN_TOP)+((sb_rect.size.y-sb_ms.y)-font->get_height())/2+font->get_ascent() ), s, col );
+				font->draw(ci, Point2i( w, sb->get_margin(MARGIN_TOP)+((sb_rect.size.y-sb_ms.y)-font->get_height())/2+font->get_ascent() ), text, col );
 
 				w+=slen;
 
 				if (tabs[i].right_button.is_valid()) {
+
 					Ref<StyleBox> style = get_stylebox("button");
 					Ref<Texture> rb=tabs[i].right_button;
 
@@ -413,17 +348,12 @@ void Tabs::_notification(int p_what) {
 							style->draw(ci,rb_rect);
 					}
 
-					w+=style->get_margin(MARGIN_LEFT);
-
-					rb->draw(ci,Point2i( w,rb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
+					rb->draw(ci,Point2i( w+style->get_margin(MARGIN_LEFT), rb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
 					w+=rb->get_width();
-					w+=style->get_margin(MARGIN_RIGHT);
 					tabs[i].rb_rect=rb_rect;
 
-
 				}
 
-
 				if (cb_displaypolicy==CLOSE_BUTTON_SHOW_ALWAYS || (cb_displaypolicy==CLOSE_BUTTON_SHOW_ACTIVE_ONLY && i==current)) {
 
 					Ref<StyleBox> style = get_stylebox("button");
@@ -443,11 +373,8 @@ void Tabs::_notification(int p_what) {
 							style->draw(ci,cb_rect);
 					}
 
-					//w+=style->get_margin(MARGIN_LEFT);
-
-					cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
+					cb->draw(ci,Point2i( w+style->get_margin(MARGIN_LEFT), cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
 					w+=cb->get_width();
-					//w+=style->get_margin(MARGIN_RIGHT);
 					tabs[i].cb_rect=cb_rect;
 				}
 
@@ -462,28 +389,26 @@ void Tabs::_notification(int p_what) {
 				int vofs = (get_size().height-incr->get_size().height)/2;
 
 				if (offset>0)
-					draw_texture(hilite_arrow==0?decr_hl:decr,Point2(limit,vofs));
+					draw_texture(hilite_arrow==0 ? decr_hl : decr, Point2(limit,vofs));
 				else
-					draw_texture(decr,Point2(limit,vofs),Color(1,1,1,0.5));
+					draw_texture(decr,Point2(limit,vofs), Color(1,1,1,0.5));
 
 				if (missing_right)
-					draw_texture(hilite_arrow==1?incr_hl:incr,Point2(limit+decr->get_size().width,vofs));
+					draw_texture(hilite_arrow==1 ? incr_hl : incr, Point2(limit+decr->get_size().width,vofs));
 				else
-					draw_texture(incr,Point2(limit+decr->get_size().width,vofs),Color(1,1,1,0.5));
+					draw_texture(incr,Point2(limit+decr->get_size().width,vofs), Color(1,1,1,0.5));
 
 				buttons_visible=true;
 			} else {
 				buttons_visible=false;
 			}
 
-
 		} break;
 	}
 }
 
 int Tabs::get_tab_count() const {
 
-
 	return tabs.size();
 }
 
@@ -492,11 +417,9 @@ void Tabs::set_current_tab(int p_current) {
 
 	ERR_FAIL_INDEX( p_current, get_tab_count() );
 
-    //printf("DEBUG %p: set_current_tab to %i\n", this, p_current);
 	current=p_current;
 
 	_change_notify("current_tab");
-	//emit_signal("tab_changed",current);
 	update();
 }
 
@@ -520,9 +443,9 @@ String Tabs::get_tab_title(int p_tab) const{
 	ERR_FAIL_INDEX_V(p_tab,tabs.size(),"");
 	return tabs[p_tab].text;
 
-
 }
 
+
 void Tabs::set_tab_icon(int p_tab,const Ref<Texture>& p_icon){
 
 	ERR_FAIL_INDEX(p_tab,tabs.size());
@@ -531,6 +454,7 @@ void Tabs::set_tab_icon(int p_tab,const Ref<Texture>& p_icon){
 	minimum_size_changed();
 
 }
+
 Ref<Texture> Tabs::get_tab_icon(int p_tab) const{
 
 	ERR_FAIL_INDEX_V(p_tab,tabs.size(),Ref<Texture>());
@@ -539,7 +463,6 @@ Ref<Texture> Tabs::get_tab_icon(int p_tab) const{
 }
 
 
-
 void Tabs::set_tab_right_button(int p_tab,const Ref<Texture>& p_right_button){
 
 	ERR_FAIL_INDEX(p_tab,tabs.size());
@@ -589,8 +512,6 @@ void Tabs::remove_tab(int p_idx) {
 	if (current>=tabs.size())
 		current=tabs.size()-1;
 
-	//emit_signal("tab_changed",current);
-
 	_ensure_no_over_offset();
 
 }
@@ -614,19 +535,20 @@ int Tabs::get_tab_width(int p_idx) const {
 	Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
 	Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
 	Ref<Font> font = get_font("font");
-	Ref<Texture> close=get_icon("close");
+
 
 	int x=0;
 
 	Ref<Texture> tex = tabs[p_idx].icon;
 	if (tex.is_valid()) {
+		x+=tex->get_width();
 		if (tabs[p_idx].text!="")
 			x+=get_constant("hseparation");
 
 	}
 
-
 	x+=font->get_string_size(tabs[p_idx].text).width;
+
 	if (current==p_idx)
 		x+=tab_fg->get_minimum_size().width;
 	else
@@ -634,17 +556,14 @@ int Tabs::get_tab_width(int p_idx) const {
 
 	if (tabs[p_idx].right_button.is_valid()) {
 		Ref<Texture> rb=tabs[p_idx].right_button;
-		Size2 bms = rb->get_size();//+get_stylebox("button")->get_minimum_size();
-		bms.width+=get_constant("hseparation");
-
-		x+=bms.width;
+		x+=rb->get_width();
+		x+=get_constant("hseparation");
 	}
 
 	if (cb_displaypolicy==CLOSE_BUTTON_SHOW_ALWAYS || (cb_displaypolicy==CLOSE_BUTTON_SHOW_ACTIVE_ONLY && p_idx==current)) {
-
-		Size2 bms = close->get_size();//+get_stylebox("button")->get_minimum_size();
-		bms.width+=get_constant("hseparation");
-		x+=bms.width;
+		Ref<Texture> cb=get_icon("close");
+		x+=cb->get_width();
+		x+=get_constant("hseparation");
 	}
 
 	return x;
@@ -700,11 +619,9 @@ void Tabs::ensure_tab_visible(int p_idx) {
 
 	Ref<Texture> incr = get_icon("increment");
 	Ref<Texture> decr = get_icon("decrement");
-
 	int limit=get_size().width-incr->get_width()-decr->get_width();
 
 
-
 	int x=0;
 	for(int i=0;i<tabs.size();i++) {
 
@@ -750,7 +667,6 @@ void Tabs::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("right_button_pressed",PropertyInfo(Variant::INT,"tab")));
 	ADD_SIGNAL(MethodInfo("tab_close",PropertyInfo(Variant::INT,"tab")));
 
-
 	ADD_PROPERTY( PropertyInfo(Variant::INT, "current_tab", PROPERTY_HINT_RANGE,"-1,4096,1",PROPERTY_USAGE_EDITOR), _SCS("set_current_tab"), _SCS("get_current_tab") );
 
 	BIND_CONSTANT( ALIGN_LEFT );
@@ -774,9 +690,8 @@ Tabs::Tabs() {
 
 	cb_hover=-1;
 	cb_pressing=false;
-	cb_displaypolicy = CLOSE_BUTTON_SHOW_NEVER; // Default : no close button
+	cb_displaypolicy = CLOSE_BUTTON_SHOW_NEVER;
 	offset=0;
 	max_drawn_tab=0;
 
-
 }