diff --git a/YACReader/configuration.cpp b/YACReader/configuration.cpp
index 13e7a9b2..f2145873 100644
--- a/YACReader/configuration.cpp
+++ b/YACReader/configuration.cpp
@@ -33,26 +33,31 @@ void Configuration::load(QSettings * settings)
 		settings->setValue(MAG_GLASS_SIZE,QSize(350,175));
 	if(!settings->contains(ZOOM_LEVEL))
 		settings->setValue(MAG_GLASS_SIZE,QSize(350,175));
-	if(!settings->contains(FIT))
-		settings->setValue(FIT,false);
+	//if(!settings->contains(FIT))
+	//	settings->setValue(FIT,false);
 	if(!settings->contains(FLOW_TYPE))
 		settings->setValue(FLOW_TYPE,0);
 	if(!settings->contains(FULLSCREEN))
 		settings->setValue(FULLSCREEN,false);
+	
+//TODO: Replace this with zoom mode
 	if(!settings->contains(FIT_TO_WIDTH_RATIO))
 		settings->setValue(FIT_TO_WIDTH_RATIO,1);
+	
 	if(!settings->contains(Y_WINDOW_SIZE))
 		settings->setValue(Y_WINDOW_SIZE,QSize(0,0));
 	if(!settings->contains(MAXIMIZED))
 		settings->setValue(MAXIMIZED,false);
 	if(!settings->contains(DOUBLE_PAGE))
 		settings->setValue(DOUBLE_PAGE,false);
-	if(!settings->contains(ADJUST_TO_FULL_SIZE))
-		settings->setValue(ADJUST_TO_FULL_SIZE,false);
+	//if(!settings->contains(ADJUST_TO_FULL_SIZE))
+	//	settings->setValue(ADJUST_TO_FULL_SIZE,false);
 	if(!settings->contains(BACKGROUND_COLOR))
 		settings->setValue(BACKGROUND_COLOR,QColor(40,40,40));
 	if(!settings->contains(ALWAYS_ON_TOP))
 		settings->setValue(ALWAYS_ON_TOP,false);
 	if(!settings->contains(SHOW_TOOLBARS))
 		settings->setValue(SHOW_TOOLBARS, true);
+	if(!settings->contains(FITMODE))
+		settings->setValue(FITMODE, "full_page");
 }
\ No newline at end of file
diff --git a/YACReader/configuration.h b/YACReader/configuration.h
index ba9e1531..559e05d1 100644
--- a/YACReader/configuration.h
+++ b/YACReader/configuration.h
@@ -27,7 +27,7 @@ using namespace YACReader;
 		QSize magnifyingGlassSize;
 		QSize gotoSlideSize;
 		float zoomLevel;
-		bool adjustToWidth;
+		//bool adjustToWidth;
 		bool fullScreen;
 		FlowType flowType;
 		float fitToWidthRatio;
@@ -60,8 +60,21 @@ using namespace YACReader;
 		void setGotoSlideSize(const QSize & gss) { settings->setValue(GO_TO_FLOW_SIZE,gss);}
 		float getZoomLevel() { return settings->value(ZOOM_LEVEL).toFloat();}
 		void setZoomLevel(float zl) { settings->setValue(ZOOM_LEVEL,zl);}
+		float getPageZoomLevel() { return settings->value(PAGE_ZOOM_LEVEL).toFloat();}
+		void setPageZoomLevel(float zl) { settings->setValue(PAGE_ZOOM_LEVEL,zl);}
+		/*
+		//Old fitting modes
 		bool getAdjustToWidth() {return settings->value(FIT).toBool();}
 		void setAdjustToWidth(bool atw=true) {settings->setValue(FIT,atw);}
+		bool getFitToPage() {return settings->value(PAGEFIT).toBool();}
+		void setFitToPage(bool b=true) {settings->setValue(PAGEFIT,b);}
+		bool getAdjustToFullSize(){return settings->value(ADJUST_TO_FULL_SIZE).toBool();}
+		void setAdjustToFullSize(bool b){settings->setValue(ADJUST_TO_FULL_SIZE,b);}
+		*/
+		
+		QString getFitMode() { return settings->value(FITMODE).toString(); }
+		void setFitMode ( QString fitMode ){settings->setValue(FITMODE, fitMode);}
+		
 		FlowType getFlowType(){return (FlowType)settings->value(FLOW_TYPE_SW).toInt();}
 		void setFlowType(FlowType type){settings->setValue(FLOW_TYPE_SW,type);}
 		bool getFullScreen(){return settings->value(FULLSCREEN).toBool();}
@@ -78,8 +91,6 @@ using namespace YACReader;
 		void setDoublePage(bool b){settings->setValue(DOUBLE_PAGE,b);}
 		bool getDoubleMangaPage(){return settings->value(DOUBLE_MANGA_PAGE).toBool();}
 		void setDoubleMangaPage(bool b){settings->setValue(DOUBLE_MANGA_PAGE,b);}
-		bool getAdjustToFullSize(){return settings->value(ADJUST_TO_FULL_SIZE).toBool();}
-		void setAdjustToFullSize(bool b){settings->setValue(ADJUST_TO_FULL_SIZE,b);}
 		QColor getBackgroundColor(){return settings->value(BACKGROUND_COLOR).value<QColor>();}
 		void setBackgroundColor(const QColor& color){settings->value(BACKGROUND_COLOR,color);}
 		bool getAlwaysOnTop(){return settings->value(ALWAYS_ON_TOP).toBool();}
diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index 032f5384..956a18e5 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -107,6 +107,7 @@ MainWindowViewer::~MainWindowViewer()
 	delete showDictionaryAction;
 	delete alwaysOnTopAction;
 	delete adjustToFullSizeAction;
+	delete fitToPageAction;
 	delete showFlowAction;
 
 }
@@ -261,7 +262,7 @@ void MainWindowViewer::createActions()
     adjustHeightAction->setIcon(QIcon(":/images/viewer_toolbar/toHeight.png"));
 	//adjustWidth->setCheckable(true);
     adjustHeightAction->setDisabled(true);
-    adjustHeightAction->setChecked(Configuration::getConfiguration().getAdjustToWidth());
+    //adjustHeightAction->setChecked(Configuration::getConfiguration().getAdjustToWidth());
     adjustHeightAction->setToolTip(tr("Fit image to height"));
 	//adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
     adjustHeightAction->setData(ADJUST_HEIGHT_ACTION_Y);
@@ -272,7 +273,7 @@ void MainWindowViewer::createActions()
     adjustWidthAction->setIcon(QIcon(":/images/viewer_toolbar/toWidth.png"));
 	//adjustWidth->setCheckable(true);
     adjustWidthAction->setDisabled(true);
-    adjustWidthAction->setChecked(Configuration::getConfiguration().getAdjustToWidth());
+    //adjustWidthAction->setChecked(Configuration::getConfiguration().getAdjustToWidth());
     adjustWidthAction->setToolTip(tr("Fit image to width"));
 	//adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
     adjustWidthAction->setData(ADJUST_WIDTH_ACTION_Y);
@@ -405,12 +406,38 @@ void MainWindowViewer::createActions()
 
 	adjustToFullSizeAction = new QAction(tr("Show full size"),this);
 	adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
-	adjustToFullSizeAction->setCheckable(true);
+	//adjustToFullSizeAction->setCheckable(true);
 	adjustToFullSizeAction->setDisabled(true);
-	adjustToFullSizeAction->setChecked(Configuration::getConfiguration().getAdjustToFullSize());
+	//adjustToFullSizeAction->setChecked(Configuration::getConfiguration().getAdjustToFullSize());
     adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y);
     adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y));
 	connect(adjustToFullSizeAction,SIGNAL(triggered()),this,SLOT(adjustToFullSizeSwitch()));
+	
+	fitToPageAction = new QAction(tr("Fit to page"),this);
+	//fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
+	//fitToPageAction->setCheckable(true);
+	fitToPageAction->setDisabled(true);
+	//fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage());
+    fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
+    fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y));
+	connect(fitToPageAction,SIGNAL(triggered()),this,SLOT(fitToPageSwitch()));
+	
+	increasePageZoomAction = new QAction(tr("Zoom+"),this);
+	//increasePageZoomAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
+	increasePageZoomAction->setDisabled(true);
+    increasePageZoomAction->setData(ZOOM_PLUS_ACTION_Y);
+    increasePageZoomAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_PLUS_ACTION_Y));
+	
+	connect(increasePageZoomAction,SIGNAL(triggered()),this,SLOT(increasePageZoomLevel()));
+	
+	decreasePageZoomAction = new QAction(tr("Zoom-"),this);
+	//decreasePageZoomAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
+	decreasePageZoomAction->setDisabled(true);
+    decreasePageZoomAction->setData(ZOOM_MINUS_ACTION_Y);
+    decreasePageZoomAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_MINUS_ACTION_Y));
+        //decreasePageZoomAction->setShortcut(QKeySequence::ZoomOut);
+
+	connect(decreasePageZoomAction,SIGNAL(triggered()),this,SLOT(decreasePageZoomLevel()));
 
 	showFlowAction = new QAction(tr("Show go to flow"),this);
 	showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png"));
@@ -525,6 +552,7 @@ void MainWindowViewer::createToolBars()
 
     comicToolBar->addAction(adjustHeightAction);
 	comicToolBar->addAction(adjustToFullSizeAction);
+	comicToolBar->addAction(fitToPageAction);
 	comicToolBar->addAction(leftRotationAction);
 	comicToolBar->addAction(rightRotationAction);
 	comicToolBar->addAction(doublePageAction);
@@ -533,7 +561,8 @@ void MainWindowViewer::createToolBars()
     comicToolBar->addSeparator();
 
     comicToolBar->addAction(showMagnifyingGlassAction);
-
+    comicToolBar->addAction(increasePageZoomAction);
+    comicToolBar->addAction(decreasePageZoomAction);
 
 	comicToolBar->addSeparator();
 
@@ -575,6 +604,7 @@ void MainWindowViewer::createToolBars()
     viewer->addAction(adjustHeightAction);
     viewer->addAction(adjustWidthAction);
 	viewer->addAction(adjustToFullSizeAction);
+	viewer->addAction(fitToPageAction);
 	viewer->addAction(leftRotationAction);
 	viewer->addAction(rightRotationAction);
     viewer->addAction(doublePageAction);
@@ -811,6 +841,9 @@ void MainWindowViewer::enableActions()
 	doublePageAction->setDisabled(false);
 	doubleMangaPageAction->setDisabled(false);
 	adjustToFullSizeAction->setDisabled(false);
+	fitToPageAction->setDisabled(false);
+	increasePageZoomAction->setDisabled(false);
+	decreasePageZoomAction->setDisabled(false);
 	//setBookmark->setDisabled(false);
     showBookmarksAction->setDisabled(false);
     showInfoAction->setDisabled(false); //TODO enable goTo and showInfo (or update) when numPages emited
@@ -832,6 +865,7 @@ void MainWindowViewer::disableActions()
 	doublePageAction->setDisabled(true);
 	doubleMangaPageAction->setDisabled(true);
 	adjustToFullSizeAction->setDisabled(true);
+	fitToPageAction->setDisabled(true);
     setBookmarkAction->setDisabled(true);
     showBookmarksAction->setDisabled(true);
     showInfoAction->setDisabled(true); //TODO enable goTo and showInfo (or update) when numPages emited
@@ -943,21 +977,30 @@ void MainWindowViewer::showToolBars()
 }
 void MainWindowViewer::fitToWidth()
 {
+	Configuration::getConfiguration().setFitMode("to_width");
+	Configuration::getConfiguration().setPageZoomLevel(1);
+	viewer->updatePage();
+/*
 	Configuration & conf = Configuration::getConfiguration();
 	if(!conf.getAdjustToWidth())
 	{
 		conf.setAdjustToWidth(true);
 		viewer->updatePage();
 	}
+*/
 }
 void MainWindowViewer::fitToHeight()
 {
+	Configuration::getConfiguration().setFitMode("to_height");
+	Configuration::getConfiguration().setPageZoomLevel(1);
+	viewer->updatePage();
+	/*
 	Configuration & conf = Configuration::getConfiguration();
 	if(conf.getAdjustToWidth())
 	{
 		conf.setAdjustToWidth(false);
 		viewer->updatePage();
-	}
+	}*/
 }
 
 void MainWindowViewer::checkNewVersion()
@@ -1085,7 +1128,8 @@ void MainWindowViewer::setUpShortcutsManagement()
                                          << rightRotationAction
                                          << doublePageAction
 					 << doubleMangaPageAction
-                                         << adjustToFullSizeAction);
+                                         << adjustToFullSizeAction
+					 << fitToPageAction);
 
     allActions << tmpList;
 
@@ -1160,8 +1204,9 @@ void MainWindowViewer::toggleFitToWidthSlider()
 
 void MainWindowViewer::changeFit()
 {
+	//TODO: this is depreceated
 	Configuration & conf = Configuration::getConfiguration();
-	conf.setAdjustToWidth(!conf.getAdjustToWidth());
+	//conf.setAdjustToWidth(!conf.getAdjustToWidth());
 	viewer->updatePage();
 }
 
@@ -1374,7 +1419,29 @@ void MainWindowViewer::alwaysOnTopSwitch()
 
 void MainWindowViewer::adjustToFullSizeSwitch()
 {
-	Configuration::getConfiguration().setAdjustToFullSize(!Configuration::getConfiguration().getAdjustToFullSize());
+	//Configuration::getConfiguration().setAdjustToFullSize(!Configuration::getConfiguration().getAdjustToFullSize());
+	Configuration::getConfiguration().setFitMode("full_size");
+	Configuration::getConfiguration().setPageZoomLevel(1);
+	viewer->updatePage();
+}
+
+void MainWindowViewer::fitToPageSwitch()
+{
+	//Configuration::getConfiguration().setFitToPage(!Configuration::getConfiguration().getFitToPage());
+	Configuration::getConfiguration().setFitMode("full_page");
+	Configuration::getConfiguration().setPageZoomLevel(1);
+	viewer->updatePage();
+}
+
+void MainWindowViewer::increasePageZoomLevel()
+{
+	Configuration::getConfiguration().setPageZoomLevel(Configuration::getConfiguration().getPageZoomLevel() + 0.1);
+	viewer->updatePage();
+}
+
+void MainWindowViewer::decreasePageZoomLevel()
+{
+	Configuration::getConfiguration().setPageZoomLevel(Configuration::getConfiguration().getPageZoomLevel() - 0.1);
 	viewer->updatePage();
 }
 
diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h
index 255acadf..108e8dae 100644
--- a/YACReader/main_window_viewer.h
+++ b/YACReader/main_window_viewer.h
@@ -53,6 +53,9 @@ class EditShortcutsDialog;
 		void openFolderFromPath(QString pathFile, QString atFileName);
 		void alwaysOnTopSwitch();
 		void adjustToFullSizeSwitch();
+		void fitToPageSwitch();
+		void increasePageZoomLevel();
+		void decreasePageZoomLevel();
 		void reloadOptions();
 		void fitToWidth();
 		void fitToHeight();
@@ -122,6 +125,9 @@ class EditShortcutsDialog;
 		QAction *showDictionaryAction;
 		QAction *alwaysOnTopAction;
 		QAction *adjustToFullSizeAction;
+		QAction *fitToPageAction;
+		QAction *increasePageZoomAction;
+		QAction *decreasePageZoomAction;
 		QAction *showFlowAction;
 
         QAction *showEditShortcutsAction;
diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index c4391e20..80a37bf3 100644
--- a/YACReader/viewer.cpp
+++ b/YACReader/viewer.cpp
@@ -321,14 +321,28 @@ void Viewer::updateContentSize()
 	//there is an image to resize
 	if(currentPage !=0 && !currentPage->isNull())
 	{
-		if(Configuration::getConfiguration().getAdjustToFullSize())
+		if(!Configuration::getConfiguration().getFitMode().isNull())
 		{
-			content->resize(currentPage->width(),currentPage->height());
-		}
-		else
-		{
-			float aspectRatio = (float)currentPage->width()/currentPage->height();
+			if(Configuration::getConfiguration().getFitMode()=="full_size")
+			{
+				content->resize(currentPage->size());
+			}
+			else if(Configuration::getConfiguration().getFitMode()=="full_page")
+			{
+				QSize pagefit=currentPage->size();
+				pagefit.scale(size(), Qt::KeepAspectRatio);
+				content->resize(pagefit);
+			}
+			
+			//float aspectRatio = (float)currentPage->width()/currentPage->height();
 			//Fit to width
+			else if(Configuration::getConfiguration().getFitMode()=="to_width")
+			{
+				QSize pagefit=currentPage->size();
+				pagefit.scale(width(), 0, Qt::KeepAspectRatioByExpanding);
+				content->resize(pagefit);
+			}
+			/*
 			if(Configuration::getConfiguration().getAdjustToWidth())
 			{
 				adjustToWidthRatio = Configuration::getConfiguration().getFitToWidthRatio();
@@ -340,6 +354,7 @@ void Viewer::updateContentSize()
 				else
 					content->resize(width()*adjustToWidthRatio,static_cast<int>(width()*adjustToWidthRatio/aspectRatio));
 			}
+			
 			//Fit to height or fullsize/custom size
 			else
 			{
@@ -347,9 +362,31 @@ void Viewer::updateContentSize()
 					content->resize(width(),static_cast<int>(width()/aspectRatio));
 				else
 					content->resize(static_cast<int>(height()*aspectRatio),height());
+			}*/
+			else if(Configuration::getConfiguration().getFitMode()=="to_height")
+			{
+				QSize pagefit=currentPage->size();
+				pagefit.scale(0, height(), Qt::KeepAspectRatioByExpanding);
+				content->resize(pagefit);
 			}
+			
+			else //if everything else fails use full_page
+			{
+				Configuration::getConfiguration().setFitMode("full_page");
+				QSize pagefit=currentPage->size();
+				pagefit.scale(size(), Qt::KeepAspectRatio);
+				content->resize(pagefit);
+			}
+			
 		}
 
+	if(Configuration::getConfiguration().getPageZoomLevel())
+	{	
+		QSize pagesize=content->size();
+		pagesize.scale(content->width()*Configuration::getConfiguration().getPageZoomLevel(), 0, Qt::KeepAspectRatioByExpanding);
+		content->resize(pagesize);
+	}
+	
         if(devicePixelRatio()>1)//only in retina display
         {
             QPixmap page = currentPage->scaled(content->width()*devicePixelRatio(), content->height()*devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -883,7 +920,8 @@ void Viewer::mouseReleaseEvent ( QMouseEvent * event )
 
 void Viewer::updateFitToWidthRatio(float ratio)
 {
-	Configuration::getConfiguration().setAdjustToWidth(true);
+	//Configuration::getConfiguration().setAdjustToWidth(true);
+	Configuration::getConfiguration().setFitMode("to_width");
 	adjustToWidthRatio = ratio;
 	updateContentSize();
 }
diff --git a/common/yacreader_global.h b/common/yacreader_global.h
index 74ce104e..e6f58501 100644
--- a/common/yacreader_global.h
+++ b/common/yacreader_global.h
@@ -15,10 +15,13 @@
 #define PATH "PATH"
 #define MAG_GLASS_SIZE "MAG_GLASS_SIZE"
 #define ZOOM_LEVEL "ZOOM_LEVEL"
+#define PAGE_ZOOM_LEVEL "PAGE_ZOOM_LEVEL"
 #define SLIDE_SIZE "SLIDE_SIZE"
 #define GO_TO_FLOW_SIZE "GO_TO_FLOW_SIZE"
 #define FLOW_TYPE_SW "FLOW_TYPE_SW"
-#define FIT "FIT"
+//#define FIT "FIT"
+//#define PAGEFIT "PAGEFIT"
+#define FITMODE "FITMODE"
 #define FLOW_TYPE "FLOW_TYPE"
 #define FULLSCREEN "FULLSCREEN"
 #define FIT_TO_WIDTH_RATIO "FIT_TO_WIDTH_RATIO"
@@ -27,7 +30,7 @@
 #define MAXIMIZED "MAXIMIZED"
 #define DOUBLE_PAGE "DOUBLE_PAGE"
 #define DOUBLE_MANGA_PAGE "DOUBLE_MANGA_PAGE"
-#define ADJUST_TO_FULL_SIZE "ADJUST_TO_FULL_SIZE"
+//#define ADJUST_TO_FULL_SIZE "ADJUST_TO_FULL_SIZE"
 #define BACKGROUND_COLOR "BACKGROUND_COLOR"
 #define ALWAYS_ON_TOP "ALWAYS_ON_TOP"
 #define SHOW_TOOLBARS "SHOW_TOOLBARS"
diff --git a/shortcuts_management/shortcuts_manager.cpp b/shortcuts_management/shortcuts_manager.cpp
index bbde5df5..7434e6a7 100644
--- a/shortcuts_management/shortcuts_manager.cpp
+++ b/shortcuts_management/shortcuts_manager.cpp
@@ -52,7 +52,9 @@ void ShortcutsManager::initDefaultShorcuts()
     defaultShorcuts.insert(ALWAYS_ON_TOP_ACTION_Y, Qt::Key_Q); //deprecated
     defaultShorcuts.insert(ADJUST_TO_FULL_SIZE_ACTION_Y, Qt::Key_W);
     defaultShorcuts.insert(SHOW_FLOW_ACTION_Y, Qt::Key_S);
-
+    defaultShorcuts.insert(ZOOM_PLUS_ACTION_Y, QKeySequence::ZoomIn);
+    defaultShorcuts.insert(ZOOM_MINUS_ACTION_Y, QKeySequence::ZoomOut);
+    
     //main_window_viewer
     defaultShorcuts.insert(TOGGLE_FULL_SCREEN_ACTION_Y, Qt::Key_F);
     defaultShorcuts.insert(TOGGLE_TOOL_BARS_ACTION_Y, Qt::Key_H);
diff --git a/shortcuts_management/shortcuts_manager.h b/shortcuts_management/shortcuts_manager.h
index a67851cc..01e0ff04 100644
--- a/shortcuts_management/shortcuts_manager.h
+++ b/shortcuts_management/shortcuts_manager.h
@@ -110,6 +110,9 @@ public:
 #define SHOW_DICTIONARY_ACTION_Y "SHOW_DICTIONARY_ACTION_Y"
 #define ALWAYS_ON_TOP_ACTION_Y "ALWAYS_ON_TOP_ACTION_Y"
 #define ADJUST_TO_FULL_SIZE_ACTION_Y "ADJUST_TO_FULL_SIZE_ACTION_Y"
+#define FIT_TO_PAGE_ACTION_Y "FIT_TO_PAGE_ACTION_Y"
+#define ZOOM_PLUS_ACTION_Y "ZOOM_PLUS_ACTION_Y"
+#define ZOOM_MINUS_ACTION_Y "ZOOM_MINUS_ACTION_Y"
 #define SHOW_FLOW_ACTION_Y "SHOW_FLOW_ACTION_Y"
 #define SHOW_EDIT_SHORTCUTS_ACTION_Y "SHOW_EDIT_SHORTCUTS_ACTION_Y"