diff --git a/src/app/tools/tankopedia/[id]/components/AntagonistBar/components/SearchResults.tsx b/src/app/tools/tankopedia/[id]/components/AntagonistBar/components/SearchResults.tsx
new file mode 100644
index 000000000..841781ff5
--- /dev/null
+++ b/src/app/tools/tankopedia/[id]/components/AntagonistBar/components/SearchResults.tsx
@@ -0,0 +1,53 @@
+import { Button, Flex, Text } from '@radix-ui/themes';
+import { use } from 'react';
+import { SmallTankIcon } from '../../../../../../../components/SmallTankIcon';
+import {
+  TIER_ROMAN_NUMERALS,
+  tankDefinitions,
+} from '../../../../../../../core/blitzkrieg/tankDefinitions';
+
+interface SearchResultsProps {
+  ids: number[];
+}
+
+export function SearchResults({ ids }: SearchResultsProps) {
+  const awaitedTankDefinitions = use(tankDefinitions);
+
+  return (
+    <Flex justify="center">
+      <Flex direction="column" gap="2" align="start">
+        {ids.map((id) => {
+          const tank = awaitedTankDefinitions[id];
+
+          return (
+            <Button key={id} variant="ghost" style={{ width: '100%' }}>
+              <Flex gap="2" align="start" style={{ width: '100%' }}>
+                <Text align="right" color="gray" style={{ width: 24 }}>
+                  {TIER_ROMAN_NUMERALS[tank.tier]}
+                </Text>
+
+                <Text color={tank.tree_type === 'collector' ? 'blue' : 'amber'}>
+                  <Flex gap="2" align="center">
+                    <SmallTankIcon id={tank.id} size={16} />
+
+                    <div
+                      style={{
+                        display: 'block',
+                        color:
+                          tank.tree_type === 'researchable'
+                            ? 'white'
+                            : undefined,
+                      }}
+                    >
+                      {tank.name}
+                    </div>
+                  </Flex>
+                </Text>
+              </Flex>
+            </Button>
+          );
+        })}
+      </Flex>
+    </Flex>
+  );
+}
diff --git a/src/app/tools/tankopedia/[id]/components/AntagonistBar.tsx b/src/app/tools/tankopedia/[id]/components/AntagonistBar/index.tsx
similarity index 74%
rename from src/app/tools/tankopedia/[id]/components/AntagonistBar.tsx
rename to src/app/tools/tankopedia/[id]/components/AntagonistBar/index.tsx
index d643b7535..d62718d1e 100644
--- a/src/app/tools/tankopedia/[id]/components/AntagonistBar.tsx
+++ b/src/app/tools/tankopedia/[id]/components/AntagonistBar/index.tsx
@@ -19,15 +19,15 @@ import { go } from 'fuzzysort';
 import { produce } from 'immer';
 import { debounce } from 'lodash';
 import { Dispatch, SetStateAction, use, useRef, useState } from 'react';
-import { ModuleButton } from '../../../../../components/ModuleButton';
-import { SmallTankIcon } from '../../../../../components/SmallTankIcon';
+import { ModuleButton } from '../../../../../../components/ModuleButton';
+import { SmallTankIcon } from '../../../../../../components/SmallTankIcon';
 import {
   SHELL_NAMES,
-  tankDefinitions,
   tankNamesDiacritics,
-} from '../../../../../core/blitzkrieg/tankDefinitions';
-import { useTankopedia } from '../../../../../stores/tankopedia';
-import { Duel } from '../page';
+} from '../../../../../../core/blitzkrieg/tankDefinitions';
+import { useTankopedia } from '../../../../../../stores/tankopedia';
+import { Duel } from '../../page';
+import { SearchResults } from './components/SearchResults';
 
 interface AntagonistBarProps {
   duel: Duel;
@@ -38,12 +38,14 @@ export function AntagonistBar({
   duel: { antagonist },
   setDuel,
 }: AntagonistBarProps) {
-  const awaitedTankDefinitions = use(tankDefinitions);
   const mode = useTankopedia((state) => state.mode);
   const awaitedTankNamesDiacritics = use(tankNamesDiacritics);
   const [tab, setTab] = useState('search');
   const searchInput = useRef<HTMLInputElement>(null);
   const [searchResults, setSearchResults] = useState<number[]>([]);
+  const chunkSize = window.innerWidth > 512 ? 8 : Infinity;
+  const firstChunk = searchResults.slice(0, chunkSize);
+  const secondChunk = searchResults.slice(chunkSize);
 
   if (mode !== 'armor') return null;
 
@@ -127,62 +129,25 @@ export function AntagonistBar({
                               go(
                                 searchInput.current!.value,
                                 awaitedTankNamesDiacritics,
-                                { key: 'combined', limit: 8 },
+                                { key: 'combined', limit: 16 },
                               ).map((item) => item.obj.id),
                             );
                           }, 500)}
                         />
                       </TextField.Root>
 
-                      <Flex direction="column" gap="2">
-                        {(searchResults.length > 0 ||
-                          searchInput.current?.value) && (
-                          <Flex direction="column" gap="2">
-                            {searchResults
-                              .map((id) => awaitedTankDefinitions[id])
-                              .map((tank) => (
-                                <Button
-                                  color={
-                                    tank.tree_type === 'researchable'
-                                      ? 'gray'
-                                      : tank.tree_type === 'premium'
-                                        ? 'amber'
-                                        : 'blue'
-                                  }
-                                  key={tank.id}
-                                  variant="ghost"
-                                  onClick={() => {
-                                    setDuel(
-                                      produce<Duel>((draft) => {
-                                        draft.antagonist.tank = tank;
-                                        draft.antagonist.turret =
-                                          tank.turrets.at(-1)!;
-                                        draft.antagonist.gun =
-                                          draft.antagonist.turret.guns.at(-1)!;
-                                        draft.antagonist.shell =
-                                          draft.antagonist.gun.shells[0];
-                                      }),
-                                    );
-                                    setSearchResults([]);
-                                    searchInput.current!.value = '';
-                                    setTab('configure');
-                                  }}
-                                >
-                                  {tank.name}
-                                </Button>
-                              ))}
-
-                            {searchResults.length === 0 &&
-                              (searchInput.current
-                                ? searchInput.current.value.length > 0
-                                : false) && (
-                                <Button disabled variant="ghost">
-                                  No search results
-                                </Button>
-                              )}
-                          </Flex>
+                      <div
+                        style={{
+                          display: 'flex',
+                          width: '100%',
+                          justifyContent: 'space-around',
+                        }}
+                      >
+                        <SearchResults ids={firstChunk} />
+                        {secondChunk.length > 0 && (
+                          <SearchResults ids={secondChunk} />
                         )}
-                      </Flex>
+                      </div>
                     </Flex>
                   </Tabs.Content>
 
@@ -265,7 +230,7 @@ export function AntagonistBar({
                           <ul>
                             {antagonist.gun.shells.map((shell) => (
                               <li key={shell.id}>
-                                {SHELL_NAMES[shell.type]}:{' '}
+                                {SHELL_NAMES[shell.type]}:
                                 <b>{shell.damage.armor} HP</b>
                               </li>
                             ))}