diff --git a/assets/css/admin.css b/assets/css/admin.css
index 6ddafbf6f..29897c0e0 100755
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -1484,3 +1484,62 @@ ul.imagify-datas-details.imagify-datas-details {
 		background: #F4F7F9;
 	}
 }
+@media (max-width: 730px) {
+	.imagify-settings .imagify-documentation-link-box{
+		margin-top: 2em;
+	}
+}
+
+@media (max-width: 782px) {
+	input[type="radio"], input[type="checkbox"] {
+		height: 1.5625rem;
+		width: 1.5625rem;
+		margin: 1px;
+	}
+	[class*="imagify-"] .button-text{
+		font-size: 13px;
+	}
+	.imagify-account-info-col .imagify-settings-section{
+		padding: 0 10px;
+	}
+	.imagify-settings-section{
+		padding: 10px;
+	}
+	.imagify-check-group.imagify-is-scrollable{
+		margin: auto;
+	}
+	.imagify-settings-section .imagify-col,
+	.imagify-col.imagify-col.imagify-shared-with-account-col,
+	.imagify-media-lib-section .imagify-col,
+	.imagify-custom-folders-section .imagify-col,
+	.imagify-shared-with-account-col {
+		width:100%;
+		float: none;
+		padding-right: 0;
+	}
+	.imagify-col.imagify-col.imagify-account-info-col,
+	.imagify-media-lib-section .imagify-account-info-col,
+	.imagify-custom-folders-section .imagify-account-info-col,
+	.imagify-account-info-col{
+		width: 100%;
+		float: none;
+		padding-left: 0;
+		padding-right: 0;
+	}
+	.imagify-lb-text{
+		font-size: 20px;
+	}
+	.imagify-vcenter{
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		-webkit-box-direction: normal;
+		-webkit-box-orient: vertical;
+		-moz-box-direction: normal;
+		-moz-box-orient: vertical;
+		align-items: center;
+	}
+	.imagify-pr2.imagify-pr2{
+		padding-right: 0em;
+	}
+}
diff --git a/assets/css/bulk.css b/assets/css/bulk.css
index 673258cf1..5e2cd1f42 100755
--- a/assets/css/bulk.css
+++ b/assets/css/bulk.css
@@ -26,7 +26,8 @@
 .imagify-doughnut-legend li span {
 	display: block;
 	position: absolute;
-	left: 0; top: 0;
+	left: 0;
+	top: 0;
 	width: 25px;
 	height: 25px;
 	border-radius: 50%;
@@ -47,9 +48,11 @@
 	float: left;
 	margin-right: 20px;
 }
+
 .imagify-chart-percent {
 	position: absolute;
-	left: 0; right: 0;
+	left: 0;
+	right: 0;
 	top: 50%;
 	margin-top: -.5em;
 	line-height: 1;
@@ -58,6 +61,7 @@
 	font-weight: bold;
 	color: #46B1CE;
 }
+
 .imagify-chart-percent span {
 	font-size: 20px;
 	vertical-align: super;
@@ -100,6 +104,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress,
 body[class*="_imagify-ngg-bulk-optimization"] .media-item .percent {
 	text-align: right;
 }
+
 .media_page_imagify-bulk-optimization .media-item .progress .bar,
 body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	position: relative;
@@ -121,9 +126,11 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	width: calc(100% - 465px);
 	padding-left: 20px;
 }
+
 .imagify-columns .col-statistics.col-statistics {
 	width: 60%;
 }
+
 .imagify-columns .col-chart.col-chart {
 	width: 40%;
 }
@@ -140,9 +147,11 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 		float: none;
 		margin-right: 0;
 	}
+
 	.imagify-doughnut-legend {
 		margin-top: 18px;
 	}
+
 	.imagify-global-optim-phrase {
 		padding-top: 0;
 		width: auto;
@@ -156,6 +165,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 		float: none;
 		padding: 0;
 	}
+
 	.imagify-columns .col-chart.col-chart {
 		margin-top: 3em;
 	}
@@ -166,6 +176,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	width: 1px;
 	background: rgba(255, 255, 255, .2);
 }
+
 .base-transparent {
 	background: transparent;
 }
@@ -175,6 +186,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	box-sizing: border-box;
 	padding-right: 4.5em;
 }
+
 .right-outside-number .imagify-barnb {
 	display: block;
 	margin-right: -5.25em;
@@ -191,6 +203,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	color: #000;
 	font-weight: bold;
 }
+
 .imagify-h2-like .dashicons,
 .imagify-h2-like .dashicons:before {
 	font-size: 38px;
@@ -200,6 +213,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	vertical-align: -5px;
 	color: #40B1D0;
 }
+
 .imagify-info-block {
 	position: relative;
 	padding: 10px;
@@ -208,10 +222,12 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	border-radius: 4px;
 	line-height: 1.6;
 }
+
 .imagify-list-infos {
 	margin: 0;
 	padding: 0;
 }
+
 .imagify-list-infos li {
 	display: flex;
 	align-items: center;
@@ -221,12 +237,15 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	line-height: 1.5;
 	color: #626E7B;
 }
+
 .imagify-list-infos li:first-child {
 	padding-top: 5px;
 }
+
 .imagify-list-infos li:last-child {
 	padding-bottom: 5px;
 }
+
 .imagify-list-infos li + li {
 	border-top: 1px solid #E9EFF2;
 }
@@ -235,6 +254,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	flex-grow: 0;
 	flex-basis: 50px;
 }
+
 .imagify-info-icon + span {
 	padding-left: 20px;
 }
@@ -251,11 +271,13 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	background: #FFF;
 	color: #4A4A4A;
 }
+
 .imagify-bulk p,
 .imagify-bulk li,
 .imagify-bulk h3 {
 	color: #4A4A4A;
 }
+
 .imagify-bulk .imagify-settings-section h3 {
 	margin-bottom: 2em;
 }
@@ -265,12 +287,14 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	display: flex;
 	align-items: center;
 }
+
 .imagify-account-info-col p.imagify-meteo-title {
 	margin: 0;
 	font-size: 24px;
 	font-weight: bold;
 	color: #FFF;
 }
+
 .imagify-account-info-col .imagify-options-title > a {
 	flex-basis: 100px;
 	margin-left: auto;
@@ -278,6 +302,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	text-decoration: underline;
 	font-size: 12px;
 }
+
 .imagify-account-info-col .imagify-meteo-title .dashicons,
 .imagify-account-info-col .imagify-meteo-title .dashicons:before {
 	font-size: 38px;
@@ -286,28 +311,34 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	margin-right: 4px;
 	color: #40B1D0;
 }
+
 .imagify-col-content {
 	background: #F4F7F9;
 	border-left: 1px solid #ddd;
 	border-right: 1px solid #ddd;
 }
+
 .imagify-col-content .imagify-block-secondary {
 	margin-left: -1px;
 	margin-right: -1px;
 }
+
 .imagify-col-content .imagify-space-left {
 	margin: 15px 30px 15px 0;
 }
+
 .imagify-col-content .imagify-space-left p {
 	margin: 0 0 10px 0;
 	font-size: 19px;
 	font-weight: 500;
 	color: #343A49;
 }
+
 .imagify-col-content .imagify-meteo-icon {
 	height: 64px;
 	margin: 15px 15px 15px 20px;
 }
+
 .imagify-col-content .imagify-section-title + p {
 	margin-top: 10px;
 }
@@ -322,6 +353,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	top: 100%;
 	left: 0;
 }
+
 .imagify-tooltips .icon-round {
 	float: left;
 	display: inline-block;
@@ -337,6 +369,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	text-align: center;
 	border-radius: 50%;
 }
+
 .imagify-tooltips .tooltip-content {
 	display: block;
 	position: relative;
@@ -347,38 +380,48 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	font-size: 10px;
 	border-radius: 3px;
 }
+
 .imagify-tooltips.right .tooltip-content {
 	margin-left: 12px;
 }
+
 .imagify-tooltips.bottom .tooltip-content {
 	margin-top: 4px;
 }
+
 .imagify-inline-options label .tooltip-content {
 	position: absolute;
-	left: 0; right: 0;
+	left: 0;
+	right: 0;
 	top: 100%;
 	text-transform: none;
 	font-size: 10px;
 	letter-spacing: 0;
 	text-align: center;
 }
+
 .imagify-tooltips .tooltip-content:after {
 	content: "";
 	position: absolute;
 }
+
 .imagify-tooltips.right .tooltip-content:after {
-	top: 16px; left: -6px;
+	top: 16px;
+	left: -6px;
 	border-right: 8px solid #2e3242;
 	border-top: 6px solid transparent;
 	border-bottom: 6px solid transparent;
 }
+
 .imagify-tooltips.bottom .tooltip-content:after {
-	top: -5px; left: 50%;
+	top: -5px;
+	left: 50%;
 	margin-left: -3px;
 	border-bottom: 6px solid #2e3242;
 	border-left: 6px solid transparent;
 	border-right: 6px solid transparent;
 }
+
 .imagify-space-tooltips .tooltip-content {
 	max-width: 280px;
 	margin-top: 20px;
@@ -388,6 +431,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	background: #40B1D0;
 	box-shadow: 0 3px 0 #338EA6;
 }
+
 .imagify-space-tooltips .tooltip-content:after {
 	top: -14px;
 	left: 50%;
@@ -397,31 +441,39 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	border-left: 15px solid transparent;
 	border-right: 15px solid transparent;
 }
+
 .tooltip-content.tooltip-table {
 	display: table;
 	width: 100%;
 }
+
 .tooltip-content.tooltip-table > * {
 	display: table-cell;
 	vertical-align: middle;
 }
+
 .tooltip-content .cell-icon {
 	width: 28px;
 }
+
 .tooltip-content .cell-icon .icon {
 	margin-bottom: 0;
 }
+
 .tooltip-content .cell-text {
 	padding: 5px 10px 5px 0;
 	line-height: 1.3;
 }
+
 .tooltip-content .cell-sep {
 	width: 1px;
 	background: rgba(255, 255, 255, .4);
 }
+
 .tooltip-content .cell-cta {
 	padding-left: 10px;
 }
+
 .tooltip-content .cell-cta a {
 	display: block;
 	color: #FFF;
@@ -435,6 +487,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	margin-bottom: 1.35em;
 	overflow: hidden;
 }
+
 .imagify-number-you-optimized .number {
 	display: table-cell;
 	padding-right: 15px;
@@ -445,9 +498,11 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	white-space: nowrap;
 	color: #000;
 }
+
 .imagify-number-you-optimized [id="imagify-total-optimized-attachments-pct"] {
 	color: #40B1D0;
 }
+
 .imagify-number-you-optimized .text {
 	display: table-cell;
 	vertical-align: middle;
@@ -455,6 +510,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	font-size: 12px;
 	color: #626E7B;
 }
+
 .imagify-number-you-optimized > p {
 	display: table;
 }
@@ -463,14 +519,17 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 .imagify-bars {
 	padding-right: 15px;
 }
+
 .imagify-bars p {
 	font-size: 12px;
 	margin-bottom: 5px;
 }
+
 .imagify-bars + .imagify-number-you-optimized {
 	border-bottom: 0;
 	padding-top: 0.85em;
 }
+
 .imagify-bars + .imagify-number-you-optimized p {
 	color: #46b1ce;
 }
@@ -486,11 +545,13 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	background: #343A49;
 	color: #FFF;
 }
+
 .imagify-newbie {
 	margin-top: 4em;
 	position: relative;
 	overflow: visible;
 }
+
 .imagify-newbie .imagify-new-feature.imagify-new-feature {
 	position: absolute;
 	top: 0;
@@ -505,11 +566,13 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	color: #FFF;
 	background: #8BC34A;
 }
+
 .imagify-newbie .imagify-table-header {
 	padding: 30px 25px;
 	border: 2px solid #8BC34A;
 	background: #F3F9EC;
 }
+
 .imagify-th-titles .dashicons,
 .imagify-th-titles .dashicons:before {
 	width: 38px;
@@ -518,31 +581,38 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	font-size: 38px;
 	color: #40B1D0;
 }
+
 .imagify-newbie .imagify-th-titles .dashicons:before {
 	color: #8BC34A;
 }
+
 .imagify-th-title.imagify-th-title.imagify-th-title {
 	margin: 0;
 	font-size: 24px;
 	font-weight: 500;
 	color: #FFF;
 }
+
 .imagify-newbie .imagify-th-title.imagify-th-title {
 	color: #343A49;
 }
+
 .imagify-th-subtitle.imagify-th-subtitle.imagify-th-subtitle {
 	margin: 0 0 5px;
 	font-size: 14px;
 	color: #7A8996;
 	font-weight: 500;
 }
+
 .imagify-th-action .imagify-button-clean {
 	font-size: 12px;
 	color: #7A8996;
 }
+
 .imagify-th-action .imagify-is-active {
 	color: #FFF;
 }
+
 .imagify-th-action .button:hover,
 .imagify-th-action .button:focus {
 	color: #FFF;
@@ -553,16 +623,20 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	border-spacing: 0;
 	border-collapse: collapse;
 }
+
 .imagify-bulk-table td {
 	padding: 20px;
 }
+
 .imagify-bulk-table-details {
 	border-bottom: 2px solid #E5EBEF;
 }
+
 .imagify-bulk-table-details thead tr,
 .imagify-bulk-table-details thead th {
 	background: #4A5362;
 }
+
 .imagify-bulk-table-details thead th {
 	padding: 12px 20px;
 	text-align: left;
@@ -570,13 +644,16 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	color: #E5EBEF;
 	font-size: 12px;
 }
+
 .imagify-bulk-table-details tbody tr:nth-child(odd) td {
 	background: #F2F5F7;
 }
+
 .imagify-bulk-table-content {
 	border: 1px solid #D3D3D3;
 	border-top: 0;
 }
+
 .imagify-bulk-table-footer {
 	padding: 20px;
 	color: #626E7B;
@@ -586,6 +663,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 .imagify-bulk-table tbody tr + tr {
 	border-top: 3px solid #F2F5F7;
 }
+
 .imagify-bulk-table tbody tr,
 .imagify-bulk-table tbody td {
 	background: #FFF;
@@ -599,6 +677,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	height: 8px;
 	padding: 0;
 }
+
 .imagify-bulk-table .imagify-no-uploaded-yet td {
 	height: 200px;
 	font-size: 17px;
@@ -616,6 +695,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 .imagify-selector {
 	position: relative;
 }
+
 .imagify-selector-list {
 	background: #FFF;
 	border: 1px solid #F4F7F9;
@@ -625,26 +705,33 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	text-transform: uppercase;
 	letter-spacing: .02em;
 }
+
 .imagify-selector-list li:first-child label {
 	border-radius: 3px 3px 0 0;
 }
+
 .imagify-selector-list li:last-child label {
 	border-radius: 0 0 3px 3px;
 }
+
 .imagify-selector-list li {
 	margin: 0;
 }
+
 .imagify-selector-list li + li {
 	border-top: 1px solid #F4F7F9;
 }
+
 .imagify-selector-list svg {
 	margin-right: 5px;
 }
+
 .imagify-selector-list input:checked + label,
 .imagify-selector-list .imagify-selector-current-value label {
 	background: #343A49;
 	color: #FFF;
 }
+
 .imagify-selector-list input:checked + label:hover,
 .imagify-selector-list .imagify-selector-current-value label:hover,
 .imagify-selector-list label:hover,
@@ -653,6 +740,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	background: #40B1D0;
 	color: #F4F7F9;
 }
+
 .imagify-selector-list input:checked + label:hover polygon,
 .imagify-selector-list .imagify-selector-current-value label:hover polygon,
 .imagify-selector-list label:hover polygon,
@@ -660,6 +748,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 .imagify-selector-list .imagify-selector-current-value input:focus + label polygon {
 	fill: #FFF;
 }
+
 .imagify-selector-list input:checked + label:hover polygon[fill="#CCD1D6"],
 .imagify-selector-list .imagify-selector-current-value label:hover polygon[fill="#CCD1D6"],
 .imagify-selector-list label:hover polygon[fill="#CCD1D6"],
@@ -667,14 +756,17 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 .imagify-selector-list .imagify-selector-current-value input:focus + label polygon[fill="#CCD1D6"] {
 	fill: #3694AE;
 }
+
 .imagify-selector-list li label {
 	display: block;
 	padding: 10px;
 	transition: all .275s;
 }
+
 .imagify-selector-list polygon {
 	transition: all .275s;
 }
+
 .imagify-selector-list {
 	position: absolute;
 	top: 0;
@@ -683,20 +775,24 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	transition: all .275s;
 	transform: translateY(-50%);
 }
+
 .imagify-selector-list[aria-hidden="true"] {
 	opacity: 0;
 	visibility: hidden;
 	transform: translateY(-50%) scale(0);
 }
+
 .imagify-selector-list[aria-hidden="false"] {
 	opacity: 1;
 	visibility: visible;
 	transform: translateY(-50%) scale(1);
 }
+
 .button .imagify-selector-current-value-info {
 	position: relative;
 	padding-right: 20px;
 }
+
 .button .imagify-selector-current-value-info:after {
 	content: '';
 	position: absolute;
@@ -708,18 +804,19 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	border-right: 6px solid transparent;
 }
 
-
 /* Complete row / success */
 .imagify-row-complete {
 	padding: 35px 20px;
 	margin-top: 2em;
 	background: #8BC34A;
 	color: #FFF;
-	text-shadow: 0 0 2px rgba(0,0,0,.1);
+	text-shadow: 0 0 2px rgba(0, 0, 0, .1);
 }
+
 .imagify-row-complete .imagify-ac-chart {
 	margin-top: 3px;
 }
+
 .imagify-row-complete.imagify-row-complete p {
 	color: #FFF;
 	margin: 0;
@@ -727,17 +824,17 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 
 @-webkit-keyframes congrate {
 	0% {
-	opacity: 0;
+		opacity: 0;
 		-webkit-transform: scale(1);
 	}
 	50% {
 		-webkit-transform: scale(1.05);
 		opacity: 1;
 	}
-    100% {
+	100% {
 		-webkit-transform: scale(1);
 		opacity: 1;
-  }
+	}
 }
 
 @keyframes congrate {
@@ -755,7 +852,6 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	}
 }
 
-
 .imagify-row-complete.done {
 	-webkit-animation: congrate 500ms ease-in-out;
 	animation: congrate 500ms ease-in-out;
@@ -764,26 +860,32 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 .imagify-all-complete {
 	margin: 1.5em 0;
 }
+
 .imagify-all-complete > div {
 	display: inline-block;
 	vertical-align: middle;
 }
+
 .imagify-ac-report {
 	min-width: 310px;
 	margin-right: 20px;
 }
+
 .imagify-ac-chart {
 	width: 46px;
 	height: 46px;
 	float: left;
 	margin: 0 20px 0 10px;
 }
+
 .imagify-ac-report-text {
 	overflow: hidden;
 }
+
 .imagify-ac-report-text p {
 	line-height: 1.3;
 }
+
 .imagify-ac-rt-big {
 	font-weight: bold;
 	font-size: 24px;
@@ -791,28 +893,35 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	word-spacing: 0.15em;
 	text-transform: uppercase;
 }
+
 .imagify-ac-share {
 	text-align: right;
 }
+
 .imagify-ac-share-content {
 	display: inline-block;
 	padding: 10px 15px;
-	background: rgba(255,255,255,.2);
+	background: rgba(255, 255, 255, .2);
 }
+
 .imagify-ac-share-content > * {
 	display: inline-block;
 	vertical-align: middle;
 }
+
 .imagify-bulk-table .imagify-ac-share-content p {
 	margin-right: 5px;
 }
+
 .imagify-share-networks,
 .imagify-share-networks li {
 	margin: 0;
 }
+
 .imagify-share-networks li {
 	display: inline-block;
 }
+
 .imagify-share-networks a {
 	display: inline-block;
 	vertical-align: -7px;
@@ -825,9 +934,11 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 .imagify-cell-checkbox {
 	width: 35px;
 }
+
 .imagify-cell-checkbox p {
 	margin: 0;
 }
+
 .imagify-cell-checkbox-loader {
 	display: block;
 	width: 27px;
@@ -835,6 +946,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	line-height: 0;
 	animation: loading 4s infinite linear;
 }
+
 @keyframes loading {
 	0% {
 		transform: rotate(0);
@@ -843,10 +955,12 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 		transform: rotate(360deg);
 	}
 }
+
 .imagify-cell-checkbox-loader.hidden {
 	display: none;
 	animation: none;
 }
+
 .imagify-cell-title label,
 .imagify-cell-label {
 	font-size: 14px;
@@ -854,55 +968,68 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	letter-spacing: .02em;
 	font-weight: bold;
 }
+
 .imagify-cell-label {
 	margin-right: 10px;
 }
+
 .imagify-cell-value {
 	font-size: 12px;
 	font-weight: 500;
 	color: #7A8996;
 }
+
 td.imagify-cell-title {
 	padding-left: 0;
 }
+
 .imagify-cell-title label,
 .imagify-cell-original-size .imagify-cell-label {
 	color: #1F2332;
 }
+
 .imagify-cell-optimized-size,
 .imagify-cell-original-size {
 	font-weight: 500;
 	color: #7A8996;
 	font-size: 12px;
 }
+
 .imagify-cell-optimized-size .imagify-cell-label {
 	color: #338EA6;
 }
+
 .imagify-cell-count-optimized {
 	font-size: 14px;
 	font-weight: bold;
 	color: #338EA6;
 }
+
 .imagify-cell-count-errors {
 	color: #C51162;
 	font-weight: bold;
 	font-size: 14px;
 }
+
 .imagify-cell-count-errors a {
 	margin-left: 5px;
 	color: #7A8996;
 	font-weight: normal;
 	font-size: 12px;
 }
+
 .imagify-cell-filename {
 	max-width: 200px;
 }
+
 .imagify-cell-status {
 	max-width: 145px;
 }
+
 .imagify-cell-status .dashicons-warning {
 	margin-right: 2px;
 }
+
 .imagify-cell-thumbnails {
 	max-width: 120px;
 }
@@ -912,31 +1039,38 @@ td.imagify-cell-filename {
 	white-space: nowrap;
 	overflow: hidden;
 }
+
 .imagify-bulk-table .imagify-cell-thumbnails {
 	text-align: center;
 }
+
 .imagify-cell-percentage,
 .imagify-cell-savings {
 	color: #46B1CE;
 	font-weight: bold;
 }
+
 .imagify-bulk-table td.imagify-cell-totaloriginal {
 	padding-right: 78px;
 }
+
 .imagify-cell-totaloriginal {
 	text-align: right;
 }
+
 .imagify-cell-level {
 	width: 145px;
 }
+
 .imagify-selector-button.imagify-selector-button {
 	border: 1px solid #FFF;
 	padding: 2px 10px;
 }
+
 .imagify-selector-button.imagify-selector-button:hover,
 .imagify-selector-button.imagify-selector-button:focus {
 	border-color: #EEE;
-	box-shadow: 0 4px 8px rgba(0,0,0,.1);
+	box-shadow: 0 4px 8px rgba(0, 0, 0, .1);
 }
 
 .imagiuploaded,
@@ -947,9 +1081,11 @@ td.imagify-cell-filename {
 	color: #626E7B;
 	font-weight: 500;
 }
+
 .imagifilename {
 	font-size: 12px;
 }
+
 .imagiuploaded {
 	width: 33px;
 	height: 33px;
@@ -959,6 +1095,7 @@ td.imagify-cell-filename {
 	background: url(../images/upload-image.png) 0 0 no-repeat;
 	background-size: cover;
 }
+
 .imagiuploaded img {
 	max-width: 100%;
 	height: auto;
@@ -969,18 +1106,23 @@ td.imagify-cell-filename {
 	text-transform: uppercase;
 	font-weight: bold;
 }
+
 .imagistatus .dashicons {
 	margin-right: 5px;
 }
+
 .status-compressing {
 	color: #46B1CE;
 }
+
 .status-error {
 	color: #CE0B24;
 }
+
 .status-warning {
 	color: #f5a623;
 }
+
 .status-complete {
 	color: #8CC152;
 }
@@ -991,9 +1133,9 @@ td.imagify-cell-filename {
 }
 
 .imagify-settings .button-primary.button-primary[disabled] {
-	color: #4A4A4A!important;
-	background: #D9E4EB!important;
-	text-shadow: none!important;
+	color: #4A4A4A !important;
+	background: #D9E4EB !important;
+	text-shadow: none !important;
 	cursor: not-allowed;
 }
 
@@ -1002,6 +1144,7 @@ td.imagify-cell-filename {
 	-webkit-animation: icon-rotate 2.6s infinite linear;
 	animation: icon-rotate 2.6s infinite linear;
 }
+
 .imagify-cell-status .dashicons-admin-generic {
 	transform-origin: 48.75% 51.75%;
 }
@@ -1016,6 +1159,7 @@ td.imagify-cell-filename {
 		transform: rotate(360deg);
 	}
 }
+
 @keyframes icon-rotate {
 	from {
 		transform: rotate(0deg);
@@ -1035,6 +1179,7 @@ td.imagify-cell-filename {
 		max-width: none;
 		float: none;
 	}
+
 	.imagify-columns .col-overview.col-overview {
 		float: none;
 		width: auto;
@@ -1054,25 +1199,31 @@ td.imagify-cell-filename {
 	.imagify-bulk-table-container tr {
 		text-align: left;
 	}
+
 	.imagify-bulk-table-container tbody,
 	.imagify-bulk-table-container tbody tr,
 	.imagify-bulk-table-container tbody td {
 		display: block;
 	}
+
 	.imagify-bulk-table-container tbody td {
 		padding: 20px;
 	}
+
 	.imagify-cell-checkbox,
 	.imagify-cell-title {
 		float: left;
 	}
+
 	.imagify-cell-checkbox {
 		width: 26px;
 	}
+
 	.imagify-bulk-table-container .imagify-cell-title {
 		padding-left: 10px;
 		width: calc(100% - 96px);
 	}
+
 	.imagify-cell-title:after,
 	.imagify-cell-count-optimized:before {
 		content: '';
@@ -1080,6 +1231,7 @@ td.imagify-cell-filename {
 		clear: both;
 		width: 100%;
 	}
+
 	.imagify-cell-count-optimized {
 		clear: both;
 	}
@@ -1097,6 +1249,7 @@ td.imagify-cell-filename {
 	.imagify-settings .imagify-title {
 		display: block;
 	}
+
 	.imagify-settings .imagify-documentation-link-box {
 		display: inline-flex;
 	}
@@ -1105,3 +1258,65 @@ td.imagify-cell-filename {
 .hidden {
 	display: none;
 }
+
+@media (max-width: 782px) {
+	.imagify-table-header,
+	.imagify-newbie .imagify-table-header,
+	.imagify-account-info-col .imagify-options-title{
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		-webkit-box-direction: normal;
+		-webkit-box-orient: vertical;
+		-moz-box-direction: normal;
+		-moz-box-orient: vertical;
+		align-items: center;
+	}
+	.imagify-newbie .imagify-th-titles{
+		width: 100%;
+	}
+	.imagify-newbie .imagify-th-title.imagify-th-title {
+		color: #343A49;
+		font-size: 16px;
+		padding-bottom: 20px;
+	}
+	.imagify-newbie .imagify-th-titles .dashicons,
+	.imagify-newbie  .imagify-th-titles .dashicons:before{
+		margin: 0px;
+	}
+	.imagify-newbie .imagify-th-action{
+		display: flex;
+		max-width: 100%;
+	}
+	.imagify-newbie .imagify-th-action a{
+		max-width: 100%;
+		font-size: 11px;
+		padding: 11px 12px;
+	}
+	.imagify-columns .col-chart.col-chart{
+		text-align: center;
+	}
+	.imagify-doughnut-legend{
+		margin-top: 18px;
+		width: 60%;
+		margin: 10px auto;
+	}
+	.imagify-account-info-col .imagify-options-title > a{
+		flex-basis: unset;
+		margin: auto;
+	}
+	.imagify-th-title.imagify-th-title.imagify-th-title{
+		font-size: 20px;
+	}
+	.imagify-account-info-col p.imagify-meteo-title{
+		font-size: 20px;
+	}
+	.imagify-bulk-table-container tbody td{
+		padding: 10px;
+	}
+	.imagify-col-content .imagify-space-left{
+		width: auto;
+		margin: 0 0 15px 0;
+	}
+}
+
diff --git a/assets/css/notices.css b/assets/css/notices.css
index 70db2ad82..ca9ba8cbc 100755
--- a/assets/css/notices.css
+++ b/assets/css/notices.css
@@ -4,10 +4,12 @@
 	padding-left: 20px;
 	list-style-type: disc
 }
+
 .imagify-plugins-error li {
-	width:300px;
-	line-height:30px
+	width: 300px;
+	line-height: 30px
 }
+
 @media (max-width: 570px) {
 	.imagify-plugins-error li {
 		width: auto;
@@ -45,39 +47,47 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 	box-shadow: none;
 	color: #FFF;
 }
-@media (max-width:782px) {
+
+@media (max-width: 782px) {
 	.imagify-notice.imagify-notice,
 	.imagify-welcome {
 		margin-right: 12px;
 	}
 }
+
 @media (max-width: 450px) {
 	.imagify-notice.imagify-notice {
 		-webkit-box-orient: vertical;
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
-		    -ms-flex-direction: column;
-		        flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
 	}
 }
+
 .wrap .imagify-notice {
 	margin: 5px 15px 2px;
 	position: relative;
 }
+
 .imagify-notice-logo {
 	padding: 18px 23px;
 	background: #40B1D0;
 }
+
 .imagify-notice-logo .imagify-logo {
 	opacity: 1;
 }
+
 .imagify-flex-notice-content .imagify-notice-logo {
 	display: flex;
 	align-items: center;
 }
+
 .updated .imagify-notice-logo {
 	background: #8BC34A;
 }
+
 .error .imagify-notice-logo {
 	background: #C51162;
 }
@@ -89,35 +99,44 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 .imagify-notice-content {
 	padding: 5px 23px;
 }
+
 .imagify-notice-content.imagify-notice-content p {
 	margin: 0.65em 0;
 }
+
 .imagify-flex-notice-content .imagify-notice-content {
 	display: flex;
 	flex-wrap: wrap;
 	padding: 0;
 }
+
 .imagify-flex-notice-content .imagify-notice-content > * {
 	padding: 10px 20px;
 }
+
 .imagify-flex-notice-content .imagify-meteo-icon img {
 	height: 100%;
 	margin-top: 6px;
 }
+
 .imagify-notice-quota [class^="imagify-bar-"] {
 	background: #1F2332;
 }
+
 .imagify-notice-quota .imagify-space-left p {
 	margin: 0;
 }
+
 .imagify-flex-notice-content .imagify-notice-content .imagify-notice-quota {
 	padding-right: 24px;
 	padding-left: 8px;
 	background: #343A49;
 }
+
 .imagify-notice a {
 	color: #40B1D0;
 }
+
 .imagify-notice a:hover,
 .imagify-notice a:focus {
 	color: #FEE102;
@@ -141,38 +160,47 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 .imagify-welcome {
 	margin: 30px 20px 0 0;
 }
+
 .imagify-welcome .baseline {
 	display: inline-block;
 	margin: .2em 0 0 2em;
 	font-size: 17px;
 }
+
 .imagify-welcome .imagify-logo {
 	vertical-align: middle;
 }
+
 .imagify-welcome-remove {
 	position: absolute;
-	top: 50%; right: 15px;
+	top: 50%;
+	right: 15px;
 	margin-top: -8px;
 	color: #FFF;
 	text-decoration: none;
 }
+
 /* Welcome columns */
 .imagify-columns [class^="col-"] img {
 	float: left;
 	margin-right: 18px;
 }
+
 .imagify-col-content {
 	overflow: hidden;
 }
+
 .imagify-col-title {
 	margin: 0 0 15px 0;
 	font-size: 23px;
 }
+
 .counter .imagify-col-title:before {
 	counter-increment: cols;
 	content: counter(cols) ". ";
 	color: #40B1D0;
 }
+
 .imagify-col-desc {
 	color: #5F758E;
 	margin-bottom: 2em;
@@ -196,39 +224,49 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 	color: #FFF;
 	background: #1F2332;
 }
+
 .media_page_imagify-bulk-optimization .imagify-rkt-notice {
 	margin-left: 2px;
 	margin-right: 20px;
 }
+
 @media (max-width: 782px) {
 	.media_page_imagify-bulk-optimization .imagify-rkt-notice {
 		margin-left: 0;
 		margin-right: 12px;
 	}
 }
+
 .imagify-rkt-notice .imagify-cross {
 	position: absolute;
-	right: 8px; top: 50%;
-	width: 22px; height: 22px;
+	right: 8px;
+	top: 50%;
+	width: 22px;
+	height: 22px;
 	padding: 0;
 	margin-top: -11px;
 	background: transparent;
-	color: rgba(255,255,255,.5);
+	color: rgba(255, 255, 255, .5);
 	text-decoration: none;
 	border-radius: 50%;
 	transition: all .275s;
 }
+
 .imagify-rkt-notice .imagify-cross .dashicons {
 	position: relative;
-	top: 2px; left: 1px;
+	top: 2px;
+	left: 1px;
 	transition: all .275s;
 }
+
 .imagify-rkt-notice .imagify-cross:hover {
 	background: #FFF;
 }
+
 .imagify-rkt-notice .imagify-cross:hover .dashicons {
 	color: #412355;
 }
+
 .imagify-rkt-notice .imagify-rkt-cta,
 .imagify-rkt-notice .imagify-rkt-logo,
 .imagify-rkt-notice .imagify-rkt-coupon {
@@ -236,23 +274,27 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 	-ms-flex-negative: 0;
 	flex-shrink: 0;
 }
+
 .imagify-rkt-notice .imagify-rkt-logo {
-	width: 150px!important; /* !important because of a dirtugly WP Engine code */
+	width: 150px !important; /* !important because of a dirtugly WP Engine code */
 	text-align: center;
 	padding: 0 25px 0 30px;
 	line-height: 0.8;
 }
+
 .imagify-rkt-notice .imagify-rkt-msg {
-	width: 100%!important; /* !important because of a dirtugly WP Engine code */
+	width: 100% !important; /* !important because of a dirtugly WP Engine code */
 	color: #FFF;
 	padding: 0 15px;
 	font-size: 14px;
 	line-height: 1.6;
 }
+
 .imagify-rkt-notice .imagify-rkt-coupon {
-	width: 150px!important; /* !important because of a dirtugly WP Engine code */
+	width: 150px !important; /* !important because of a dirtugly WP Engine code */
 	padding: 0 15px;
 }
+
 .imagify-rkt-notice .imagify-rkt-coupon-code {
 	padding: 5px 10px;
 	font-size: 23px;
@@ -260,8 +302,9 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 	border: 1px dashed #F56640;
 	color: #F56640;
 }
+
 .imagify-rkt-notice .imagify-rkt-cta {
-	width: 250px!important; /* !important because of a dirtugly WP Engine code */
+	width: 250px !important; /* !important because of a dirtugly WP Engine code */
 	-webkit-box-flex: 1;
 	-webkit-flex-grow: 1;
 	-ms-flex-positive: 1;
@@ -270,6 +313,7 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 	-ms-flex-preferred-size: 200px;
 	flex-basis: 200px;
 }
+
 .imagify-rkt-notice .button.button {
 	position: relative;
 	top: -1px;
@@ -280,25 +324,43 @@ body[class*="_imagify-ngg-bulk-optimization"] .notice,
 	padding: 9px 18px 9px;
 	background: #F56640;
 	box-shadow: none;
-	text-shadow: none!important;
+	text-shadow: none !important;
 }
+
 @media (max-width: 880px) {
 	.imagify-rkt-notice {
 		-webkit-flex-wrap: wrap;
 		-ms-flex-wrap: wrap;
 		flex-wrap: wrap;
 	}
+
 	.imagify-rkt-notice .imagify-rkt-msg,
 	.imagify-rkt-notice .imagify-rkt-cta,
 	.imagify-rkt-notice .imagify-rkt-logo {
 		text-align: left;
 		padding: 5px 15px;
 	}
+
 	.imagify-cross.imagify-cross {
 		top: 8px;
 		margin-top: 0;
 	}
+
 	.imagify-rkt-notice .imagify-cross .dashicons {
 		top: 1px;
 	}
-}
\ No newline at end of file
+}
+
+@media (max-width: 782px) {
+	.imagify-flex-notice-content .imagify-notice-content .imagify-notice-quota {
+		width: 100%;
+	}
+
+	.imagify-notice-quota-btn-container{
+		text-align: center;
+		width: 100%;
+	}
+	.imagify-notice-quota-btn-container .imagify-button{
+		display: inline-block;
+	}
+}
diff --git a/assets/css/options.css b/assets/css/options.css
index ea65f0ac2..c1d6b2fb3 100755
--- a/assets/css/options.css
+++ b/assets/css/options.css
@@ -64,7 +64,6 @@ p.imagify-api-key-invite-title {
 .imagify-no-api-key .imagify-api-line {
 	margin: 3em 0 0 0;
 	padding: 2em 0 0;
-	border-top: 1px solid #D5D6D9;
 }
 .imagify-no-api-key .imagify-api-line input[type="text"] {
 	margin-top: 5px;
@@ -152,6 +151,7 @@ p.imagify-api-key-invite-title {
 	flex-basis: 40%;
 	flex-shrink: 1;
 	padding-left: 20px;
+	margin-top: 20px;
 	color: #626E7B;
 	box-sizing: border-box;
 }
@@ -286,6 +286,7 @@ label[for="imagify_sizes_full"] + .imagify-info {
 .imagify-settings [type="text"],
 .imagify-settings [type="number"] {
 	width: 20em;
+	max-width: 100%;
 	height: auto;
 	padding: 6px;
 	margin: 0 6px;
@@ -324,6 +325,7 @@ label[for="imagify_sizes_full"] + .imagify-info {
 .imagify-menu-bar-img {
 	box-sizing: border-box;
 	max-width: 100%;
+	width: 350px;
 	height: auto;
 	margin-top: 0;
 	border: 1px solid #8BA6B4;
@@ -900,3 +902,37 @@ input:checked + label .imagify-fake-checkbox:after,
 	font-weight: 500;
 	color: #A2AFBC;
 }
+@media (max-width: 782px) {
+	.imagify-settings.imagify-have-rocket {
+		margin-right: 10px;
+	}
+
+	label + .imagify-info, .imagify-visual-label {
+		max-width: calc(100% - 65px);
+		padding-right: 0;
+	}
+
+	.imagify-options-title {
+		font-size: 22px;
+	}
+
+	.imagify-user-plan-label {
+		margin-right: -5px;
+	}
+
+	.imagify-col.imagify-main {
+		width:100%;
+		padding-right: 10px;
+	}
+	.imagify-col + .imagify-col{
+		padding:0px 10px 0px 0px;
+	}
+	.imagify-no-api-key .imagify-api-line input[type="text"]{
+		margin-left: 0;
+	}
+}
+@media (max-width: 513px) {
+	.imagify-setting-optim-level .imagify-visual-comparison-text{
+		margin-top: 20px;
+	}
+}
diff --git a/assets/css/pricing-modal.css b/assets/css/pricing-modal.css
index 9db8668d3..02b0fe886 100755
--- a/assets/css/pricing-modal.css
+++ b/assets/css/pricing-modal.css
@@ -1152,3 +1152,189 @@ p.imagify-modal-sidebar-title.imagify-modal-sidebar-title {
 	float: right;
 	font-weight: bold;
 }
+@media (max-width: 782px) {
+	.imagify-payment-modal .imagify-modal-content{
+		width: 90%;
+		min-width: auto;
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		-webkit-box-direction: normal;
+		-webkit-box-orient: vertical;
+		-moz-box-direction: normal;
+		-moz-box-orient: vertical;
+		align-items: center;
+	}
+	.imagify-payment-modal .imagify-modal-main{
+		width: 100%;
+	}
+	.imagify-payment-modal .imagify-modal-sidebar{
+		width: 100%;
+
+	}
+	.imagify-modal-section.section-gray{
+		padding: 10px 10px 15px;
+	}
+	.imagify-modal-section{
+		padding: 0 10px;
+	}
+	.imagify-submit-line{
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		-webkit-box-direction: normal;
+		-webkit-box-orient: vertical;
+		-moz-box-direction: normal;
+		-moz-box-orient: vertical;
+		align-items: center;
+	}
+	.imagify-coupon-section{
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		-webkit-box-direction: normal;
+		-webkit-box-orient: vertical;
+		-moz-box-direction: normal;
+		-moz-box-orient: vertical;
+		align-items: center;
+		margin-bottom: 20px;
+	}
+	.imagify-coupon-section .imagify-coupon-text{
+		text-align: center;
+		width: 100%;
+		padding: 0;
+		margin-bottom: 20px;
+	}
+
+	.imagify-modal-cols{
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		-webkit-box-direction: normal;
+		-webkit-box-orient: vertical;
+		-moz-box-direction: normal;
+		-moz-box-orient: vertical;
+		align-items: center;
+	}
+	.imagify-col{
+		padding: 0;
+		float: none;
+		width: 100%;
+	}
+	.imagify-payment-modal .imagify-iconed{
+		margin: 1.5em auto;
+		max-width: 260px;
+	}
+	.imagify-offer-header{
+		padding: 0;
+	}
+	.imagify-offer-header .imagify-inline-options input[type="radio"]:not(:checked) + label,
+	.imagify-offer-header .imagify-inline-options input[type="radio"]:checked + label{
+		padding: 7px 15px;
+	}
+	.imagify-offer-header .imagify-inline-options input[type="radio"]:checked + label{
+		padding: 7px 15px;
+	}
+	.imagify-offer-header .imagify-offer-title.imagify-switch-my .imagify-monthly,
+	.imagify-offer-header .imagify-offer-title.imagify-switch-my .imagify-yearly{
+		padding: 10px 5px;
+		font-size: 12px;
+	}
+	.imagify-offer-size{
+		font-size: 18px;
+	}
+	.imagify-col-other-actions{
+		padding: 10px;
+		text-align: center;
+	}
+	.imagify-2-free{
+		padding: 2px 5px;
+	}
+	.imagify-2-free.imagify-b-right {
+		position: absolute;
+		bottom: 100%;
+		left: 0;
+		right: 0;
+		padding: 2px 5px;
+		margin-bottom: 0px;
+		margin-left: 0px;
+		font-size: 0.8em;
+		letter-spacing: 0;
+		text-transform: none;
+		text-align: center;
+		color: #FFF;
+		background: #10121A;
+		border-radius: 2px;
+	}
+	.imagify-2-free.imagify-b-right:after{
+		content: "";
+		position: absolute;
+		left: 50%;
+		top: unset;
+		bottom: -6px;
+		margin-left: -3px;
+		border-top: 3px solid #10121A;
+		border-left: 3px solid transparent;
+		border-right: 3px solid transparent;
+	}
+	div.imagify-col-price{
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		-webkit-box-direction: normal;
+		-webkit-box-orient: vertical;
+		-moz-box-direction: normal;
+		-moz-box-orient: vertical;
+		align-items: center;
+	}
+	.imagify-flex-table .imagify-price-complement{
+		padding: 5px 0 0 0;
+		margin: 0;
+		text-align: center;
+	}
+	div.imagify-col-details{
+		padding: 10px 0px 10px 10px;
+	}
+	.imagify-pricing-table .imagify-col-other-actions{
+		padding: 0 10px 0 0;
+	}
+	.imagify-pricing-table .imagify-button-secondary{
+		font-size: 12px;
+		white-space: normal;
+		line-height: 14px;
+		padding: 10px;
+	}
+	.imagify-price-big{
+		font-size: 24px;
+	}
+	span.imagify-price-mini{
+		font-size: 12px;
+	}
+	.imagify-col-checkbox label{
+		padding-left: 30px !important;
+	}
+	.medium.imagify-checkbox:not(:checked) + label:before,
+	.medium.imagify-checkbox:checked + label:before{
+		width: 15px;
+		height: 15px;
+	}
+	div.imagify-col-checkbox{
+		padding: 0;
+	}
+	.imagify-offer-monthly .imagify-flex-table .imagify-price-block,
+	.imagify-offer-monthlies .imagify-price-block{
+		padding: 0;
+	}
+	.imagify-pricing-table{
+		margin: 0 .5em;
+	}
+	.imagify-payment-modal .close-btn{
+		top: 5px;
+		right: 5px;
+	}
+	.imagify-col-checkbox .imagify-checkbox.imagify-checkbox:not(:checked) + label:after,
+	.imagify-col-checkbox .imagify-checkbox.imagify-checkbox:checked + label:after{
+		top: -1px;
+		left: 10px;
+	}
+}
diff --git a/views/notice-almost-over-quota.php b/views/notice-almost-over-quota.php
index fb06244fa..ff8ddb2a4 100755
--- a/views/notice-almost-over-quota.php
+++ b/views/notice-almost-over-quota.php
@@ -29,9 +29,10 @@
 </div>
 <p>
 	<?php esc_html_e( 'You are running out of credit! Don’t forget to upgrade your Imagify’s account.', 'imagify' ); ?>
-
-	<a target="_blank" class="button imagify-button imagify-button-secondary button-mini" href="<?php echo esc_url( imagify_get_external_url( 'subscription' ) ); ?>"><?php esc_html_e( 'See our plans', 'imagify' ); ?></a>
 </p>
+<div class="imagify-notice-quota-btn-container">
+	<a target="_blank" class="button imagify-button imagify-button-secondary button-mini" href="<?php echo esc_url( imagify_get_external_url( 'subscription' ) ); ?>"><?php esc_html_e( 'See our plans', 'imagify' ); ?></a>
+</div>
 <?php
 $this->print_template( 'notice-footer', array(
 	'dismissible' => 'almost-over-quota',
diff --git a/views/page-bulk.php b/views/page-bulk.php
index 80431254e..259b6cb4e 100755
--- a/views/page-bulk.php
+++ b/views/page-bulk.php
@@ -89,11 +89,12 @@
 					$user = new Imagify_User();
 					?>
 					<div class="imagify-options-title">
-						<p class="imagify-meteo-title">
+						<div class="imagify-th-titles imagify-flex imagify-vcenter">
 							<span class="dashicons dashicons-admin-users"></span>
-							<?php esc_html_e( 'Your Account', 'imagify' ); ?>
-						</p>
-
+							<p class="imagify-meteo-title">
+								<?php esc_html_e( 'Your Account', 'imagify' ); ?>
+							</p>
+						</div>
 						<a href="<?php echo esc_url( imagify_get_external_url( 'subscription' ) ); ?>" target="_blank"><?php _e( 'View your profile', 'imagify' ); ?></a>
 
 						<p class="imagify-meteo-subs">
diff --git a/views/page-settings.php b/views/page-settings.php
index 704f26204..fa06bff92 100755
--- a/views/page-settings.php
+++ b/views/page-settings.php
@@ -19,199 +19,199 @@
 	<div class="imagify-col imagify-main">
 
 		<?php $this->print_template( 'part-settings-header' ); ?>
-<div class="imagify-main-content">
-		<form action="<?php echo esc_url( $settings->get_form_action() ); ?>" id="imagify-settings" method="post">
-
-			<div class="imagify-settings-main-content<?php echo Imagify_Requirements::is_api_key_valid() ? '' : ' imagify-no-api-key'; ?>">
-
-				<?php settings_fields( $settings->get_settings_group() ); ?>
-				<?php wp_nonce_field( 'imagify-signup', 'imagifysignupnonce', false ); ?>
-				<?php wp_nonce_field( 'imagify-check-api-key', 'imagifycheckapikeynonce', false ); ?>
-
-				<?php
-				if ( ! Imagify_Requirements::is_api_key_valid() ) {
-					$this->print_template( 'part-settings-account' );
-					$this->print_template( 'part-settings-footer' );
-				}
-				?>
-
-				<div class="imagify-col imagify-shared-with-account-col<?php echo $hidden_class; ?>">
-					<div class="imagify-settings-section">
-
-						<h2 class="imagify-options-title"><?php _e( 'General Settings', 'imagify' ); ?></h2>
-
-						<p class="imagify-options-subtitle" id="imagify-optimization-level-label">
-							<?php _e( 'Optimization Level', 'imagify' ); ?>
-
-							<span class="imagify-info">
-								<span class="dashicons dashicons-info"></span>
-								<a href="#imagify-more-info" class="imagify-modal-trigger"><?php _e( 'More info?', 'imagify' ); ?></a>
-							</span>
-						</p>
-
-						<div class="imagify-setting-optim-level">
-							<p class="imagify-inline-options">
-								<input type="radio" id="imagify-optimization_level_normal" name="<?php echo $option_name; ?>[optimization_level]" value="0" <?php checked( $options->get( 'optimization_level' ), 0 ); ?> aria-describedby="imagify-optimization-level-label">
-								<label for="imagify-optimization_level_normal">
-									<?php _e( 'Normal', 'imagify' ); ?>
-								</label>
-
-								<input type="radio" id="imagify-optimization_level_aggro" name="<?php echo $option_name; ?>[optimization_level]" value="1" <?php checked( $options->get( 'optimization_level' ), 1 ); ?>  aria-describedby="imagify-optimization-level-label">
-								<label for="imagify-optimization_level_aggro">
-									<?php _e( 'Aggressive', 'imagify' ); ?>
-								</label>
-
-								<input type="radio" id="imagify-optimization_level_ultra" name="<?php echo $option_name; ?>[optimization_level]" value="2" <?php checked( $options->get( 'optimization_level' ), 2 ); ?> aria-describedby="imagify-optimization-level-label">
-								<label for="imagify-optimization_level_ultra">
-									<?php _e( 'Ultra', 'imagify' ); ?>
-								</label>
-							</p>
+		<div class="imagify-main-content">
+			<form action="<?php echo esc_url( $settings->get_form_action() ); ?>" id="imagify-settings" method="post">
 
-							<p class="imagify-visual-comparison-text">
-								<?php
-								printf(
-									/* translators: 1 is a button tag start, 2 is the button tag end. */
-									__( 'Need help to choose? %1$sTry the Visual Comparison%2$s', 'imagify' ),
-									'<button type="button" class="button button-primary button-mini-flat imagify-visual-comparison-btn imagify-modal-trigger" data-target="#imagify-visual-comparison">',
-									'</button>'
-								);
-								?>
-							</p>
-						</div>
+				<div class="imagify-settings-main-content<?php echo Imagify_Requirements::is_api_key_valid() ? '' : ' imagify-no-api-key'; ?>">
 
-						<p class="imagify-setting-line">
-						<?php
-						$settings->field_checkbox( array(
-							'option_name' => 'auto_optimize',
-							'label'       => __( 'Auto-Optimize images on upload', 'imagify' ),
-							'info'        => __( 'Automatically optimize every image you upload to WordPress.', 'imagify' ),
-						) );
-						?>
-						</p>
+					<?php settings_fields( $settings->get_settings_group() ); ?>
+					<?php wp_nonce_field( 'imagify-signup', 'imagifysignupnonce', false ); ?>
+					<?php wp_nonce_field( 'imagify-check-api-key', 'imagifycheckapikeynonce', false ); ?>
 
-						<p class="imagify-setting-line">
-							<?php
-							$settings->field_checkbox( array(
-								'option_name' => 'backup',
-								'label'       => __( 'Backup original images', 'imagify' ),
-								'info'        => __( 'Keep your original images in a separate folder before optimization process.', 'imagify' ),
-							) );
+					<?php
+					if ( ! Imagify_Requirements::is_api_key_valid() ) {
+						$this->print_template( 'part-settings-account' );
+						$this->print_template( 'part-settings-footer' );
+					}
+					?>
 
-							$backup_error_class = $options->get( 'backup' ) && ! Imagify_Requirements::attachments_backup_dir_is_writable() ? '' : ' hidden';
-							?>
-							<br/><strong id="backup-dir-is-writable" class="imagify-error<?php echo $backup_error_class; ?>" data-nonce="<?php echo esc_attr( wp_create_nonce( 'imagify_check_backup_dir_is_writable' ) ); ?>">
-								<?php
-								$backup_path = $this->filesystem->make_path_relative( get_imagify_backup_dir_path( true ) );
-								/* translators: %s is a file path. */
-								printf( __( 'The backup folder %s cannot be created or is not writable by the server, original images cannot be saved!', 'imagify' ), "<code>$backup_path</code>" );
-								?>
-							</strong>
-						</p>
+					<div class="imagify-col imagify-shared-with-account-col<?php echo $hidden_class; ?>">
+						<div class="imagify-settings-section">
 
-						<p class="imagify-setting-line">
-							<?php
-							$info  = __( 'EXIF data is information stored in your pictures like shutter speed, exposure compensation, ISO, etc...', 'imagify' );
-							$info .= ' <a href="' . esc_url( imagify_get_external_url( 'exif' ) ) . '" target="_blank">' . __( 'Learn more', 'imagify' ) . '</a><br/><br/>';
-							$info .= __( 'If you are a photographer, you may be interested in this option if you are displaying info like the model of your camera on your pages. Also, keeping EXIF data can fix some colorimetric problems.', 'imagify' );
+							<h2 class="imagify-options-title"><?php _e( 'General Settings', 'imagify' ); ?></h2>
+
+							<p class="imagify-options-subtitle" id="imagify-optimization-level-label">
+								<?php _e( 'Optimization Level', 'imagify' ); ?>
+
+								<span class="imagify-info">
+									<span class="dashicons dashicons-info"></span>
+									<a href="#imagify-more-info" class="imagify-modal-trigger"><?php _e( 'More info?', 'imagify' ); ?></a>
+								</span>
+							</p>
 
+							<div class="imagify-setting-optim-level">
+								<p class="imagify-inline-options">
+									<input type="radio" id="imagify-optimization_level_normal" name="<?php echo $option_name; ?>[optimization_level]" value="0" <?php checked( $options->get( 'optimization_level' ), 0 ); ?> aria-describedby="imagify-optimization-level-label">
+									<label for="imagify-optimization_level_normal">
+										<?php _e( 'Normal', 'imagify' ); ?>
+									</label>
+
+									<input type="radio" id="imagify-optimization_level_aggro" name="<?php echo $option_name; ?>[optimization_level]" value="1" <?php checked( $options->get( 'optimization_level' ), 1 ); ?>  aria-describedby="imagify-optimization-level-label">
+									<label for="imagify-optimization_level_aggro">
+										<?php _e( 'Aggressive', 'imagify' ); ?>
+									</label>
+
+									<input type="radio" id="imagify-optimization_level_ultra" name="<?php echo $option_name; ?>[optimization_level]" value="2" <?php checked( $options->get( 'optimization_level' ), 2 ); ?> aria-describedby="imagify-optimization-level-label">
+									<label for="imagify-optimization_level_ultra">
+										<?php _e( 'Ultra', 'imagify' ); ?>
+									</label>
+								</p>
+
+								<p class="imagify-visual-comparison-text">
+									<?php
+									printf(
+										/* translators: 1 is a button tag start, 2 is the button tag end. */
+										__( 'Need help to choose? %1$sTry the Visual Comparison%2$s', 'imagify' ),
+										'<button type="button" class="button button-primary button-mini-flat imagify-visual-comparison-btn imagify-modal-trigger" data-target="#imagify-visual-comparison">',
+										'</button>'
+									);
+									?>
+								</p>
+							</div>
+
+							<p class="imagify-setting-line">
+							<?php
 							$settings->field_checkbox( array(
-								'option_name' => 'exif',
-								'label'       => __( 'Keep all EXIF data from your images', 'imagify' ),
-								'info'        => $info,
+								'option_name' => 'auto_optimize',
+								'label'       => __( 'Auto-Optimize images on upload', 'imagify' ),
+								'info'        => __( 'Automatically optimize every image you upload to WordPress.', 'imagify' ),
 							) );
 							?>
-						</p>
-					</div>
-				</div>
-
-				<?php if ( Imagify_Requirements::is_api_key_valid() ) { ?>
-					<div class="imagify-col imagify-account-info-col">
-						<?php $this->print_template( 'part-settings-account' ); ?>
-					</div>
-				<?php } ?>
-			</div>
-
-			<div class="imagify-settings-main-content<?php echo $hidden_class; ?>">
+							</p>
 
-				<div class="imagify-settings-section imagify-clear">
-					<h2 class="imagify-options-title"><?php _e( 'Optimization', 'imagify' ); ?></h2>
-					<?php
-					$this->print_template( 'part-settings-webp' );
-					$this->print_template( 'part-settings-library' );
-					$this->print_template( 'part-settings-custom-folders' );
-					?>
-				</div>
-			</div>
+							<p class="imagify-setting-line">
+								<?php
+								$settings->field_checkbox( array(
+									'option_name' => 'backup',
+									'label'       => __( 'Backup original images', 'imagify' ),
+									'info'        => __( 'Keep your original images in a separate folder before optimization process.', 'imagify' ),
+								) );
 
-			<div class="imagify-settings-main-content imagify-pb0<?php echo $hidden_class; ?>">
-				<div class="imagify-settings-section imagify-clear">
-					<div class="imagify-col">
-						<h2 class="imagify-options-title"><?php _e( 'Display Options', 'imagify' ); ?></h2>
+								$backup_error_class = $options->get( 'backup' ) && ! Imagify_Requirements::attachments_backup_dir_is_writable() ? '' : ' hidden';
+								?>
+								<br/><strong id="backup-dir-is-writable" class="imagify-error<?php echo $backup_error_class; ?>" data-nonce="<?php echo esc_attr( wp_create_nonce( 'imagify_check_backup_dir_is_writable' ) ); ?>">
+									<?php
+									$backup_path = $this->filesystem->make_path_relative( get_imagify_backup_dir_path( true ) );
+									/* translators: %s is a file path. */
+									printf( __( 'The backup folder %s cannot be created or is not writable by the server, original images cannot be saved!', 'imagify' ), "<code>$backup_path</code>" );
+									?>
+								</strong>
+							</p>
 
-						<p class="imagify-options-subtitle"><?php _e( 'Show Toolbar Menu', 'imagify' ); ?></p>
+							<p class="imagify-setting-line">
+								<?php
+								$info  = __( 'EXIF data is information stored in your pictures like shutter speed, exposure compensation, ISO, etc...', 'imagify' );
+								$info .= ' <a href="' . esc_url( imagify_get_external_url( 'exif' ) ) . '" target="_blank">' . __( 'Learn more', 'imagify' ) . '</a><br/><br/>';
+								$info .= __( 'If you are a photographer, you may be interested in this option if you are displaying info like the model of your camera on your pages. Also, keeping EXIF data can fix some colorimetric problems.', 'imagify' );
 
-						<div class="imagify-col">
-							<p>
-							<?php
-							$settings->field_checkbox( array(
-								'option_name' => 'admin_bar_menu',
-								'label'       => __( 'I want this awesome quick access menu on my Toolbar.', 'imagify' ),
-							) );
-							?>
+								$settings->field_checkbox( array(
+									'option_name' => 'exif',
+									'label'       => __( 'Keep all EXIF data from your images', 'imagify' ),
+									'info'        => $info,
+								) );
+								?>
 							</p>
 						</div>
-						<div class="imagify-col">
-							<p>
-								<img class="imagify-menu-bar-img" src="<?php echo esc_url( IMAGIFY_ASSETS_IMG_URL . 'imagify-menu-bar-' . $lang . '.jpg' ); ?>" width="273" height="239" alt="">
-							</p>
+					</div>
+
+					<?php if ( Imagify_Requirements::is_api_key_valid() ) { ?>
+						<div class="imagify-col imagify-account-info-col">
+							<?php $this->print_template( 'part-settings-account' ); ?>
 						</div>
+					<?php } ?>
+				</div>
+
+				<div class="imagify-settings-main-content<?php echo $hidden_class; ?>">
 
+					<div class="imagify-settings-section imagify-clear">
+						<h2 class="imagify-options-title"><?php _e( 'Optimization', 'imagify' ); ?></h2>
 						<?php
-						/**
-						 * List of partners affected by this option.
-						 * For internal use only.
-						 *
-						 * @since  1.8.2
-						 * @author Grégory Viguier
-						 *
-						 * @param  array $partners An array of partner names.
-						 * @return array
-						 */
-						$partners = apply_filters( 'imagify_deactivatable_partners', array() );
-
-						if ( $partners ) {
-							?>
-							<p class="imagify-options-subtitle" id="imagify-partners-label">
-								<?php esc_html_e( 'Partners', 'imagify' ); ?>
+						$this->print_template( 'part-settings-webp' );
+						$this->print_template( 'part-settings-library' );
+						$this->print_template( 'part-settings-custom-folders' );
+						?>
+					</div>
+				</div>
 
-								<span class="imagify-info">
-									<span class="dashicons dashicons-info"></span>
-									<a href="#imagify-partners-info" class="imagify-modal-trigger"><?php _e( 'More info?', 'imagify' ); ?></a>
-								</span>
-							</p>
+				<div class="imagify-settings-main-content imagify-pb0<?php echo $hidden_class; ?>">
+					<div class="imagify-settings-section imagify-clear">
+						<div>
+							<h2 class="imagify-options-title"><?php _e( 'Display Options', 'imagify' ); ?></h2>
+
+							<p class="imagify-options-subtitle"><?php _e( 'Show Toolbar Menu', 'imagify' ); ?></p>
 
-							<p>
+							<div class="imagify-col">
+								<p>
 								<?php
 								$settings->field_checkbox( array(
-									'option_name' => 'partner_links',
-									'label'       => __( 'Display Partner Links', 'imagify' ),
+									'option_name' => 'admin_bar_menu',
+									'label'       => __( 'I want this awesome quick access menu on my Toolbar.', 'imagify' ),
 								) );
 								?>
-							</p>
+								</p>
+							</div>
+							<div class="imagify-col">
+								<p>
+									<img class="imagify-menu-bar-img" src="<?php echo esc_url( IMAGIFY_ASSETS_IMG_URL . 'imagify-menu-bar-' . $lang . '.jpg' ); ?>" width="273" height="239" alt="">
+								</p>
+							</div>
+
 							<?php
-						}
-						?>
+							/**
+							 * List of partners affected by this option.
+							 * For internal use only.
+							 *
+							 * @since  1.8.2
+							 * @author Grégory Viguier
+							 *
+							 * @param  array $partners An array of partner names.
+							 * @return array
+							 */
+							$partners = apply_filters( 'imagify_deactivatable_partners', array() );
+
+							if ( $partners ) {
+								?>
+								<p class="imagify-options-subtitle" id="imagify-partners-label">
+									<?php esc_html_e( 'Partners', 'imagify' ); ?>
+
+									<span class="imagify-info">
+										<span class="dashicons dashicons-info"></span>
+										<a href="#imagify-partners-info" class="imagify-modal-trigger"><?php _e( 'More info?', 'imagify' ); ?></a>
+									</span>
+								</p>
+
+								<p>
+									<?php
+									$settings->field_checkbox( array(
+										'option_name' => 'partner_links',
+										'label'       => __( 'Display Partner Links', 'imagify' ),
+									) );
+									?>
+								</p>
+								<?php
+							}
+							?>
+						</div>
 					</div>
-				</div>
 
-				<?php
-				if ( Imagify_Requirements::is_api_key_valid() ) {
-					$this->print_template( 'part-settings-footer' );
-				}
-				?>
-			</div>
-		</form>
-	</div>
+					<?php
+					if ( Imagify_Requirements::is_api_key_valid() ) {
+						$this->print_template( 'part-settings-footer' );
+					}
+					?>
+				</div>
+			</form>
+		</div>
 	</div>
 
 	<?php
diff --git a/views/part-settings-custom-folders.php b/views/part-settings-custom-folders.php
index 8ccd7553c..e10c7074e 100755
--- a/views/part-settings-custom-folders.php
+++ b/views/part-settings-custom-folders.php
@@ -47,8 +47,8 @@
 			);
 
 			$themes[ $theme['path'] ] = $theme;
-			$added    = false;
-			$rel_path = strtolower( $theme['label'] );
+			$added                    = false;
+			$rel_path                 = strtolower( $theme['label'] );
 
 			foreach ( $custom_folders as $path => $label ) {
 				if ( strpos( $rel_path, strtolower( $label ) ) === 0 ) {
@@ -66,118 +66,126 @@
 	$themes_count = count( $themes );
 }
 ?>
+	<div class="imagify-custom-folders-section">
+		<div class="imagify-col" id="custom-folders">
+			<h3 class="imagify-options-subtitle"><?php _e( 'Custom Folders', 'imagify' ); ?></h3>
 
-<div class="imagify-col" id="custom-folders">
-	<h3 class="imagify-options-subtitle"><?php _e( 'Custom Folders', 'imagify' ); ?></h3>
+			<div id="imagify-custom-folders" class="hide-if-no-js imagify-mt2">
 
-	<div id="imagify-custom-folders" class="hide-if-no-js imagify-mt2">
+				<?php if ( $themes ) { ?>
+					<div class="imagify-folder-themes-suggestion">
+						<div class="imagify-fts-header imagify-flex imagify-vcenter">
+							<span><i class="dashicons dashicons-info"></i></span>
+							<p>
+								<?php
+								$theme = reset( $themes );
 
-		<?php if ( $themes ) { ?>
-			<div class="imagify-folder-themes-suggestion">
-				<div class="imagify-fts-header imagify-flex imagify-vcenter">
-					<span><i class="dashicons dashicons-info"></i></span>
-					<p>
-						<?php
-						$theme = reset( $themes );
-
-						/* translators: %s is a theme name. */
-						printf( __( 'You’re using %s', 'imagify' ), '<strong>' . $theme['name'] . '</strong>' );
-
-						if ( $themes_count > 1 ) {
-							$theme = end( $themes );
-							echo '<br>';
-							/* translators: %s is a theme name. */
-							printf( __( 'child theme of %s', 'imagify' ), '<strong>' . $theme['name'] . '</strong>' );
-						}
-						?>
-					</p>
-				</div>
-
-				<div class="imagify-fts-content">
-					<?php
-					if ( ! $themes_not_added ) {
-						?>
-						<p class="imagify-mb0"><?php echo _n( 'Your theme is already in the optimization process. All Good!', 'Your themes are already in the optimization process. All Good!', $themes_count, 'imagify' ); ?></p>
-						<?php
-					} elseif ( count( $themes_not_added ) !== $themes_count ) {
-						$theme = reset( $themes_not_added );
-						$theme = $themes[ $theme ];
-						?>
-						<p><?php _e( 'Only one of your current themes is in the optimization process, would you like to also optimize the other one?', 'imagify' ); ?></p>
-
-						<button id="imagify-add-themes-to-custom-folder" class="button imagify-button-clean imagify-add-themes" type="button" data-theme="<?php echo esc_attr( $theme['path'] ) . '#///#' . esc_attr( $theme['label'] ); ?>">
-							<span class="dashicons dashicons-plus"></span>
-							<span class="button-text"><?php
 								/* translators: %s is a theme name. */
-								printf( __( 'Add %s to optimization', 'imagify' ), '<strong>' . $theme['name'] . '</strong>' );
-							?></span>
-						</button>
-						<?php
-					} else {
-						foreach ( $themes as $path => $theme ) {
-							$themes[ $path ] = esc_attr( $theme['path'] ) . '#///#' . esc_attr( $theme['label'] );
-						}
-						?>
-						<p><?php echo _n( 'Would you like to optimize your theme?', 'Would you like to optimize your themes?', $themes_count, 'imagify' ); ?></p>
-
-						<button id="imagify-add-themes-to-custom-folder" class="button imagify-button-clean imagify-add-themes" type="button" data-theme="<?php echo implode( '" data-theme-parent="', $themes ); ?>">
-							<span class="dashicons dashicons-plus"></span>
-							<span class="button-text"><?php echo _n( 'Add the theme to optimization', 'Add the themes to optimization', $themes_count, 'imagify' ); ?></span>
-						</button>
-						<?php
-					}
-					?>
-				</div>
-			</div>
-		<?php } ?>
-
-		<p class="imagify-kindof-title imagify-flex imagify-vcenter">
-			<span><?php _e( 'Select folders for optimization.', 'imagify' ); ?></span>
-			<span>
-				<button id="imagify-add-custom-folder" class="button imagify-button-mini imagify-button-primary imagify-add-custom-folder" type="button">
+								printf( __( 'You’re using %s', 'imagify' ), '<strong>' . $theme['name'] . '</strong>' );
+
+								if ( $themes_count > 1 ) {
+									$theme = end( $themes );
+									echo '<br>';
+									/* translators: %s is a theme name. */
+									printf( __( 'child theme of %s', 'imagify' ), '<strong>' . $theme['name'] . '</strong>' );
+								}
+								?>
+							</p>
+						</div>
+
+						<div class="imagify-fts-content">
+							<?php
+							if ( ! $themes_not_added ) {
+								?>
+								<p class="imagify-mb0"><?php echo _n( 'Your theme is already in the optimization process. All Good!', 'Your themes are already in the optimization process. All Good!', $themes_count, 'imagify' ); ?></p>
+								<?php
+							} elseif ( count( $themes_not_added ) !== $themes_count ) {
+								$theme = reset( $themes_not_added );
+								$theme = $themes[ $theme ];
+								?>
+								<p><?php _e( 'Only one of your current themes is in the optimization process, would you like to also optimize the other one?', 'imagify' ); ?></p>
+
+								<button id="imagify-add-themes-to-custom-folder"
+										class="button imagify-button-clean imagify-add-themes" type="button"
+										data-theme="<?php echo esc_attr( $theme['path'] ) . '#///#' . esc_attr( $theme['label'] ); ?>">
+									<span class="dashicons dashicons-plus"></span>
+									<span class="button-text"><?php
+										/* translators: %s is a theme name. */
+										printf( __( 'Add %s to optimization', 'imagify' ), '<strong>' . $theme['name'] . '</strong>' );
+									?></span>
+								</button>
+								<?php
+							} else {
+								foreach ( $themes as $path => $theme ) {
+									$themes[ $path ] = esc_attr( $theme['path'] ) . '#///#' . esc_attr( $theme['label'] );
+								}
+								?>
+								<p><?php echo _n( 'Would you like to optimize your theme?', 'Would you like to optimize your themes?', $themes_count, 'imagify' ); ?></p>
+
+								<button id="imagify-add-themes-to-custom-folder"
+										class="button imagify-button-clean imagify-add-themes" type="button"
+										data-theme="<?php echo implode( '" data-theme-parent="', $themes ); ?>">
+									<span class="dashicons dashicons-plus"></span>
+									<span
+										class="button-text"><?php echo _n( 'Add the theme to optimization', 'Add the themes to optimization', $themes_count, 'imagify' ); ?></span>
+								</button>
+								<?php
+							}
+							?>
+						</div>
+					</div>
+				<?php } ?>
+
+				<p class="imagify-kindof-title imagify-flex imagify-vcenter">
+					<span><?php _e( 'Select folders for optimization.', 'imagify' ); ?></span>
+					<span>
+				<button id="imagify-add-custom-folder"
+						class="button imagify-button-mini imagify-button-primary imagify-add-custom-folder"
+						type="button">
 					<span class="dashicons dashicons-plus"></span>
 					<span class="button-text"><?php _e( 'Add folders', 'imagify' ); ?></span>
 				</button>
 				<img class="imagify-loader" aria-hidden="true" alt="<?php esc_attr_e( 'Loading...', 'imagify' ); ?>" src="<?php echo esc_url( IMAGIFY_ASSETS_IMG_URL . 'loader-balls.svg' ); ?>" width="38" height="24"/>
 			</span>
-		</p>
+				</p>
 
-		<fieldset id="imagify-custom-folders-selected">
-			<?php
-			if ( $custom_folders ) {
-				foreach ( $custom_folders as $placeholder => $label ) {
+				<fieldset id="imagify-custom-folders-selected">
+					<?php
+					if ( $custom_folders ) {
+						foreach ( $custom_folders as $placeholder => $label ) {
+							$this->print_template( 'part-settings-row-custom-folder', array(
+								'value' => $placeholder,
+								'label' => $label,
+							) );
+						}
+					}
+					?>
+				</fieldset>
+
+				<p>
+					<?php
+					printf(
+					/* translators: 1 and 2 are <strong> opening and closing tags. */
+						__( '%1$sSelecting a folder will also optimize images in sub-folders.%2$s The only exception is "Site’s root": when selected, only images that are directly at the site’s root will be optimized (sub-folders can be selected separately).', 'imagify' ),
+						'<strong>',
+						'</strong>'
+					);
+					?>
+					<br/>
+					<?php _e( 'Folders that are hidden in the folder selector window are excluded and will not be optimized even if a parent folder is selected.', 'imagify' ); ?>
+				</p>
+
+				<p class="imagify-success hidden"><?php _e( 'You changed your custom folder settings, don\'t forget to save your changes!', 'imagify' ); ?></p>
+
+				<script type="text/html" id="tmpl-imagify-custom-folder">
+					<?php
 					$this->print_template( 'part-settings-row-custom-folder', array(
-						'value' => $placeholder,
-						'label' => $label,
+						'value' => '{{ data.value }}',
+						'label' => '{{ data.label }}',
 					) );
-				}
-			}
-			?>
-		</fieldset>
-
-		<p>
-			<?php
-			printf(
-				/* translators: 1 and 2 are <strong> opening and closing tags. */
-				__( '%1$sSelecting a folder will also optimize images in sub-folders.%2$s The only exception is "Site’s root": when selected, only images that are directly at the site’s root will be optimized (sub-folders can be selected separately).', 'imagify' ),
-				'<strong>',
-				'</strong>'
-			);
-			?>
-			<br/>
-			<?php _e( 'Folders that are hidden in the folder selector window are excluded and will not be optimized even if a parent folder is selected.', 'imagify' ); ?>
-		</p>
-
-		<p class="imagify-success hidden"><?php _e( 'You changed your custom folder settings, don\'t forget to save your changes!', 'imagify' ); ?></p>
-
-		<script type="text/html" id="tmpl-imagify-custom-folder">
-			<?php
-			$this->print_template( 'part-settings-row-custom-folder', array(
-				'value' => '{{ data.value }}',
-				'label' => '{{ data.label }}',
-			) );
-			?>
-		</script>
+					?>
+				</script>
+			</div>
+		</div>
 	</div>
-</div>
 <?php
diff --git a/views/part-settings-library.php b/views/part-settings-library.php
index b00e2cd76..67348505d 100755
--- a/views/part-settings-library.php
+++ b/views/part-settings-library.php
@@ -5,29 +5,30 @@
 $options     = Imagify_Options::get_instance();
 $option_name = $options->get_option_name();
 ?>
-<div class="<?php echo imagify_can_optimize_custom_folders() ? 'imagify-col' : ''; ?>">
-	<h3 class="imagify-options-subtitle"><?php esc_html_e( 'Media Library', 'imagify' ); ?></h3>
+	<div class="imagify-media-lib-section">
+		<div class="<?php echo imagify_can_optimize_custom_folders() ? 'imagify-col' : ''; ?>">
+			<h3 class="imagify-options-subtitle"><?php esc_html_e( 'Media Library', 'imagify' ); ?></h3>
 
-	<p class="imagify-setting-line">
-		<?php
-		$settings->field_checkbox(
-			[
-				'option_name' => 'resize_larger',
-				'label'       => __( 'Resize larger images', 'imagify' ),
-				'attributes'  => [
-					'aria-describedby' => 'describe-resize_larger',
-				],
-			]
-		);
-		?>
+			<p class="imagify-setting-line">
+				<?php
+				$settings->field_checkbox(
+					[
+						'option_name' => 'resize_larger',
+						'label'       => __( 'Resize larger images', 'imagify' ),
+						'attributes'  => [
+							'aria-describedby' => 'describe-resize_larger',
+						],
+					]
+				);
+				?>
 
-		<span class="imagify-options-line">
+				<span class="imagify-options-line">
 			<label for="imagify_resize_larger_w">
 			<?php
 			$max_sizes       = get_imagify_max_intermediate_image_size();
 			$resize_larger_w = $options->get( 'resize_larger_w' );
 			printf(
-				/* translators: 1 is a text input for a number of pixels (don't use %d). */
+			/* translators: 1 is a text input for a number of pixels (don't use %d). */
 				esc_html__( 'to maximum %s pixels width', 'imagify' ),
 				'<input type="number" id="imagify_resize_larger_w" min="' . $max_sizes['width'] . '" name="' . $option_name . '[resize_larger_w]" value="' . ( $resize_larger_w ? $resize_larger_w : '' ) . '" size="5">'
 			);
@@ -35,64 +36,65 @@
 			</label>
 		</span>
 
-		<span id="describe-resize_larger" class="imagify-info">
+				<span id="describe-resize_larger" class="imagify-info">
 			<span class="dashicons dashicons-info"></span>
-			<?php
-			printf(
-				/* translators: 1 is a number of pixels. */
-				esc_html__( 'This option is recommended to reduce larger images. You can save up to 80%% after resizing. The new width should not be less than your largest thumbnail width, which is actually %dpx.', 'imagify' ),
-				$max_sizes['width']
-			);
-			echo ' ';
+					<?php
+					printf(
+					/* translators: 1 is a number of pixels. */
+						esc_html__( 'This option is recommended to reduce larger images. You can save up to 80%% after resizing. The new width should not be less than your largest thumbnail width, which is actually %dpx.', 'imagify' ),
+						$max_sizes['width']
+					);
+					echo ' ';
 
-			if ( function_exists( 'wp_get_original_image_path' ) ) {
-				// WP 5.3+.
-				echo '<strong>' . esc_html__( 'Resizing is done on upload or during optimization.', 'imagify' ) . '</strong>';
-			} else {
-				esc_html_e( 'Resizing is done only during optimization.', 'imagify' );
-			}
-			?>
+					if ( function_exists( 'wp_get_original_image_path' ) ) {
+						// WP 5.3+.
+						echo '<strong>' . esc_html__( 'Resizing is done on upload or during optimization.', 'imagify' ) . '</strong>';
+					} else {
+						esc_html_e( 'Resizing is done only during optimization.', 'imagify' );
+					}
+					?>
 		</span>
-	</p>
+			</p>
 
-	<?php if ( ! imagify_is_active_for_network() ) : ?>
+			<?php if ( ! imagify_is_active_for_network() ) : ?>
 
-		<div class="imagify-divider"></div>
+				<div class="imagify-divider"></div>
 
-		<h4 class="imagify-h4-like"><?php esc_html_e( 'Files optimization', 'imagify' ); ?></h4>
+				<h4 class="imagify-h4-like"><?php esc_html_e( 'Files optimization', 'imagify' ); ?></h4>
 
-		<p>
-			<?php esc_html_e( 'You can choose to optimize different image sizes created by WordPress here.', 'imagify' ); ?>
-		</p>
+				<p>
+					<?php esc_html_e( 'You can choose to optimize different image sizes created by WordPress here.', 'imagify' ); ?>
+				</p>
 
-		<p>
-			<?php
-			printf(
-				/* translators: 1 is a "bold" tag start, 2 is the "bold" tag end. */
-				esc_html__( 'The %1$soriginal size%2$s is %1$sautomatically optimized%2$s by Imagify.', 'imagify' ),
-				'<strong>', '</strong>'
-			);
-			?>
-			<br>
-			<span class="imagify-success">
+				<p>
+					<?php
+					printf(
+					/* translators: 1 is a "bold" tag start, 2 is the "bold" tag end. */
+						esc_html__( 'The %1$soriginal size%2$s is %1$sautomatically optimized%2$s by Imagify.', 'imagify' ),
+						'<strong>', '</strong>'
+					);
+					?>
+					<br>
+					<span class="imagify-success">
 				<?php esc_html_e( 'Remember each additional image size will affect your Imagify monthly usage!', 'imagify' ); ?>
 			</span>
-		</p>
+				</p>
 
-		<?php
-		/**
-		 * Disallowed thumbnail sizes.
-		 */
-		$settings->field_checkbox_list(
-			[
-				'option_name'   => 'disallowed-sizes',
-				'legend'        => __( 'Choose the sizes to optimize', 'imagify' ),
-				'values'        => Imagify_Settings::get_thumbnail_sizes(),
-				'reverse_check' => true,
-			]
-		);
-		?>
+				<?php
+				/**
+				 * Disallowed thumbnail sizes.
+				 */
+				$settings->field_checkbox_list(
+					[
+						'option_name'   => 'disallowed-sizes',
+						'legend'        => __( 'Choose the sizes to optimize', 'imagify' ),
+						'values'        => Imagify_Settings::get_thumbnail_sizes(),
+						'reverse_check' => true,
+					]
+				);
+				?>
 
-	<?php endif; ?>
-</div>
+			<?php endif; ?>
+		</div>
+	</div>
 <?php