diff --git a/public/scss/modules/picture-switcher.scss b/public/scss/modules/picture-switcher.scss
index 05572c56dd..218f826690 100644
--- a/public/scss/modules/picture-switcher.scss
+++ b/public/scss/modules/picture-switcher.scss
@@ -1,14 +1,4 @@
 .picture-switcher {
-	img, .user-icon {
-		@include user-icon-style(46px, 2.4rem, 50%);
-	}
-
-	@include media-breakpoint-down(sm) {
-		img, .user-icon {
-			display: none;
-		}
-	}
-
 	h4 {
 		line-height: 46px;
 		margin: 0;
diff --git a/src/views/modals/change-picture.tpl b/src/views/modals/change-picture.tpl
index af5c203306..9d7b9185c9 100644
--- a/src/views/modals/change-picture.tpl
+++ b/src/views/modals/change-picture.tpl
@@ -1,5 +1,5 @@
-<div class="row">
-	<div class="col-6 col-sm-8 col-md-6">
+<div class="row gy-2">
+	<div class="col-12 col-sm-8 col-md-6">
 		<div class="list-group">
 			{{{each pictures}}}
 			<button type="button" class="list-group-item d-flex p-3" data-type="{pictures.type}">
@@ -13,40 +13,21 @@
 			{{{end}}}
 		</div>
 	</div>
-	<div class="col-6 col-sm-4 col-md-6">
+	<div class="col-12 col-sm-4 col-md-6">
 		<div class="list-group">
-			<!-- IF allowProfileImageUploads -->
+			{{{ if allowProfileImageUploads }}}
 			<button type="button" class="list-group-item" data-action="upload">
-				<span class="hidden-xs hidden-sm">
-					[[user:upload_new_picture]]
-				</span>
-				<span class="visible-xs-inline visible-sm-inline">
-					<i class="fa fa-plus"></i>
-					<i class="fa fa-upload"></i>
-				</span>
+				[[user:upload_new_picture]]
 			</button>
-			<!-- ENDIF allowProfileImageUploads -->
+			{{{ end }}}
 			<button type="button" class="list-group-item" data-action="upload-url">
-				<span class="hidden-xs hidden-sm">
-					[[user:upload_new_picture_from_url]]
-				</span>
-				<span class="visible-xs-inline visible-sm-inline">
-					<i class="fa fa-plus"></i>
-					<i class="fa fa-link"></i>
-				</span>
+				[[user:upload_new_picture_from_url]]
 			</button>
-			<!-- IF uploaded -->
+			{{{ if uploaded }}}
 			<button type="button" class="list-group-item" data-action="remove-uploaded">
-				<span class="hidden-xs hidden-sm">
-					[[user:remove_uploaded_picture]]
-				</span>
-				<span class="visible-xs-inline visible-sm-inline">
-					<i class="fa fa-picture-o"></i>
-					<i class="fa fa-long-arrow-right"></i>
-					<i class="fa fa-trash-o"></i>
-				</span>
+				[[user:remove_uploaded_picture]]
 			</button>
-			<!-- ENDIF uploaded -->
+			{{{ end }}}
 		</div>
 	</div>
 </div>