diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
index e0f9e7eccb11dccb4d27150c8610694454d9aba1..2bde50da9b318aa5732671622284cf607697afdf 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@@ -343,12 +343,7 @@ function displaySharedUsers(path) {
users.forEach(function(user) {
user_list_html += "<li class='list-group-item text-left' data-uid='" + user.uid + "'>"
-
- if (user.image) {
- user_list_html += "<img id='user-image' class='avatar float-left mr-2' src='" + user.image + "'></img>"
- } else {
- user_list_html += "<span class='avatar float-left mr-2'>" + user.name.charAt(0) + "</span>"
- }
+ user_list_html += "<span class='avatar float-left mr-2'>" + user.name.charAt(0) + "</span>"
user_list_html += "<span class='shared-user'>" + user.name + "<span class='text-muted ml-1'>" + user.uid + "</span></span>"
user_list_html += "<span class='text-primary float-right shared-user cursor-pointer' onclick='removeSharedUser(this)'><i class='fas fa-times'></i></span>"
user_list_html += "</li>"
diff --git a/app/controllers/concerns/joiner.rb b/app/controllers/concerns/joiner.rb
index 3132eb0cc0b76deab826169230e7897326b94c62..f887ed43ecacd1074a5b3b1f0becee2131ec7dfb 100644
--- a/app/controllers/concerns/joiner.rb
+++ b/app/controllers/concerns/joiner.rb
@@ -70,7 +70,6 @@ module Joiner
opts[:mute_on_start] = room_setting_with_config("muteOnStart")
if current_user
- opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image)
redirect_to join_path(@room, current_user.name, opts, current_user.uid)
else
join_name = params[:join_name] || params[@room.invite_path][:join_name]
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index debf2511503b338c3e0a40be158da3c176aea944..a2741d29b92ade5820542ade81cf5a248563f214 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -180,7 +180,6 @@ class RoomsController < ApplicationController
opts[:mute_on_start] = room_setting_with_config("muteOnStart")
opts[:require_moderator_approval] = room_setting_with_config("requireModeratorApproval")
opts[:record] = record_meeting
- opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image)
begin
redirect_to join_path(@room, current_user.name, opts, current_user.uid)
diff --git a/app/views/rooms/cant_create_rooms.html.erb b/app/views/rooms/cant_create_rooms.html.erb
index cb661fa60f9d865753fae7baf1d91bd255fca075..2d9f356ff829d07abd22c5b9a7a57b5b44c95003 100644
--- a/app/views/rooms/cant_create_rooms.html.erb
+++ b/app/views/rooms/cant_create_rooms.html.erb
@@ -20,15 +20,11 @@
<div class="card card-profile h-100">
<div class="card-header bg-primary h-50"></div>
<div class="card-body text-center">
- <% if current_user.image.blank? || !valid_url?(current_user.image) %>
- <span class="avatar avatar-xxxl card-profile-img bg-primary"><%= current_user.name.first %></span>
- <% else %>
- <%= image_tag(current_user.image, class: "avatar avatar-xxxl card-profile-img") %>
- <% end %>
- <h2 class="mb-3"><%= current_user.name %></h2>
- <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %>
- <i class="dropdown-icon fas fa-id-card mr-3"></i><%= t("room.no_room.edit_profile") %>
- <% end %>
+ <span class="avatar avatar-xxxl card-profile-img bg-primary"><%= current_user.name.first %></span>
+ <h2 class="mb-3"><%= current_user.name %></h2>
+ <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %>
+ <i class="dropdown-icon fas fa-id-card mr-3"></i><%= t("room.no_room.edit_profile") %>
+ <% end %>
</div>
</div>
</div>
diff --git a/app/views/rooms/components/_room_event.html.erb b/app/views/rooms/components/_room_event.html.erb
index a218e37a825e63126879712318d89a82902ebde8..2482c4657ac86f310d2927cfdaa0df201c481fad 100644
--- a/app/views/rooms/components/_room_event.html.erb
+++ b/app/views/rooms/components/_room_event.html.erb
@@ -25,11 +25,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 mb-5">
- <% if @room.owner.image.blank? %>
- <span class="avatar"><%= @room.owner.name.first %></span>
- <% else %>
- <span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
- <% end %>
+ <span class="avatar"><%= @room.owner.name.first %></span>
<h5 id="room-owner-name" class="font-weight-normal ml-4 mt-3 d-inline-block"><%= @room.owner.name %> (<%= t("room.owner") %>)</h5>
</div>
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index c0c6a01fd3b48e0573adea606682af081a71f64d..12a23b3b545a4827bd5ba237e1bf58117d02cde0 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -40,12 +40,7 @@
<div class="dropdown">
<a href="#" class="nav-link pr-0" data-toggle="dropdown">
- <% if current_user.image.blank? || !valid_url?(current_user.image) %>
- <span class="avatar"><%= current_user.name.first %></span>
- <% else %>
- <span id="user-avatar" class="avatar d-none"><%= current_user.name.first %></span>
- <%= image_tag(current_user.image, id: "user-image", class: "avatar") %>
- <% end %>
+ <span class="avatar"><%= current_user.name.first %></span>
<span class="ml-2 d-none d-lg-block">
<span class="text-default username"><%= current_user.name %></span>
</span>
diff --git a/app/views/users/components/_account.html.erb b/app/views/users/components/_account.html.erb
index 30a31bfa98c026b8c00d755cca8d8d974102ec15..77ad5eac1ef88453335be2be89a21f2e3df55ae8 100644
--- a/app/views/users/components/_account.html.erb
+++ b/app/views/users/components/_account.html.erb
@@ -60,20 +60,6 @@
<%= translated_role_name(@user.role) %>
</span>
<% end %>
-
- <%= f.label :image, t("settings.account.image"), class: "form-label mt-5" %>
- <div class="row">
- <div class="col-5 col-sm-2">
- <% if @user.image.blank? || !valid_url?(@user.image) %>
- <span class="avatar avatar-xxl mr-5 mt-2 bg-primary"><%= @user.name.first %></span>
- <% else %>
- <%= image_tag(@user.image, class: "avatar avatar-xxl mr-5 mt-2") %>
- <% end %>
- </div>
- <div class="col-7 col-sm-10 mt-5">
- <%= f.text_field :image, class: "form-control #{form_is_invalid?(@user, :image)}", placeholder: t("settings.account.image_url") %>
- </div>
- </div>
</div>
<div class="card-footer">
<%= f.submit t("update"), class: "btn btn-primary float-right ml-4" %>