diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index b99cf203a7..59ac5ce65c 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -1923,6 +1923,9 @@ body {
   background-repeat: no-repeat;
   background-position-x: 0;
 }
+#loginMainDiv div#centerBox form table.divLoginbox td.remember_me_row {
+  border-bottom: 1px solid silver;
+}
 #loginMainDiv div#centerBox form table.divLoginbox select:focus,
 #loginMainDiv div#centerBox form table.divLoginbox select:hover {
   box-shadow: none;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 86ae6da2aa..18abb19168 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -1912,6 +1912,9 @@ body {
   background-repeat: no-repeat;
   background-position-x: 0;
 }
+#loginMainDiv div#centerBox form table.divLoginbox td.remember_me_row {
+  border-bottom: 1px solid silver;
+}
 #loginMainDiv div#centerBox form table.divLoginbox select:focus,
 #loginMainDiv div#centerBox form table.divLoginbox select:hover {
   box-shadow: none;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index f0ca3b2b91..105ed183f0 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -1923,6 +1923,9 @@ body {
   background-repeat: no-repeat;
   background-position-x: 0;
 }
+#loginMainDiv div#centerBox form table.divLoginbox td.remember_me_row {
+  border-bottom: 1px solid silver;
+}
 #loginMainDiv div#centerBox form table.divLoginbox select:focus,
 #loginMainDiv div#centerBox form table.divLoginbox select:hover {
   box-shadow: none;
diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less
index 0b61d656e2..3138f5f035 100644
--- a/pixelegg/less/layout_loginPage.less
+++ b/pixelegg/less/layout_loginPage.less
@@ -193,6 +193,7 @@
 					background-repeat: no-repeat;
 					background-position-x: 0;
 				}
+				td.remember_me_row {border-bottom: 1px solid silver}
 				select:focus, select:hover {box-shadow:none;}
 				input {
 					width: ~"calc(250px - 22px)";
diff --git a/pixelegg/login.tpl b/pixelegg/login.tpl
index b30c588b38..3af498aa8a 100644
--- a/pixelegg/login.tpl
+++ b/pixelegg/login.tpl
@@ -50,7 +50,7 @@
 				<!-- END 2fa_section -->
 				<!-- BEGIN remember_me_selection -->
                 <tr>
-                    <td>
+                    <td class="remember_me_row">
 						<label for="remember_me" title="{lang_remember_me_help}"><span class="field_icons remember_me" style="background-image: none">{lang_remember_me}</span></label>
 						{select_remember_me}
 					</td>
diff --git a/pixelegg/login_mobile.tpl b/pixelegg/login_mobile.tpl
index 3119a12073..6d4c3f9eac 100644
--- a/pixelegg/login_mobile.tpl
+++ b/pixelegg/login_mobile.tpl
@@ -53,8 +53,8 @@
 				<!-- END 2fa_section -->
 				<!-- BEGIN remember_me_selection -->
                  <tr>
-                    <td>
-						<span class="field_icons remember_me">{lang_remember_me}:</span>
+                    <td class="remember_me_row">
+						<label for="remember_me" title="{lang_remember_me_help}"><span class="field_icons remember_me" style="background-image: none">{lang_remember_me}</span></label>
 						{select_remember_me}
 					</td>
                 </tr>
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 223483a862..0a8ee3fa92 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -1934,6 +1934,9 @@ body {
   background-repeat: no-repeat;
   background-position-x: 0;
 }
+#loginMainDiv div#centerBox form table.divLoginbox td.remember_me_row {
+  border-bottom: 1px solid silver;
+}
 #loginMainDiv div#centerBox form table.divLoginbox select:focus,
 #loginMainDiv div#centerBox form table.divLoginbox select:hover {
   box-shadow: none;
@@ -7309,6 +7312,9 @@ form[id^="ranking-"] .dialogHeadbar {
     font-size: large;
     padding: 0.8%;
   }
+  div#loginMainDiv div#centerBox form table.divLoginbox td span.field_icons.remember_me {
+    padding-left: 40px;
+  }
   div#loginMainDiv div#centerBox #loginCdMessage {
     margin: 8px;
     font-size: 12pt !important;
@@ -8627,6 +8633,8 @@ form[id^="ranking-"] .dialogHeadbar {
     height: 32px;
     background-image: url(../images/topmenu_items/mobile/checkbox.svg) !important;
     display: inline-block;
+    background-repeat: no-repeat;
+    background-size: 31px;
   }
   body input[type="checkbox"]:checked {
     background-image: url(../images/topmenu_items/mobile/checkbox.svg) !important;
diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less
index 4d2091ce1f..54f79dbe97 100644
--- a/pixelegg/mobile/fw_mobile.less
+++ b/pixelegg/mobile/fw_mobile.less
@@ -151,6 +151,7 @@
 						td {
 							font-size: large;
 							padding:0.8%;
+							span.field_icons.remember_me {padding-left: 40px;}
 						}
 					}
 				}
@@ -1479,6 +1480,8 @@
 			height:32px;
 			background-image:url(../images/topmenu_items/mobile/checkbox.svg) !important;
 			display:inline-block;
+			background-repeat: no-repeat;
+			background-size: 31px;
 		}
 		input[type="checkbox"]:checked{
 			background-image:url(../images/topmenu_items/mobile/checkbox.svg) !important;