|  | @@ -28,13 +28,20 @@ public class SingleScreenActivity extends BaseReactActivity {
 | 
	
		
			
			| 28 | 28 |  
 | 
	
		
			
			| 29 | 29 |          Screen screen = (Screen) getIntent().getSerializableExtra(EXTRA_SCREEN);
 | 
	
		
			
			| 30 | 30 |          mNavigatorId = screen.navigatorId;
 | 
	
		
			
			| 31 |  | -        setupToolbar(screen);
 | 
	
		
			
			| 32 | 31 |  
 | 
	
		
			
			| 33 | 32 |          mScreenStack = new ScreenStack(this);
 | 
	
		
			
			| 34 | 33 |          FrameLayout contentFrame = (FrameLayout) findViewById(R.id.contentFrame);
 | 
	
		
			
			| 35 | 34 |          assert contentFrame != null;
 | 
	
		
			
			| 36 | 35 |          contentFrame.addView(mScreenStack);
 | 
	
		
			
			| 37 | 36 |          mScreenStack.push(screen);
 | 
	
		
			
			|  | 37 | +
 | 
	
		
			
			|  | 38 | +        // Setup Toolbar after it's measured since icon height is dependent on Toolbar height
 | 
	
		
			
			|  | 39 | +        contentFrame.post(new Runnable() {
 | 
	
		
			
			|  | 40 | +            @Override
 | 
	
		
			
			|  | 41 | +            public void run() {
 | 
	
		
			
			|  | 42 | +                setupToolbar(getCurrentScreen());
 | 
	
		
			
			|  | 43 | +            }
 | 
	
		
			
			|  | 44 | +        });
 | 
	
		
			
			| 38 | 45 |      }
 | 
	
		
			
			| 39 | 46 |  
 | 
	
		
			
			| 40 | 47 |      protected void setupToolbar(Screen screen) {
 |