diff --git a/client/CCastleInterface.cpp b/client/CCastleInterface.cpp
index f5c366d8a..876e1138e 100644
--- a/client/CCastleInterface.cpp
+++ b/client/CCastleInterface.cpp
@@ -413,7 +413,7 @@ CCastleInterface::CCastleInterface(const CGTownInstance * Town)
 	animval = 0;
 
 	//garrison
-	garr = new CGarrisonInt(pos.x+305,pos.y+387,4,32,townInt,243,13,town,town->visitingHero);
+	garr = new CGarrisonInt(pos.x+305,pos.y+387,4,Point(0,96),townInt,Point(62,374),town,town->visitingHero);
 
 	townlist = new CTownList(3,pos.x+744,pos.y+414,"IAM014.DEF","IAM015.DEF");//744,526);
 	exit = new AdventureMapButton
diff --git a/client/CHeroWindow.cpp b/client/CHeroWindow.cpp
index 4a33dcf89..0ffb6510a 100644
--- a/client/CHeroWindow.cpp
+++ b/client/CHeroWindow.cpp
@@ -203,7 +203,7 @@ void CHeroWindow::setHero(const CGHeroInstance *hero)
 	portraitArea->text = hero->getBiography();
 
 	delete garr;
-	/*gar4button->owner = */garr = new CGarrisonInt(pos.x+80, pos.y+493, 8, 0, curBack, 15, 485, curHero);
+	/*gar4button->owner = */garr = new CGarrisonInt(pos.x+80, pos.y+493, 8, Point(), curBack, Point(65,8), curHero);
 	garr->update = false;
 	gar4button->callback =  boost::bind(&CGarrisonInt::splitClick,garr);//actualization of callback function
 
diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
index 5546af015..d0e6bedbe 100644
--- a/client/CPlayerInterface.cpp
+++ b/client/CPlayerInterface.cpp
@@ -61,7 +61,6 @@ using namespace CSDL_Ext;
 
 void processCommand(const std::string &message, CClient *&client);
 
-extern TTF_Font * GEOR16;
 extern std::queue<SDL_Event*> events;
 extern boost::mutex eventsM;
 
diff --git a/client/GUIBase.h b/client/GUIBase.h
index 890281992..873828375 100644
--- a/client/GUIBase.h
+++ b/client/GUIBase.h
@@ -160,6 +160,24 @@ struct Rect : public SDL_Rect
 		y += p.y;
 		return *this;
 	}
+	Rect& operator+=(const Point &p) //works as operator+
+	{
+		x += p.x;
+		y += p.y;
+		return *this;
+	}
+	Rect& operator-=(const Rect &p) //works as operator+
+	{
+		x -= p.x;
+		y -= p.y;
+		return *this;
+	}
+	Rect& operator-=(const Point &p) //works as operator+
+	{
+		x -= p.x;
+		y -= p.y;
+		return *this;
+	}
 	Rect operator&(const Rect &p) const //rect intersection
 	{
 		bool intersect = true;
diff --git a/client/GUIClasses.cpp b/client/GUIClasses.cpp
index 5c7bfdd90..8925aa2de 100644
--- a/client/GUIClasses.cpp
+++ b/client/GUIClasses.cpp
@@ -291,8 +291,16 @@ CGarrisonSlot::CGarrisonSlot(CGarrisonInt *Owner, int x, int y, int IID, int Upg
 	creature = Creature;
 	pos.x = x;
 	pos.y = y;
-	pos.w = 58;
-	pos.h = 64;
+	if(Owner->smallIcons)
+	{
+		pos.w = 32;
+		pos.h = 32;
+	}
+	else
+	{
+		pos.w = 58;
+		pos.h = 64;
+	}
 	owner = Owner;
 }
 CGarrisonSlot::~CGarrisonSlot()
@@ -302,26 +310,28 @@ CGarrisonSlot::~CGarrisonSlot()
 }
 void CGarrisonSlot::show(SDL_Surface * to)
 {
+	std::map<int,SDL_Surface*> &imgs = (owner->smallIcons ? graphics->smallImgs : graphics->bigImgs);
 	if(creature)
 	{
 		char buf[15];
 		SDL_itoa(count,buf,10);
-		blitAt(graphics->bigImgs[creature->idNumber],pos,to);
-		printToWR(buf,pos.x+56,pos.y+62,GEOR16,zwykly,to);
+		blitAt(imgs[creature->idNumber],pos,to);
+		printToWR(buf, pos.x+pos.w-2, pos.y+pos.h-2, owner->smallIcons ? GEORM : GEOR16, zwykly, to);
 
 		if((owner->highlighted==this)
 			|| (owner->splitting && owner->highlighted->creature == creature))
 		{
-			blitAt(graphics->bigImgs[-1],pos,to);
+			blitAt(imgs[-1],pos,to);
 		}
 	}
 	else //empty slot
 	{
-		SDL_Rect jakis1 = genRect(pos.h,pos.w,owner->offx+ID*(pos.w+owner->interx),owner->offy+upg*(pos.h+owner->intery)), 
-			jakis2 = pos;
-		SDL_BlitSurface(owner->sur,&jakis1,to,&jakis2);
+		Rect pos1 = pos, pos2 = pos; //positions on the garr bg sur and scren
+		pos1 -= owner->surOffset;
+
+		SDL_BlitSurface(owner->sur,&pos1,to,&pos2);
 		if(owner->splitting)
-			blitAt(graphics->bigImgs[-1],pos,to);
+			blitAt(imgs[-1],pos,to);
 	}
 }
 CGarrisonInt::~CGarrisonInt()
@@ -415,6 +425,17 @@ void CGarrisonInt::activeteSlots()
 }
 void CGarrisonInt::createSlots()
 {
+	int h, w; //height and width of slot
+	if(smallIcons)
+	{
+		h = w = 32;
+	}
+	else
+	{
+		h = 64;
+		w = 58;
+	}
+
 	if(set1)
 	{
 		sup = new std::vector<CGarrisonSlot*>(7,(CGarrisonSlot *)(NULL));
@@ -423,12 +444,12 @@ void CGarrisonInt::createSlots()
 			i!=set1->slots.end(); i++)
 		{
 			(*sup)[i->first] =
-				new CGarrisonSlot(this, pos.x + (i->first*(58+interx)), pos.y,i->first, 0, 
+				new CGarrisonSlot(this, pos.x + (i->first*(w+interx)), pos.y,i->first, 0, 
 									&CGI->creh->creatures[i->second.first],i->second.second);
 		}
 		for(int i=0; i<sup->size(); i++)
 			if((*sup)[i] == NULL)
-				(*sup)[i] = new CGarrisonSlot(this, pos.x + (i*(58+interx)), pos.y,i,0,NULL, 0);
+				(*sup)[i] = new CGarrisonSlot(this, pos.x + (i*(w+interx)), pos.y,i,0,NULL, 0);
 	}
 	if(set2)
 	{
@@ -438,12 +459,12 @@ void CGarrisonInt::createSlots()
 			i!=set2->slots.end(); i++)
 		{
 			(*sdown)[i->first] =
-				new CGarrisonSlot(this, pos.x + (i->first*(58+interx)), pos.y + 64 + intery,i->first,1, 
+				new CGarrisonSlot(this, pos.x + (i->first*(w+interx)) + garOffset.x, pos.y + garOffset.y,i->first,1, 
 									&CGI->creh->creatures[i->second.first],i->second.second);
 		}
 		for(int i=0; i<sdown->size(); i++)
 			if((*sdown)[i] == NULL)
-				(*sdown)[i] = new CGarrisonSlot(this, pos.x + (i*(58+interx)), pos.y + 64 + intery,i,1, NULL, 0);
+				(*sdown)[i] = new CGarrisonSlot(this, pos.x + (i*(w+interx)) + garOffset.x,	pos.y + garOffset.y,i,1, NULL, 0);
 	}
 }
 void CGarrisonInt::deleteSlots()
@@ -507,10 +528,10 @@ void CGarrisonInt::splitStacks(int am2)
 		am2);
 
 }
-CGarrisonInt::CGarrisonInt(int x, int y, int inx, int iny, SDL_Surface *&pomsur, int OX, int OY, const CArmedInstance *s1, 
-						   const CArmedInstance *s2)
-	:interx(inx),intery(iny),highlighted(NULL),sur(pomsur),offx(OX),offy(OY),sup(NULL),
-	 sdown(NULL),oup(s1),odown(s2)
+CGarrisonInt::CGarrisonInt(int x, int y, int inx, const Point &garsOffset, SDL_Surface *&pomsur, const Point& SurOffset, 
+						   const CArmedInstance *s1, const CArmedInstance *s2, bool smallImgs)
+	 :interx(inx),garOffset(garsOffset),highlighted(NULL),sur(pomsur),surOffset(surOffset),sup(NULL),
+	 sdown(NULL),oup(s1),odown(s2), smallIcons(smallImgs)
 {
 	active = false;
 	splitting = false;
@@ -3177,7 +3198,7 @@ CGarrisonWindow::CGarrisonWindow( const CArmedInstance *up, const CGHeroInstance
 	pos.w = screen->w;
 	pos.h = screen->h;
 
-	garr = new CGarrisonInt(pos.x+92, pos.y+129, 4, 30, bg, 92, 129, up, down);
+	garr = new CGarrisonInt(pos.x+92, pos.y+129, 4, Point(0,94), bg, Point(0,0), up, down);
 	split = new AdventureMapButton(CGI->generaltexth->tcommands[3],"",boost::bind(&CGarrisonInt::splitClick,garr),pos.x+88,pos.y+314,"IDV6432.DEF");
 	quit = new AdventureMapButton(CGI->generaltexth->tcommands[8],"",boost::bind(&CGarrisonWindow::close,this),pos.x+399,pos.y+314,"IOK6432.DEF",SDLK_RETURN);
 }
@@ -3645,6 +3666,7 @@ void CExchangeWindow::close()
 void CExchangeWindow::activate()
 {
 	quit->activate();
+	garr->activate();
 
 	artifs[0]->activate();
 	artifs[1]->activate();
@@ -3683,6 +3705,7 @@ void CExchangeWindow::activate()
 void CExchangeWindow::deactivate()
 {
 	quit->deactivate();
+	garr->deactivate();
 
 	artifs[0]->deactivate();
 	artifs[1]->deactivate();
@@ -3735,6 +3758,8 @@ void CExchangeWindow::show(SDL_Surface * to)
 	{
 		questlogButton[g]->show(to);
 	}
+
+	garr->show(to);
 }
 
 void CExchangeWindow::questlog(int whichHero)
@@ -3872,6 +3897,9 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) //c-tor
 	//statusbar
 	ourBar = new CStatusBar(pos.x + 3, pos.y + 577, "TSTATBAR.bmp", 726);
 
+	//garrison interface
+	garr = new CGarrisonInt(pos.x + 69, pos.y + 131, 4, Point(418,0), bg, Point(0,0), heroInst[0],heroInst[1], true);
+
 	delete un32;
 	delete skilldef;
 }
@@ -3883,6 +3911,7 @@ CExchangeWindow::~CExchangeWindow() //d-tor
 	delete artifs[0];
 	delete artifs[1];
 
+	delete garr;
 	delete ourBar;
 
 	for(int g=0; g<ARRAY_COUNT(secSkillAreas); g++)
diff --git a/client/GUIClasses.h b/client/GUIClasses.h
index c4c487e84..aa5c79871 100644
--- a/client/GUIClasses.h
+++ b/client/GUIClasses.h
@@ -197,12 +197,15 @@ public:
 class CGarrisonInt :public CIntObject
 {
 public:
-	int interx, intery; //intervals between slots
-	CGarrisonSlot *highlighted; //choosen slot
+	int interx; //space between slots
+	Point garOffset, //offset between garrisons (not used if only one hero)
+		surOffset; //offset between garrison position on the bg surface and position on the screen
+	CGarrisonSlot *highlighted; //chosen slot
 
-	SDL_Surface *&sur; //TODO: comment me
-	int offx, offy, p2; //TODO: comment me
-	bool ignoreEvent, update, active, splitting, pb;
+	SDL_Surface *&sur; //bg surface
+	int p2; //TODO: comment me
+	bool ignoreEvent, update, active, splitting, pb, 
+		smallIcons; //true - 32x32 imgs, false - 58x64
 
 	const CCreatureSet *set1; //top set of creatures
 	const CCreatureSet *set2; //bottom set of creatures
@@ -222,7 +225,7 @@ public:
 	void splitClick(); //handles click on split button
 	void splitStacks(int am2); //TODO: comment me
 
-	CGarrisonInt(int x, int y, int inx, int iny, SDL_Surface *&pomsur, int OX, int OY, const CArmedInstance *s1, const CArmedInstance *s2=NULL); //c-tor
+	CGarrisonInt(int x, int y, int inx, const Point &garsOffset, SDL_Surface *&pomsur, const Point &SurOffset, const CArmedInstance *s1, const CArmedInstance *s2=NULL, bool smallImgs = false); //c-tor
 	~CGarrisonInt(); //d-tor
 };
 
@@ -668,7 +671,7 @@ public:
 	~CGarrisonWindow(); //d-tor
 };
 
-class CExchangeWindow : public CIntObject, public IShowActivable
+class CExchangeWindow : public CIntObject, public CWindowWithGarrison
 {
 	CStatusBar * ourBar; //internal statusbar
 
diff --git a/hch/CObjectHandler.cpp b/hch/CObjectHandler.cpp
index 8ad524464..7c14fb3f0 100644
--- a/hch/CObjectHandler.cpp
+++ b/hch/CObjectHandler.cpp
@@ -598,6 +598,8 @@ bool CGHeroInstance::needsLastStack() const
 }
 void CGHeroInstance::onHeroVisit(const CGHeroInstance * h) const
 {
+	if(h == this) return; //exclude potential self-visiting
+
 	if (ID == HEROI_TYPE) //hero
 	{
 		//TODO: check for allies